diff --git a/doc/epp-doc.md b/doc/epp-doc.md
index 5c4cc7562..cf4a84d71 100644
--- a/doc/epp-doc.md
+++ b/doc/epp-doc.md
@@ -18,8 +18,8 @@ Our implementation supports following protocols:
 
 Related XML Schema Definitions (may differ from policies applied to registry):
 
-[contact-1.0.xsd](schemas/contact-1.0.xsd)  
-[domain-1.0.xsd](schemas/domain-1.0.xsd)  
+[contact-eis-1.0.xsd](schemas/contact-eis-1.0.xsd)  
+[domain-eis-1.0.xsd](schemas/domain-eis-1.0.xsd)  
 [eis-1.0.xsd](schemas/eis-1.0.xsd)  
 [epp-1.0.xsd](schemas/epp-1.0.xsd)  
 [eppcom-1.0.xsd](schemas/eppcom-1.0.xsd)  
diff --git a/doc/schemas/contact-1.0.xsd b/doc/schemas/contact-1.0.xsd
index a3c463544..3ed0eb6d8 100644
--- a/doc/schemas/contact-1.0.xsd
+++ b/doc/schemas/contact-1.0.xsd
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+   <?xml version="1.0" encoding="UTF-8"?>
 
    <schema targetNamespace="urn:ietf:params:xml:ns:contact-1.0"
           xmlns:contact="urn:ietf:params:xml:ns:contact-1.0"
@@ -10,8 +10,8 @@
    <!--
    Import common element types.
    -->
-    <import namespace="urn:ietf:params:xml:ns:eppcom-1.0" schemaLocation="doc/schemas/eppcom-1.0.xsd"/>
-    <import namespace="urn:ietf:params:xml:ns:epp-1.0" schemaLocation="doc/schemas/epp-1.0.xsd"/>
+    <import namespace="urn:ietf:params:xml:ns:eppcom-1.0"/>
+    <import namespace="urn:ietf:params:xml:ns:epp-1.0"/>
 
     <annotation>
       <documentation>
@@ -25,7 +25,7 @@
    -->
     <element name="check" type="contact:mIDType"/>
     <element name="create" type="contact:createType"/>
-    <element name="delete" type="contact:authIDType"/>
+    <element name="delete" type="contact:sIDType"/>
     <element name="info" type="contact:authIDType"/>
     <element name="transfer" type="contact:authIDType"/>
     <element name="update" type="contact:updateType"/>
@@ -38,6 +38,7 @@
         <length value="2"/>
       </restriction>
     </simpleType>
+
     <complexType name="e164Type">
       <simpleContent>
         <extension base="contact:e164StringType">
@@ -48,7 +49,7 @@
 
     <simpleType name="e164StringType">
       <restriction base="token">
-        <!--<pattern value="(\+[0-9]{1,3}\.[0-9]{1,14})?"/> -->
+        <pattern value="(\+[0-9]{1,3}\.[0-9]{1,14})?"/>
         <maxLength value="17"/>
       </restriction>
     </simpleType>
@@ -77,7 +78,7 @@
    -->
     <complexType name="createType">
       <sequence>
-        <element name="id" type="eppcom:clIDType" minOccurs="0"/>
+        <element name="id" type="eppcom:clIDType"/>
         <element name="postalInfo" type="contact:postalInfoType"
          maxOccurs="2"/>
         <element name="voice" type="contact:e164Type"
@@ -85,8 +86,9 @@
         <element name="fax" type="contact:e164Type"
          minOccurs="0"/>
         <element name="email" type="eppcom:minTokenType"/>
-        <element name="authInfo" type="contact:authInfoType" minOccurs="0"/>
-
+        <element name="authInfo" type="contact:authInfoType"/>
+        <element name="disclose" type="contact:discloseType"
+         minOccurs="0"/>
       </sequence>
     </complexType>
 
@@ -97,7 +99,8 @@
          minOccurs="0"/>
         <element name="addr" type="contact:addrType"/>
       </sequence>
-      <attribute name="type" type="contact:postalInfoEnumType"/>
+      <attribute name="type" type="contact:postalInfoEnumType"
+       use="required"/>
     </complexType>
 
     <simpleType name="postalInfoEnumType">
@@ -127,6 +130,21 @@
       </choice>
     </complexType>
 
+    <complexType name="discloseType">
+      <sequence>
+        <element name="name" type="contact:intLocType"
+         minOccurs="0" maxOccurs="2"/>
+        <element name="org" type="contact:intLocType"
+         minOccurs="0" maxOccurs="2"/>
+        <element name="addr" type="contact:intLocType"
+         minOccurs="0" maxOccurs="2"/>
+        <element name="voice" minOccurs="0"/>
+        <element name="fax" minOccurs="0"/>
+        <element name="email" minOccurs="0"/>
+      </sequence>
+      <attribute name="flag" type="boolean" use="required"/>
+    </complexType>
+
     <complexType name="intLocType">
       <attribute name="type" type="contact:postalInfoEnumType"
        use="required"/>
@@ -202,6 +220,8 @@
          minOccurs="0"/>
         <element name="authInfo" type="contact:authInfoType"
          minOccurs="0"/>
+        <element name="disclose" type="contact:discloseType"
+         minOccurs="0"/>
       </sequence>
     </complexType>
 
@@ -214,7 +234,8 @@
         <element name="addr" type="contact:addrType"
          minOccurs="0"/>
       </sequence>
-      <attribute name="type" type="contact:postalInfoEnumType"/>
+      <attribute name="type" type="contact:postalInfoEnumType"
+       use="required"/>
     </complexType>
 
    <!--
@@ -290,6 +311,8 @@
          minOccurs="0"/>
         <element name="authInfo" type="contact:authInfoType"
          minOccurs="0"/>
+        <element name="disclose" type="contact:discloseType"
+         minOccurs="0"/>
       </sequence>
     </complexType>
 
diff --git a/doc/schemas/domain-1.0.xsd b/doc/schemas/domain-1.0.xsd
index 2f62e3e8b..db650414e 100644
--- a/doc/schemas/domain-1.0.xsd
+++ b/doc/schemas/domain-1.0.xsd
@@ -11,10 +11,9 @@
    <!--
    Import common element types.
    -->
-   <import namespace="urn:ietf:params:xml:ns:eppcom-1.0" schemaLocation="doc/schemas/eppcom-1.0.xsd"/>
-   <import namespace="urn:ietf:params:xml:ns:epp-1.0" schemaLocation="doc/schemas/epp-1.0.xsd"/>
-   <import namespace="urn:ietf:params:xml:ns:host-1.0" schemaLocation="doc/schemas/host-1.0.xsd"/>
-   <import namespace="urn:ietf:params:xml:ns:secDNS-1.1" schemaLocation="doc/schemas/secDNS-1.1.xsd"/>
+   <import namespace="urn:ietf:params:xml:ns:eppcom-1.0"/>
+   <import namespace="urn:ietf:params:xml:ns:epp-1.0"/>
+   <import namespace="urn:ietf:params:xml:ns:host-1.0"/>
 
    <annotation>
     <documentation>
@@ -47,7 +46,7 @@
        minOccurs="0"/>
       <element name="contact" type="domain:contactType"
        minOccurs="0" maxOccurs="unbounded"/>
-      <element name="authInfo" type="domain:authInfoType" minOccurs="0"/>
+      <element name="authInfo" type="domain:authInfoType"/>
     </sequence>
    </complexType>
 
@@ -63,7 +62,7 @@
    <simpleType name="pLimitType">
     <restriction base="unsignedShort">
       <minInclusive value="1"/>
-      <maxInclusive value="1095"/>
+      <maxInclusive value="99"/>
     </restriction>
    </simpleType>
 
@@ -71,7 +70,6 @@
     <restriction base="token">
       <enumeration value="y"/>
       <enumeration value="m"/>
-      <enumeration value="d"/>
     </restriction>
    </simpleType>
 
@@ -91,7 +89,6 @@
     <sequence>
       <element name="hostName" type="eppcom:labelType"/>
       <element name="hostAddr" type="host:addrType"
-
        minOccurs="0" maxOccurs="unbounded"/>
     </sequence>
    </complexType>
@@ -240,28 +237,12 @@
    Allow the registrant value to be nullified by changing the
    minLength restriction to "0".
    -->
-
-   <complexType name="clIDChgType">
-    <simpleContent>
-      <extension base="domain:clIDChgSimpleType">
-        <attribute name="verified" type="domain:verifiedType"/>
-      </extension>
-    </simpleContent>
-   </complexType>
-
-  <simpleType name="clIDChgSimpleType">
+   <simpleType name="clIDChgType">
     <restriction base="token">
       <minLength value="0"/>
+      <maxLength value="16"/>
     </restriction>
-  </simpleType>
-
-  <simpleType name="verifiedType">
-    <restriction base="token">
-      <enumeration value="yes"/>
-      <enumeration value="no"/>
-    </restriction>
-  </simpleType>
-
+   </simpleType>
 
    <!--
    Allow the authInfo value to be nullified by including an
@@ -444,6 +425,7 @@
      minOccurs="0"/>
    </sequence>
    </complexType>
+
    <!--
    End of schema.
    -->