diff --git a/app/api/repp/domain_v1.rb b/app/api/repp/domain_v1.rb
index 859cb14da..9275e611f 100644
--- a/app/api/repp/domain_v1.rb
+++ b/app/api/repp/domain_v1.rb
@@ -35,7 +35,7 @@ module Repp
         error! I18n.t('errors.messages.epp_authorization_error'), 401 unless domain.auth_info.eql? request.headers['Auth-Code']
 
         contact_repp_json = proc{|contact|
-          contact.attributes.slice("code", "ident_type", "ident_country_code", "phone", "email", "street", "city", "zip","country_code", "statuses")
+          contact.attributes.slice("code", "name", "ident", "ident_type", "ident_country_code", "phone", "email", "street", "city", "zip","country_code", "statuses")
         }
 
         @response = {
diff --git a/app/controllers/admin/domain_versions_controller.rb b/app/controllers/admin/domain_versions_controller.rb
index 3af20bfb0..44a2087cd 100644
--- a/app/controllers/admin/domain_versions_controller.rb
+++ b/app/controllers/admin/domain_versions_controller.rb
@@ -6,12 +6,13 @@ class Admin::DomainVersionsController < AdminController
     @domain = Domain.where(id: params[:domain_id]).includes({versions: :item}).first
     @versions = @domain.versions
 
-    if @domain.pending_json.present?
-      frame = Nokogiri::XML(@domain.pending_json['frame'])
-      @pending_user  = User.find(@domain.pending_json['current_user_id'])
-      @pending_domain = Epp::Domain.find(@domain.id)
-      @pending_domain.update(frame, @pending_user, false)
-    end
+    # Depricated it had to load legal document. We may do it by parsing and adding link.
+    # if @domain.pending_json.present?
+    #   frame = Nokogiri::XML(@domain.pending_json['frame'])
+    #   @pending_user  = User.find(@domain.pending_json['current_user_id'])
+    #   @pending_domain = Epp::Domain.find(@domain.id)
+    #   @pending_domain.update(frame, @pending_user, false)
+    # end
   end
   # rubocop:enable Style/GuardClause
 end
diff --git a/app/controllers/admin/pending_updates_controller.rb b/app/controllers/admin/pending_updates_controller.rb
index 960b65ee5..4d08297d7 100644
--- a/app/controllers/admin/pending_updates_controller.rb
+++ b/app/controllers/admin/pending_updates_controller.rb
@@ -9,7 +9,7 @@ class Admin::PendingUpdatesController < AdminController
     if @epp_domain.apply_pending_update!
       redirect_to admin_domain_path(@domain.id), notice: t(:pending_applied)
     else
-      redirect_to admin_edit_domain_path(@domain.id), alert: t(:failure)
+      redirect_to edit_admin_domain_path(@domain.id), alert: t(:failure)
     end
   end
 
diff --git a/app/controllers/epp_controller.rb b/app/controllers/epp_controller.rb
index 15f6c6a49..a0e7d7dce 100644
--- a/app/controllers/epp_controller.rb
+++ b/app/controllers/epp_controller.rb
@@ -73,10 +73,7 @@ class EppController < ApplicationController
   end
 
   def schema
-    # TODO: Support multiple schemas
-    return DOMAIN_SCHEMA if params[:epp_object_type] == :domain
-    return CONTACT_SCHEMA if params[:epp_object_type] == :contact
-    EPP_SCHEMA
+    EPP_ALL_SCHEMA
   end
 
   def generate_svtrid
diff --git a/app/models/contact.rb b/app/models/contact.rb
index 20c11ae80..5181d722f 100644
--- a/app/models/contact.rb
+++ b/app/models/contact.rb
@@ -30,6 +30,7 @@ class Contact < ActiveRecord::Base
     length: { maximum: 100, message: :too_long_contact_code }
   validate :ident_valid_format?
   validate :uniq_statuses?
+  validate :validate_html
 
   after_initialize do
     self.statuses = [] if statuses.nil?
@@ -221,6 +222,19 @@ class Contact < ActiveRecord::Base
     end
   end
 
+  def validate_html
+    self.class.columns.each do |column|
+      next unless column.type == :string
+
+      c_name = column.name
+      val    = read_attribute(c_name)
+      if val && (val.include?('<') || val.include?('>') || val.include?('%3C') || val.include?('%3E'))
+        errors.add(c_name, :invalid)
+        return # want to run code faster
+      end
+    end
+  end
+
   def uniq_statuses?
     return true unless statuses.detect { |s| statuses.count(s) > 1 }
     errors.add(:statuses, :not_uniq)
diff --git a/app/models/domain.rb b/app/models/domain.rb
index 48188065e..bba0c5ba9 100644
--- a/app/models/domain.rb
+++ b/app/models/domain.rb
@@ -590,7 +590,7 @@ class Domain < ActiveRecord::Base
   def pending_registrant
     return '' if pending_json.blank?
     return '' if pending_json['new_registrant_id'].blank?
-    Registrant.find_by(id: pending_json['new_registrant_id'].last)
+    Registrant.find_by(id: pending_json['new_registrant_id'])
   end
 
   def generate_auth_info
diff --git a/app/models/epp/contact.rb b/app/models/epp/contact.rb
index 57bf9192a..435a63dee 100644
--- a/app/models/epp/contact.rb
+++ b/app/models/epp/contact.rb
@@ -21,7 +21,7 @@ class Epp::Contact < Contact
     # rubocop: disable Metrics/PerceivedComplexity
     # rubocop: disable Metrics/CyclomaticComplexity
     # rubocop: disable Metrics/AbcSize
-    def attrs_from(frame)
+    def attrs_from(frame, new_record: false)
       f = frame
       at = {}.with_indifferent_access
       at[:name]       = f.css('postalInfo name').text        if f.css('postalInfo name').present?
@@ -40,7 +40,7 @@ class Epp::Contact < Contact
       if legal_frame.present?
         at[:legal_documents_attributes] = legal_document_attrs(legal_frame)
       end
-      at.merge!(ident_attrs(f.css('ident').first))
+      at.merge!(ident_attrs(f.css('ident').first)) if new_record
       at
     end
     # rubocop: enable Metrics/PerceivedComplexity
@@ -51,7 +51,7 @@ class Epp::Contact < Contact
       return super if frame.blank?
 
       super(
-        attrs_from(frame).merge(
+        attrs_from(frame, new_record: true).merge(
           code: frame.css('id').text,
           registrar: registrar
         )
@@ -59,10 +59,7 @@ class Epp::Contact < Contact
     end
 
     def ident_attrs(ident_frame)
-      return {} if ident_frame.blank?
-      return {} if ident_frame.try('text').blank?
-      return {} if ident_frame.attr('type').blank?
-      return {} if ident_frame.attr('cc').blank?
+      return {} unless ident_attr_valid?(ident_frame)
 
       {
         ident: ident_frame.text,
@@ -71,6 +68,15 @@ class Epp::Contact < Contact
       }
     end
 
+    def ident_attr_valid?(ident_frame)
+      return false if ident_frame.blank?
+      return false if ident_frame.try('text').blank?
+      return false if ident_frame.attr('type').blank?
+      return false if ident_frame.attr('cc').blank?
+
+      true
+    end
+
     def legal_document_attrs(legal_frame)
       return [] if legal_frame.blank?
       return [] if legal_frame.try('text').blank?
@@ -137,7 +143,7 @@ class Epp::Contact < Contact
   def update_attributes(frame)
     return super if frame.blank?
     at = {}.with_indifferent_access
-    at.deep_merge!(self.class.attrs_from(frame.css('chg')))
+    at.deep_merge!(self.class.attrs_from(frame.css('chg'), new_record: false))
 
     if Setting.client_status_editing_enabled
       at[:statuses] = statuses - statuses_attrs(frame.css('rem'), 'rem') + statuses_attrs(frame.css('add'), 'add')
@@ -147,17 +153,26 @@ class Epp::Contact < Contact
     at[:legal_documents_attributes] = self.class.legal_document_attrs(legal_frame)
     self.deliver_emails = true # turn on email delivery for epp
 
+
     # allow to update ident code for legacy contacts
-    if frame.css('ident').first.present?
-      if ident_updated_at.present?
-        throw :epp_error, {
-          code: '2306',
-          msg: I18n.t(:ident_update_error)
-        }
-      else
-        at.merge!(self.class.ident_attrs(frame.css('ident').first)) 
-        self.ident_updated_at = Time.zone.now
+    if frame.css('ident').first
+      self.ident_updated_at ||= Time.zone.now # not in use
+      ident_frame = frame.css('ident').first
+
+      if ident_frame && ident_attr_valid?(ident_frame) && ident_country_code.blank? && ident_type.in?(%w(org priv).freeze)
+        at.merge!(ident_country_code: ident_frame.attr('cc'))
       end
+
+      # Deprecated
+      # if ident_updated_at.present?
+      #   throw :epp_error, {
+      #     code: '2306',
+      #     msg: I18n.t(:ident_update_error)
+      #   }
+      # else
+      #   at.merge!(self.class.ident_attrs(frame.css('ident').first))
+      #   self.ident_updated_at = Time.zone.now
+      # end
     end
 
     super(at)
diff --git a/app/models/epp/domain.rb b/app/models/epp/domain.rb
index afdc8e085..17bb5915d 100644
--- a/app/models/epp/domain.rb
+++ b/app/models/epp/domain.rb
@@ -515,9 +515,8 @@ class Epp::Domain < Domain
     statuses.delete(DomainStatus::PENDING_DELETE_CONFIRMATION)
     statuses.delete(DomainStatus::PENDING_DELETE)
     DomainMailer.delete_confirmation(id, deliver_emails).deliver
-
-    # TODO: confirm that this actually makes sense
-    clean_pendings! if valid? && set_pending_delete!
+    clean_pendings!
+    set_pending_delete!
     true
   end
 
@@ -843,6 +842,7 @@ class Epp::Domain < Domain
     def parse_legal_document_from_frame(parsed_frame)
       ld = parsed_frame.css('legalDocument').first
       return nil unless ld
+      return nil if ld.text.starts_with?(ENV['legal_documents_dir']) # escape reloading
 
       {
         body: ld.text,
diff --git a/config/initializers/load_schemas.rb b/config/initializers/load_schemas.rb
index 617022179..91ca113cc 100644
--- a/config/initializers/load_schemas.rb
+++ b/config/initializers/load_schemas.rb
@@ -1,3 +1 @@
-EPP_SCHEMA = Nokogiri::XML::Schema(File.read("lib/schemas/epp-1.0.xsd"))
-DOMAIN_SCHEMA = Nokogiri::XML::Schema(File.read("lib/schemas/domain-eis-1.0.xsd"))
-CONTACT_SCHEMA = Nokogiri::XML::Schema(File.read("lib/schemas/contact-eis-1.0.xsd"))
+EPP_ALL_SCHEMA = Nokogiri::XML::Schema(File.read("lib/schemas/all-ee-1.0.xsd"))
diff --git a/db/migrate/20151127091716_restore_ttl_to_zonefile2.rb b/db/migrate/20151127091716_restore_ttl_to_zonefile2.rb
new file mode 100644
index 000000000..7fbeaade2
--- /dev/null
+++ b/db/migrate/20151127091716_restore_ttl_to_zonefile2.rb
@@ -0,0 +1,168 @@
+class RestoreTtlToZonefile2 < ActiveRecord::Migration
+  # rubocop:disable Metrics/MethodLength
+  def up
+    execute <<-SQL
+      CREATE OR REPLACE FUNCTION generate_zonefile(i_origin varchar)
+      RETURNS text AS $$
+      DECLARE
+        zone_header text := concat('$ORIGIN ', i_origin, '.');
+        serial_num varchar;
+        include_filter varchar := '';
+        exclude_filter varchar := '';
+        tmp_var text;
+        ret text;
+      BEGIN
+        -- define filters
+        include_filter = '%' || i_origin;
+
+        -- for %.%.%
+        IF i_origin ~ '\\.' THEN
+          exclude_filter := '';
+        -- for %.%
+        ELSE
+          exclude_filter := '%.%.' || i_origin;
+        END IF;
+
+        SELECT ROUND(extract(epoch from now() at time zone 'utc')) INTO serial_num;
+
+        -- zonefile header
+        SELECT concat(
+          format('%-10s', '$ORIGIN .'), chr(10),
+          format('%-10s', '$TTL'), zf.ttl, chr(10), chr(10),
+          format('%-10s', i_origin || '.'), 'IN SOA ', zf.master_nameserver, '. ', zf.email, '. (', chr(10),
+          format('%-17s', ''), format('%-12s', serial_num), '; serial number', chr(10),
+          format('%-17s', ''), format('%-12s', zf.refresh), '; refresh, seconds', chr(10),
+          format('%-17s', ''), format('%-12s', zf.retry), '; retry, seconds', chr(10),
+          format('%-17s', ''), format('%-12s', zf.expire), '; expire, seconds', chr(10),
+          format('%-17s', ''), format('%-12s', zf.minimum_ttl), '; minimum TTL, seconds', chr(10),
+          format('%-17s', ''), ')'
+        ) FROM zonefile_settings zf WHERE i_origin = zf.origin INTO tmp_var;
+
+        ret = concat(tmp_var, chr(10), chr(10));
+
+        -- ns records
+        SELECT array_to_string(
+          array(
+            SELECT concat(d.name_puny, '. IN NS ', ns.hostname, '.')
+            FROM domains d
+            JOIN nameservers ns ON ns.domain_id = d.id
+            WHERE d.name LIKE include_filter AND d.name NOT LIKE exclude_filter
+            ORDER BY d.name
+          ),
+          chr(10)
+        ) INTO tmp_var;
+
+        ret := concat(ret, '; Zone NS Records', chr(10), tmp_var, chr(10), chr(10));
+
+        -- a glue records for origin nameservers
+        SELECT array_to_string(
+          array(
+            SELECT concat(ns.hostname, '. IN A ', ns.ipv4)
+            FROM nameservers ns
+            JOIN domains d ON d.id = ns.domain_id
+            WHERE d.name = i_origin
+            AND ns.hostname LIKE '%.' || d.name
+            AND ns.ipv4 IS NOT NULL AND ns.ipv4 <> ''
+          ), chr(10)
+        ) INTO tmp_var;
+
+        ret := concat(ret, '; Zone A Records', chr(10), tmp_var);
+
+        -- a glue records for other nameservers
+        SELECT array_to_string(
+          array(
+            SELECT concat(ns.hostname, '. IN A ', ns.ipv4)
+            FROM nameservers ns
+            JOIN domains d ON d.id = ns.domain_id
+            WHERE d.name LIKE include_filter AND d.name NOT LIKE exclude_filter
+            AND ns.hostname LIKE '%.' || d.name
+            AND d.name <> i_origin
+            AND ns.ipv4 IS NOT NULL AND ns.ipv4 <> ''
+            AND NOT EXISTS ( -- filter out glue records that already appeared in origin glue recrods
+              SELECT 1 FROM nameservers nsi
+              JOIN domains di ON nsi.domain_id = di.id
+              WHERE di.name = i_origin
+              AND nsi.hostname = ns.hostname
+            )
+          ), chr(10)
+        ) INTO tmp_var;
+
+        -- TODO This is a possible subtitition to the previous query, stress testing is needed to see which is faster
+
+        -- SELECT ns.*
+        -- FROM nameservers ns
+        -- JOIN domains d ON d.id = ns.domain_id
+        -- WHERE d.name LIKE '%ee' AND d.name NOT LIKE '%pri.ee'
+        -- AND ns.hostname LIKE '%.' || d.name
+        -- AND d.name <> 'ee'
+        -- AND ns.ipv4 IS NOT NULL AND ns.ipv4 <> ''
+        -- AND ns.hostname NOT IN (
+        --   SELECT ns.hostname FROM domains d JOIN nameservers ns ON d.id = ns.domain_id WHERE d.name = 'ee'
+        -- )
+
+        ret := concat(ret, chr(10), tmp_var, chr(10), chr(10));
+
+        -- aaaa glue records for origin nameservers
+        SELECT array_to_string(
+          array(
+            SELECT concat(ns.hostname, '. IN AAAA ', ns.ipv6)
+            FROM nameservers ns
+            JOIN domains d ON d.id = ns.domain_id
+            WHERE d.name = i_origin
+            AND ns.hostname LIKE '%.' || d.name
+            AND ns.ipv6 IS NOT NULL AND ns.ipv6 <> ''
+          ), chr(10)
+        ) INTO tmp_var;
+
+        ret := concat(ret, '; Zone AAAA Records', chr(10), tmp_var);
+
+        -- aaaa glue records for other nameservers
+        SELECT array_to_string(
+          array(
+            SELECT concat(ns.hostname, '. IN AAAA ', ns.ipv6)
+            FROM nameservers ns
+            JOIN domains d ON d.id = ns.domain_id
+            WHERE d.name LIKE include_filter AND d.name NOT LIKE exclude_filter
+            AND ns.hostname LIKE '%.' || d.name
+            AND d.name <> i_origin
+            AND ns.ipv6 IS NOT NULL AND ns.ipv6 <> ''
+            AND NOT EXISTS ( -- filter out glue records that already appeared in origin glue recrods
+              SELECT 1 FROM nameservers nsi
+              JOIN domains di ON nsi.domain_id = di.id
+              WHERE di.name = i_origin
+              AND nsi.hostname = ns.hostname
+            )
+          ), chr(10)
+        ) INTO tmp_var;
+
+        ret := concat(ret, chr(10), tmp_var, chr(10), chr(10));
+
+        -- ds records
+        SELECT array_to_string(
+          array(
+            SELECT concat(
+              d.name_puny, '. 3600 IN DS ', dk.ds_key_tag, ' ',
+              dk.ds_alg, ' ', dk.ds_digest_type, ' ', dk.ds_digest
+            )
+            FROM domains d
+            JOIN dnskeys dk ON dk.domain_id = d.id
+            WHERE d.name LIKE include_filter AND d.name NOT LIKE exclude_filter
+            ),
+          chr(10)
+        ) INTO tmp_var;
+
+        ret := concat(ret, '; Zone DS Records', chr(10), tmp_var, chr(10));
+
+        RETURN ret;
+      END;
+      $$
+      LANGUAGE plpgsql;
+    SQL
+  end
+
+  def down
+    execute <<-SQL
+      DROP FUNCTION generate_zonefile(i_origin varchar);
+    SQL
+  end
+end
diff --git a/doc/repp/v1/domain.md b/doc/repp/v1/domain.md
index fc417b47f..319713660 100644
--- a/doc/repp/v1/domain.md
+++ b/doc/repp/v1/domain.md
@@ -131,6 +131,8 @@ Content-Type: application/json
   "domain":"ee-test.ee",
   "registrant":{
     "code":"EE:R1",
+    "name":"Registrant",
+    "ident":"17612535",
     "ident_type":"org",
     "ident_country_code":"EE",
     "phone":"+372.1234567",
@@ -147,6 +149,8 @@ Content-Type: application/json
   "admin_contacts":[
     {
       "code":"EE:A1",
+      "name":"Admin Contact",
+      "ident":"17612535376",
       "ident_type":"priv",
       "ident_country_code":"EE",
       "phone":"+372.7654321",
@@ -164,6 +168,8 @@ Content-Type: application/json
   "tech_contacts":[
     {
       "code":"EE:T1",
+      "name":"Tech Contact",
+      "ident":"17612536",
       "ident_type":"org",
       "ident_country_code":"EE",
       "phone":"+372.7654321",
diff --git a/doc/schemas/all-ee-1.0.xsd b/doc/schemas/all-ee-1.0.xsd
index bd4aeba0c..5ad285c98 100644
--- a/doc/schemas/all-ee-1.0.xsd
+++ b/doc/schemas/all-ee-1.0.xsd
@@ -22,7 +22,10 @@
       schemaLocation="epp-1.0.xsd"/>
     <!-- EPP protocol extension: DNSSEC -->
     <import namespace="urn:ietf:params:xml:ns:secDNS-1.1"
-      schemaLocation="secNDS-1.1.xsd"/>
+      schemaLocation="secDNS-1.1.xsd"/>
+    <!-- EPP protocol extension: DNSSEC keyrelay -->
+    <import namespace="urn:ietf:params:xml:ns:keyrelay-1.0"
+      schemaLocation="keyrelay-1.0.xsd"/>
     <import namespace="urn:ietf:params:xml:ns:host-1.0"
       schemaLocation="host-1.0.xsd"/>
     <!-- EPP protocol extension: .ee specific -->
diff --git a/doc/schemas/domain-eis-1.0.xsd b/doc/schemas/domain-eis-1.0.xsd
index 3fe1188ea..b38abf9d4 100644
--- a/doc/schemas/domain-eis-1.0.xsd
+++ b/doc/schemas/domain-eis-1.0.xsd
@@ -1,447 +1,458 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-   <schema targetNamespace="https://epp.tld.ee/schema/domain-eis-1.0.xsd"
-        xmlns:domain="https://epp.tld.ee/schema/domain-eis-1.0.xsd"
-        xmlns:host="urn:ietf:params:xml:ns:host-1.0"
-        xmlns:epp="urn:ietf:params:xml:ns:epp-1.0"
-        xmlns:eppcom="urn:ietf:params:xml:ns:eppcom-1.0"
-        xmlns="http://www.w3.org/2001/XMLSchema"
-        elementFormDefault="qualified">
+<schema targetNamespace="https://epp.tld.ee/schema/domain-eis-1.0.xsd"
+     xmlns:domain="https://epp.tld.ee/schema/domain-eis-1.0.xsd"
+     xmlns:host="urn:ietf:params:xml:ns:host-1.0"
+     xmlns:epp="urn:ietf:params:xml:ns:epp-1.0"
+     xmlns:eppcom="urn:ietf:params:xml:ns:eppcom-1.0"
+     xmlns="http://www.w3.org/2001/XMLSchema"
+     elementFormDefault="qualified">
 
-   <!--
-   Import common element types.
-   -->
-   <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"/>
-   <import namespace="urn:ietf:params:xml:ns:secDNS-1.1"/>
-   <import namespace="https://epp.tld.ee/schema/eis-1.0.xsd"/>
+<!--
+Import common element types.
+-->
+<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"/>
+<import namespace="urn:ietf:params:xml:ns:secDNS-1.1"/>
+<import namespace="https://epp.tld.ee/schema/eis-1.0.xsd"/>
 
-   <annotation>
-    <documentation>
-      Extensible Provisioning Protocol v1.0
-      domain provisioning schema.
-    </documentation>
-   </annotation>
+<annotation>
+  <documentation>
+    Extensible Provisioning Protocol v1.0
+    domain provisioning schema.
+  </documentation>
+</annotation>
 
-   <!--
-   Child elements found in EPP commands.
-   -->
-   <element name="check" type="domain:mNameType"/>
-   <element name="create" type="domain:createType"/>
-   <element name="delete" type="domain:sNameType"/>
-   <element name="info" type="domain:infoType"/>
-   <element name="renew" type="domain:renewType"/>
-   <element name="transfer" type="domain:transferType"/>
-   <element name="update" type="domain:updateType"/>
-   <!--
-   Child elements of the <create> command.
-   -->
-   <complexType name="createType">
-    <sequence>
-      <element name="name" type="eppcom:labelType"/>
-      <element name="period" type="domain:periodType"
-       minOccurs="0"/>
-      <element name="ns" type="domain:nsType"
-       minOccurs="0"/>
-      <element name="registrant" type="eppcom:clIDType"
-       minOccurs="0"/>
-      <element name="contact" type="domain:contactType"
-       minOccurs="0" maxOccurs="unbounded"/>
-      <element name="authInfo" type="domain:authInfoType" minOccurs="0"/>
-    </sequence>
-   </complexType>
+<!--
+Child elements found in EPP commands.
+-->
+<element name="check" type="domain:mNameType"/>
+<element name="create" type="domain:createType"/>
+<element name="delete" type="domain:deleteType"/>
+<element name="info" type="domain:infoType"/>
+<element name="renew" type="domain:renewType"/>
+<element name="transfer" type="domain:transferType"/>
+<element name="update" type="domain:updateType"/>
 
-   <complexType name="periodType">
-    <simpleContent>
-      <extension base="domain:pLimitType">
-        <attribute name="unit" type="domain:pUnitType"
-         use="required"/>
-      </extension>
-    </simpleContent>
-   </complexType>
+<!--
+Child elements of the <create> command.
+-->
+<complexType name="createType">
+  <sequence>
+    <element name="name" type="eppcom:labelType"/>
+    <element name="period" type="domain:periodType"
+     minOccurs="0"/>
+    <element name="ns" type="domain:nsType"
+     minOccurs="0"/>
+    <element name="registrant" type="eppcom:clIDType"
+     minOccurs="0"/>
+    <element name="contact" type="domain:contactType"
+     minOccurs="0" maxOccurs="unbounded"/>
+    <element name="authInfo" type="domain:authInfoType" minOccurs="0"/>
+  </sequence>
+</complexType>
 
-   <simpleType name="pLimitType">
-    <restriction base="unsignedShort">
-      <minInclusive value="1"/>
-      <maxInclusive value="1095"/>
-    </restriction>
-   </simpleType>
+<complexType name="periodType">
+  <simpleContent>
+    <extension base="domain:pLimitType">
+      <attribute name="unit" type="domain:pUnitType"
+       use="required"/>
+    </extension>
+  </simpleContent>
+</complexType>
 
-   <simpleType name="pUnitType">
-    <restriction base="token">
-      <enumeration value="y"/>
-      <enumeration value="m"/>
-      <enumeration value="d"/>
-    </restriction>
-   </simpleType>
+<simpleType name="pLimitType">
+  <restriction base="unsignedShort">
+    <minInclusive value="1"/>
+    <maxInclusive value="1095"/>
+  </restriction>
+</simpleType>
 
-   <complexType name="nsType">
-    <choice>
-      <element name="hostObj" type="eppcom:labelType"
-       maxOccurs="unbounded"/>
-      <element name="hostAttr" type="domain:hostAttrType"
-       maxOccurs="unbounded"/>
-    </choice>
-   </complexType>
-   <!--
-   Name servers are either host objects or attributes.
-   -->
+<simpleType name="pUnitType">
+  <restriction base="token">
+    <enumeration value="y"/>
+    <enumeration value="m"/>
+    <enumeration value="d"/>
+  </restriction>
+</simpleType>
 
-   <complexType name="hostAttrType">
-    <sequence>
-      <element name="hostName" type="eppcom:labelType"/>
-      <element name="hostAddr" type="host:addrType"
-       minOccurs="0" maxOccurs="unbounded"/>
-    </sequence>
-   </complexType>
-   <!--
-   If attributes, addresses are optional and follow the
-   structure defined in the host mapping.
-   -->
+<complexType name="nsType">
+  <choice>
+    <element name="hostObj" type="eppcom:labelType"
+     maxOccurs="unbounded"/>
+    <element name="hostAttr" type="domain:hostAttrType"
+     maxOccurs="unbounded"/>
+  </choice>
+</complexType>
+<!--
+Name servers are either host objects or attributes.
+-->
 
-   <complexType name="contactType">
-    <simpleContent>
-      <extension base="eppcom:clIDType">
-        <attribute name="type" type="domain:contactAttrType"/>
-      </extension>
-    </simpleContent>
-   </complexType>
+<complexType name="hostAttrType">
+  <sequence>
+    <element name="hostName" type="eppcom:labelType"/>
+    <element name="hostAddr" type="host:addrType"
+     minOccurs="0" maxOccurs="unbounded"/>
+  </sequence>
+</complexType>
+<!--
+If attributes, addresses are optional and follow the
+structure defined in the host mapping.
+-->
 
-   <simpleType name="contactAttrType">
-    <restriction base="token">
-      <enumeration value="admin"/>
-      <enumeration value="billing"/>
-      <enumeration value="tech"/>
-    </restriction>
-   </simpleType>
+<complexType name="contactType">
+  <simpleContent>
+    <extension base="eppcom:clIDType">
+      <attribute name="type" type="domain:contactAttrType"/>
+    </extension>
+  </simpleContent>
+</complexType>
 
-   <complexType name="authInfoType">
-    <choice>
-      <element name="pw" type="eppcom:pwAuthInfoType"/>
-      <element name="ext" type="eppcom:extAuthInfoType"/>
-    </choice>
-   </complexType>
+<simpleType name="contactAttrType">
+  <restriction base="token">
+    <enumeration value="admin"/>
+    <enumeration value="billing"/>
+    <enumeration value="tech"/>
+  </restriction>
+</simpleType>
 
-   <!--
-   Child element of commands that require a single name.
-   -->
-   <complexType name="sNameType">
-    <sequence>
-      <element name="name" type="eppcom:labelType"/>
-    </sequence>
-   </complexType>
-   <!--
-   Child element of commands that accept multiple names.
-   -->
-   <complexType name="mNameType">
-    <sequence>
-      <element name="name" type="eppcom:labelType"
-       maxOccurs="unbounded"/>
-    </sequence>
-   </complexType>
+<complexType name="authInfoType">
+  <choice>
+    <element name="pw" type="eppcom:pwAuthInfoType"/>
+    <element name="ext" type="eppcom:extAuthInfoType"/>
+  </choice>
+</complexType>
 
-   <!--
-   Child elements of the <info> command.
-   -->
-   <complexType name="infoType">
-    <sequence>
-      <element name="name" type="domain:infoNameType"/>
-      <element name="authInfo" type="domain:authInfoType"
-       minOccurs="0"/>
-    </sequence>
-   </complexType>
+<!--
+Child element of commands that require a single name.
+-->
+<complexType name="sNameType">
+  <sequence>
+    <element name="name" type="eppcom:labelType"/>
+  </sequence>
+</complexType>
+<!--
+Child element of commands that accept multiple names.
+-->
+<complexType name="mNameType">
+  <sequence>
+    <element name="name" type="eppcom:labelType"
+     maxOccurs="unbounded"/>
+  </sequence>
+</complexType>
 
-   <complexType name="infoNameType">
-    <simpleContent>
-      <extension base = "eppcom:labelType">
-        <attribute name="hosts" type="domain:hostsType"
-         default="all"/>
-      </extension>
-    </simpleContent>
-   </complexType>
+<!--
+Child element of the <delete> command - .ee specific (verified)
+-->
+<complexType name="deleteType">
+  <sequence>
+    <element name="name" type="eppcom:labelType"/>
+  </sequence>
+  <attribute name="verified" type="domain:verifiedType"
+   use="optional"/>
+</complexType>
 
-   <simpleType name="hostsType">
-    <restriction base="token">
-      <enumeration value="all"/>
-      <enumeration value="del"/>
-      <enumeration value="none"/>
-      <enumeration value="sub"/>
-    </restriction>
-   </simpleType>
+<!--
+Child elements of the <info> command.
+-->
+<complexType name="infoType">
+  <sequence>
+    <element name="name" type="domain:infoNameType"/>
+    <element name="authInfo" type="domain:authInfoType"
+     minOccurs="0"/>
+  </sequence>
+</complexType>
 
-   <!--
-   Child elements of the <renew> command.
-   -->
-   <complexType name="renewType">
-    <sequence>
-      <element name="name" type="eppcom:labelType"/>
-      <element name="curExpDate" type="date"/>
-      <element name="period" type="domain:periodType"
-       minOccurs="0"/>
-    </sequence>
-   </complexType>
+<complexType name="infoNameType">
+  <simpleContent>
+    <extension base = "eppcom:labelType">
+      <attribute name="hosts" type="domain:hostsType"
+       default="all"/>
+    </extension>
+  </simpleContent>
+</complexType>
 
-   <!--
-   Child elements of the <transfer> command.
-   -->
-   <complexType name="transferType">
-    <sequence>
-      <element name="name" type="eppcom:labelType"/>
-      <element name="period" type="domain:periodType"
-       minOccurs="0"/>
-      <element name="authInfo" type="domain:authInfoType"
-       minOccurs="0"/>
-    </sequence>
-   </complexType>
+<simpleType name="hostsType">
+  <restriction base="token">
+    <enumeration value="all"/>
+    <enumeration value="del"/>
+    <enumeration value="none"/>
+    <enumeration value="sub"/>
+  </restriction>
+</simpleType>
 
-   <!--
-   Child elements of the <update> command.
-   -->
-   <complexType name="updateType">
-    <sequence>
-      <element name="name" type="eppcom:labelType"/>
-      <element name="add" type="domain:addRemType"
-       minOccurs="0"/>
-      <element name="rem" type="domain:addRemType"
-       minOccurs="0"/>
-      <element name="chg" type="domain:chgType"
-       minOccurs="0"/>
-    </sequence>
-   </complexType>
+<!--
+Child elements of the <renew> command.
+-->
+<complexType name="renewType">
+  <sequence>
+    <element name="name" type="eppcom:labelType"/>
+    <element name="curExpDate" type="date"/>
+    <element name="period" type="domain:periodType"
+     minOccurs="0"/>
+  </sequence>
+ </complexType>
 
-   <!--
-   Data elements that can be added or removed.
-   -->
-   <complexType name="addRemType">
-    <sequence>
-      <element name="ns" type="domain:nsType"
-       minOccurs="0"/>
-      <element name="contact" type="domain:contactType"
-       minOccurs="0" maxOccurs="unbounded"/>
-      <element name="status" type="domain:statusType"
-       minOccurs="0" maxOccurs="11"/>
-    </sequence>
-   </complexType>
+<!--
+Child elements of the <transfer> command.
+-->
+<complexType name="transferType">
+  <sequence>
+    <element name="name" type="eppcom:labelType"/>
+    <element name="period" type="domain:periodType"
+     minOccurs="0"/>
+    <element name="authInfo" type="domain:authInfoType"
+     minOccurs="0"/>
+  </sequence>
+</complexType>
 
-   <!--
-   Data elements that can be changed.
-   -->
-   <complexType name="chgType">
-    <sequence>
-      <element name="registrant" type="domain:clIDChgType"
-       minOccurs="0"/>
-      <element name="authInfo" type="domain:authInfoChgType"
-       minOccurs="0"/>
-    </sequence>
-   </complexType>
+<!--
+Child elements of the <update> command.
+-->
+<complexType name="updateType">
+  <sequence>
+    <element name="name" type="eppcom:labelType"/>
+    <element name="add" type="domain:addRemType"
+     minOccurs="0"/>
+    <element name="rem" type="domain:addRemType"
+     minOccurs="0"/>
+    <element name="chg" type="domain:chgType"
+     minOccurs="0"/>
+  </sequence>
+</complexType>
 
-   <!--
-   Allow the registrant value to be nullified by changing the
-   minLength restriction to "0".
-   -->
+<!--
+Data elements that can be added or removed.
+-->
+<complexType name="addRemType">
+  <sequence>
+    <element name="ns" type="domain:nsType"
+     minOccurs="0"/>
+    <element name="contact" type="domain:contactType"
+     minOccurs="0" maxOccurs="unbounded"/>
+    <element name="status" type="domain:statusType"
+     minOccurs="0" maxOccurs="11"/>
+  </sequence>
+</complexType>
 
-   <complexType name="clIDChgType">
-    <simpleContent>
-      <extension base="domain:clIDChgSimpleType">
-        <attribute name="verified" type="domain:verifiedType"/>
-      </extension>
-    </simpleContent>
-   </complexType>
+<!--
+Data elements that can be changed.
+-->
+<complexType name="chgType">
+  <sequence>
+    <element name="registrant" type="domain:clIDChgType"
+     minOccurs="0"/>
+    <element name="authInfo" type="domain:authInfoChgType"
+     minOccurs="0"/>
+  </sequence>
+</complexType>
 
-  <simpleType name="clIDChgSimpleType">
-    <restriction base="token">
-      <minLength value="0"/>
-    </restriction>
-  </simpleType>
+<!--
+Allow the registrant value to be nullified by changing the
+minLength restriction to "0".
+-->
 
-  <simpleType name="verifiedType">
-    <restriction base="token">
-      <enumeration value="yes"/>
-      <enumeration value="no"/>
-    </restriction>
-  </simpleType>
+<complexType name="clIDChgType">
+  <simpleContent>
+    <extension base="domain:clIDChgSimpleType">
+      <attribute name="verified" type="domain:verifiedType"/>
+    </extension>
+  </simpleContent>
+</complexType>
 
+<simpleType name="clIDChgSimpleType">
+  <restriction base="token">
+    <minLength value="0"/>
+  </restriction>
+</simpleType>
 
-   <!--
-   Allow the authInfo value to be nullified by including an
-   empty element within the choice.
-   -->
-   <complexType name="authInfoChgType">
-    <choice>
-      <element name="pw" type="eppcom:pwAuthInfoType"/>
-      <element name="ext" type="eppcom:extAuthInfoType"/>
-      <element name="null"/>
-    </choice>
-   </complexType>
+<simpleType name="verifiedType">
+  <restriction base="token">
+    <enumeration value="yes"/>
+    <enumeration value="no"/>
+  </restriction>
+</simpleType>
 
-   <!--
-   Child response elements.
-   -->
-   <element name="chkData" type="domain:chkDataType"/>
-   <element name="creData" type="domain:creDataType"/>
-   <element name="infData" type="domain:infDataType"/>
-   <element name="panData" type="domain:panDataType"/>
-   <element name="renData" type="domain:renDataType"/>
-   <element name="trnData" type="domain:trnDataType"/>
+<!--
+Allow the authInfo value to be nullified by including an
+empty element within the choice.
+-->
+<complexType name="authInfoChgType">
+  <choice>
+    <element name="pw" type="eppcom:pwAuthInfoType"/>
+    <element name="ext" type="eppcom:extAuthInfoType"/>
+    <element name="null"/>
+  </choice>
+</complexType>
 
-   <!--
-   <check> response elements.
-   -->
-   <complexType name="chkDataType">
-    <sequence>
-      <element name="cd" type="domain:checkType"
-       maxOccurs="unbounded"/>
-    </sequence>
-   </complexType>
+<!--
+Child response elements.
+-->
+<element name="chkData" type="domain:chkDataType"/>
+<element name="creData" type="domain:creDataType"/>
+<element name="infData" type="domain:infDataType"/>
+<element name="panData" type="domain:panDataType"/>
+<element name="renData" type="domain:renDataType"/>
+<element name="trnData" type="domain:trnDataType"/>
 
-   <complexType name="checkType">
-    <sequence>
-      <element name="name" type="domain:checkNameType"/>
-      <element name="reason" type="eppcom:reasonType"
-       minOccurs="0"/>
-    </sequence>
-   </complexType>
+<!--
+<check> response elements.
+-->
+<complexType name="chkDataType">
+  <sequence>
+    <element name="cd" type="domain:checkType"
+     maxOccurs="unbounded"/>
+  </sequence>
+ </complexType>
 
-   <complexType name="checkNameType">
-    <simpleContent>
-      <extension base="eppcom:labelType">
-        <attribute name="avail" type="boolean"
-         use="required"/>
-      </extension>
-    </simpleContent>
-   </complexType>
+<complexType name="checkType">
+  <sequence>
+    <element name="name" type="domain:checkNameType"/>
+    <element name="reason" type="eppcom:reasonType"
+     minOccurs="0"/>
+  </sequence>
+</complexType>
 
-   <!--
-   <create> response elements.
-   -->
-   <complexType name="creDataType">
-    <sequence>
-      <element name="name" type="eppcom:labelType"/>
-      <element name="crDate" type="dateTime"/>
-      <element name="exDate" type="dateTime"
-       minOccurs="0"/>
-    </sequence>
-   </complexType>
+<complexType name="checkNameType">
+  <simpleContent>
+    <extension base="eppcom:labelType">
+      <attribute name="avail" type="boolean"
+       use="required"/>
+    </extension>
+  </simpleContent>
+</complexType>
 
-   <!--
-   <info> response elements.
-   -->
+<!--
+<create> response elements.
+-->
+<complexType name="creDataType">
+  <sequence>
+    <element name="name" type="eppcom:labelType"/>
+    <element name="crDate" type="dateTime"/>
+    <element name="exDate" type="dateTime"
+     minOccurs="0"/>
+  </sequence>
+</complexType>
 
-   <complexType name="infDataType">
-    <sequence>
-      <element name="name" type="eppcom:labelType"/>
-      <element name="roid" type="eppcom:roidType"/>
-      <element name="status" type="domain:statusType"
-       minOccurs="0" maxOccurs="11"/>
-      <element name="registrant" type="eppcom:clIDType"
-       minOccurs="0"/>
-      <element name="contact" type="domain:contactType"
-       minOccurs="0" maxOccurs="unbounded"/>
-      <element name="ns" type="domain:nsType"
-       minOccurs="0"/>
-      <element name="host" type="eppcom:labelType"
-       minOccurs="0" maxOccurs="unbounded"/>
-      <element name="clID" type="eppcom:clIDType"/>
-      <element name="crID" type="eppcom:clIDType"
-       minOccurs="0"/>
-      <element name="crDate" type="dateTime"
-       minOccurs="0"/>
-      <element name="upID" type="eppcom:clIDType"
-       minOccurs="0"/>
-      <element name="upDate" type="dateTime"
-       minOccurs="0"/>
-      <element name="exDate" type="dateTime"
-       minOccurs="0"/>
-      <element name="trDate" type="dateTime"
-       minOccurs="0"/>
-      <element name="authInfo" type="domain:authInfoType"
-       minOccurs="0"/>
-    </sequence>
-   </complexType>
+<!--
+<info> response elements.
+-->
 
-   <!--
-   Status is a combination of attributes and an optional
-   human-readable message that may be expressed in languages other
-   than English.
-   -->
-   <complexType name="statusType">
-    <simpleContent>
-      <extension base="normalizedString">
-        <attribute name="s" type="domain:statusValueType"
-         use="required"/>
-        <attribute name="lang" type="language"
-         default="en"/>
-      </extension>
-    </simpleContent>
-   </complexType>
+<complexType name="infDataType">
+  <sequence>
+    <element name="name" type="eppcom:labelType"/>
+    <element name="roid" type="eppcom:roidType"/>
+    <element name="status" type="domain:statusType"
+     minOccurs="0" maxOccurs="11"/>
+    <element name="registrant" type="eppcom:clIDType"
+     minOccurs="0"/>
+    <element name="contact" type="domain:contactType"
+     minOccurs="0" maxOccurs="unbounded"/>
+    <element name="ns" type="domain:nsType"
+     minOccurs="0"/>
+    <element name="host" type="eppcom:labelType"
+     minOccurs="0" maxOccurs="unbounded"/>
+    <element name="clID" type="eppcom:clIDType"/>
+    <element name="crID" type="eppcom:clIDType"
+     minOccurs="0"/>
+    <element name="crDate" type="dateTime"
+     minOccurs="0"/>
+    <element name="upID" type="eppcom:clIDType"
+     minOccurs="0"/>
+    <element name="upDate" type="dateTime"
+     minOccurs="0"/>
+    <element name="exDate" type="dateTime"
+     minOccurs="0"/>
+    <element name="trDate" type="dateTime"
+     minOccurs="0"/>
+    <element name="authInfo" type="domain:authInfoType"
+     minOccurs="0"/>
+  </sequence>
+</complexType>
 
-   <simpleType name="statusValueType">
-    <restriction base="token">
-      <enumeration value="clientDeleteProhibited"/>
-      <enumeration value="clientHold"/>
-      <enumeration value="clientRenewProhibited"/>
-      <enumeration value="clientTransferProhibited"/>
-      <enumeration value="clientUpdateProhibited"/>
-      <enumeration value="inactive"/>
-      <enumeration value="ok"/>
-      <enumeration value="expired"/>
-      <enumeration value="pendingCreate"/>
-      <enumeration value="pendingDelete"/>
-      <enumeration value="pendingRenew"/>
-      <enumeration value="pendingTransfer"/>
-      <enumeration value="pendingUpdate"/>
-      <enumeration value="pendingDeleteConfirmation"/>
-      <enumeration value="serverDeleteProhibited"/>
-      <enumeration value="serverHold"/>
-      <enumeration value="serverRenewProhibited"/>
-      <enumeration value="serverTransferProhibited"/>
-      <enumeration value="serverUpdateProhibited"/>
-      <enumeration value="serverForceDelete"/>
-      <enumeration value="serverManualInzone"/>
-      <enumeration value="serverRegistrantChangeProhibited"/>
-      <enumeration value="serverAdminChangeProhibited"/>
-      <enumeration value="serverTechChangeProhibited"/>
-      <enumeration value="deleteCandidate"/>
-    </restriction>
-   </simpleType>
+<!--
+Status is a combination of attributes and an optional
+human-readable message that may be expressed in languages other
+than English.
+-->
+<complexType name="statusType">
+  <simpleContent>
+    <extension base="normalizedString">
+      <attribute name="s" type="domain:statusValueType"
+       use="required"/>
+      <attribute name="lang" type="language"
+       default="en"/>
+    </extension>
+  </simpleContent>
+</complexType>
 
-   <!--
-   Pending action notification response elements.
-   -->
-   <complexType name="panDataType">
-    <sequence>
-      <element name="name" type="domain:paNameType"/>
-      <element name="paTRID" type="epp:trIDType"/>
-      <element name="paDate" type="dateTime"/>
-    </sequence>
-   </complexType>
+<simpleType name="statusValueType">
+  <restriction base="token">
+    <enumeration value="clientDeleteProhibited"/>
+    <enumeration value="clientHold"/>
+    <enumeration value="clientRenewProhibited"/>
+    <enumeration value="clientTransferProhibited"/>
+    <enumeration value="clientUpdateProhibited"/>
+    <enumeration value="inactive"/>
+    <enumeration value="ok"/>
+    <enumeration value="expired"/>
+    <enumeration value="pendingCreate"/>
+    <enumeration value="pendingDelete"/>
+    <enumeration value="pendingRenew"/>
+    <enumeration value="pendingTransfer"/>
+    <enumeration value="pendingUpdate"/>
+    <enumeration value="pendingDeleteConfirmation"/>
+    <enumeration value="serverDeleteProhibited"/>
+    <enumeration value="serverHold"/>
+    <enumeration value="serverRenewProhibited"/>
+    <enumeration value="serverTransferProhibited"/>
+    <enumeration value="serverUpdateProhibited"/>
+    <enumeration value="serverForceDelete"/>
+    <enumeration value="serverManualInzone"/>
+    <enumeration value="serverRegistrantChangeProhibited"/>
+    <enumeration value="serverAdminChangeProhibited"/>
+    <enumeration value="serverTechChangeProhibited"/>
+    <enumeration value="deleteCandidate"/>
+  </restriction>
+</simpleType>
 
-   <complexType name="paNameType">
-    <simpleContent>
-      <extension base="eppcom:labelType">
-        <attribute name="paResult" type="boolean"
-         use="required"/>
-      </extension>
-    </simpleContent>
-   </complexType>
+<!--
+Pending action notification response elements.
+-->
+<complexType name="panDataType">
+  <sequence>
+    <element name="name" type="domain:paNameType"/>
+    <element name="paTRID" type="epp:trIDType"/>
+    <element name="paDate" type="dateTime"/>
+  </sequence>
+</complexType>
 
-   <!--
-   <renew> response elements.
-   -->
-   <complexType name="renDataType">
-   <sequence>
+<complexType name="paNameType">
+  <simpleContent>
+    <extension base="eppcom:labelType">
+      <attribute name="paResult" type="boolean"
+       use="required"/>
+    </extension>
+  </simpleContent>
+</complexType>
+
+<!--
+<renew> response elements.
+-->
+<complexType name="renDataType">
+  <sequence>
     <element name="name" type="eppcom:labelType"/>
     <element name="exDate" type="dateTime"
      minOccurs="0"/>
-   </sequence>
-   </complexType>
+  </sequence>
+</complexType>
 
-   <!--
-   <transfer> response elements.
-   -->
-   <complexType name="trnDataType">
-   <sequence>
+<!--
+<transfer> response elements.
+-->
+<complexType name="trnDataType">
+  <sequence>
     <element name="name" type="eppcom:labelType"/>
     <element name="trStatus" type="eppcom:trStatusType"/>
     <element name="reID" type="eppcom:clIDType"/>
@@ -450,9 +461,10 @@
     <element name="acDate" type="dateTime"/>
     <element name="exDate" type="dateTime"
      minOccurs="0"/>
-   </sequence>
-   </complexType>
-   <!--
-   End of schema.
-   -->
-   </schema>
+  </sequence>
+</complexType>
+
+<!--
+End of schema.
+ -->
+</schema>
diff --git a/doc/schemas/eppcom-1.0.xsd b/doc/schemas/eppcom-1.0.xsd
index d6ef94b24..3b7d5d65c 100644
--- a/doc/schemas/eppcom-1.0.xsd
+++ b/doc/schemas/eppcom-1.0.xsd
@@ -53,7 +53,7 @@ Abstract client and object identifier type.
   <simpleType name="clIDType">
     <restriction base="token">
       <minLength value="3"/>
-      <maxLength value="16"/>
+<!--      <maxLength value="16"/> -->
     </restriction>
   </simpleType>
 
@@ -102,4 +102,4 @@ Transfer status identifiers.
 <!--
 End of schema.
 -->
-</schema>
\ No newline at end of file
+</schema>
diff --git a/doc/schemas/keyrelay-1.0.xsd b/doc/schemas/keyrelay-1.0.xsd
new file mode 100644
index 000000000..2239754e7
--- /dev/null
+++ b/doc/schemas/keyrelay-1.0.xsd
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<schema targetNamespace="urn:ietf:params:xml:ns:keyrelay-1.0"
+  xmlns:keyrelay="urn:ietf:params:xml:ns:keyrelay-1.0"
+  xmlns:epp="urn:ietf:params:xml:ns:epp-1.0"
+  xmlns:eppcom="urn:ietf:params:xml:ns:eppcom-1.0"
+  xmlns:secDNS="urn:ietf:params:xml:ns:secDNS-1.1"
+  xmlns:domain="urn:ietf:params:xml:ns:domain-1.0"
+  xmlns="http://www.w3.org/2001/XMLSchema"
+  elementFormDefault="qualified">
+
+  <annotation>
+    <documentation>
+      Extensible Provisioning Protocol v1.0 protocol
+      extension schema for relaying DNSSEC key material.
+    </documentation>
+  </annotation>
+
+  <import namespace="urn:ietf:params:xml:ns:epp-1.0"/>
+  <import namespace="urn:ietf:params:xml:ns:eppcom-1.0"/>
+  <import namespace="urn:ietf:params:xml:ns:secDNS-1.1"/>
+  <import namespace="urn:ietf:params:xml:ns:domain-1.0"/>
+
+  <element name="keyRelayData" type="keyrelay:keyRelayDataType" />
+  <element name="infData" type="keyrelay:infDataType" />
+  <element name="create" type="keyrelay:createType" />
+
+  <complexType name="createType">
+    <sequence>
+      <element name="name" type="eppcom:labelType"/>
+      <!-- <element name="authInfo" type="domain:authInfoType"/> -->
+      <element name="keyRelayData" type="keyrelay:keyRelayDataType"
+          maxOccurs="unbounded"/>
+    </sequence>
+  </complexType>
+
+  <complexType name="infDataType">
+    <sequence>
+      <element name="name" type="eppcom:labelType"/>
+      <!-- <element name="authInfo" type="domain:authInfoType"/> -->
+      <element name="keyRelayData" type="keyrelay:keyRelayDataType"
+          maxOccurs="unbounded"/>
+      <element name="crDate" type="dateTime"/>
+      <element name="reID" type="eppcom:clIDType" />
+      <element name="acID" type="eppcom:clIDType" />
+    </sequence>
+  </complexType>
+
+  <complexType name="keyRelayDataType">
+    <sequence>
+      <element name="keyData" type="secDNS:keyDataType" />
+      <element name="expiry" type="keyrelay:keyRelayExpiryType"
+          minOccurs="0" />
+    </sequence>
+  </complexType>
+
+  <complexType name="keyRelayExpiryType">
+    <choice>
+      <element name="absolute" type="dateTime" />
+      <element name="relative" type="duration" />
+    </choice>
+  </complexType>
+</schema>
diff --git a/lib/schemas/all-ee-1.0.xsd b/lib/schemas/all-ee-1.0.xsd
new file mode 100644
index 000000000..3013daf48
--- /dev/null
+++ b/lib/schemas/all-ee-1.0.xsd
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+  <!--
+  This schema imports other schemas used for Estonian ccTLD
+  .ee EPP queries and responses.
+  -->
+  <schema targetNamespace="https://epp.tld.ee/schema/all-ee-1.0"
+          xmlns:all="https://epp.tld.ee/schema/all-ee-1.0"
+          xmlns="http://www.w3.org/2001/XMLSchema"
+          elementFormDefault="qualified">
+
+    <!--
+    Import all schemas related to .ee EPP protocol.
+    Anytime the version of any imported schema is raised, the version of
+    'all' schema is also raised.
+    eppcom and epp schemas never change the version. This would result
+    in incompatibility with EPP standard.
+    -->
+    <import namespace="urn:ietf:params:xml:ns:eppcom-1.0"
+      schemaLocation="lib/schemas/eppcom-1.0.xsd"/>
+    <import namespace="urn:ietf:params:xml:ns:epp-1.0"
+      schemaLocation="lib/schemas/epp-1.0.xsd"/>
+    <!-- EPP protocol extension: DNSSEC -->
+    <import namespace="urn:ietf:params:xml:ns:secDNS-1.1"
+      schemaLocation="lib/schemas/secDNS-1.1.xsd"/>
+    <!-- EPP protocol extension: DNSSEC keyrelay -->
+    <import namespace="urn:ietf:params:xml:ns:keyrelay-1.0"
+      schemaLocation="lib/schemas/keyrelay-1.0.xsd"/>
+    <import namespace="urn:ietf:params:xml:ns:host-1.0"
+      schemaLocation="lib/schemas/host-1.0.xsd"/>
+    <!-- EPP protocol extension: .ee specific -->
+    <import namespace="https://epp.tld.ee/schema/eis-1.0"
+      schemaLocation="lib/schemas/eis-1.0.xsd"/>
+    <import namespace="https://epp.tld.ee/schema/contact-eis-1.0"
+      schemaLocation="lib/schemas/contact-eis-1.0.xsd"/>
+    <import namespace="https://epp.tld.ee/schema/domain-eis-1.0"
+      schemaLocation="lib/schemas/domain-eis-1.0.xsd"/>
+
+    <annotation>
+      <documentation>
+        Extensible Provisioning Protocol v1.0
+        all schema's grouped together
+      </documentation>
+    </annotation>
+
+  </schema>
diff --git a/lib/schemas/contact-1.0.xsd b/lib/schemas/contact-1.0.xsd
new file mode 100644
index 000000000..9b4c244cd
--- /dev/null
+++ b/lib/schemas/contact-1.0.xsd
@@ -0,0 +1,388 @@
+<?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"
+       xmlns:epp="urn:ietf:params:xml:ns:epp-1.0"
+       xmlns:eppcom="urn:ietf:params:xml:ns:eppcom-1.0"
+       xmlns="http://www.w3.org/2001/XMLSchema"
+       elementFormDefault="qualified">
+
+<!--
+Import common element types.
+-->
+ <import namespace="urn:ietf:params:xml:ns:eppcom-1.0"/>
+ <import namespace="urn:ietf:params:xml:ns:epp-1.0"/>
+
+ <annotation>
+   <documentation>
+     Extensible Provisioning Protocol v1.0
+     contact provisioning schema.
+   </documentation>
+ </annotation>
+
+<!--
+Child elements found in EPP commands.
+-->
+ <element name="check" type="contact:mIDType"/>
+ <element name="create" type="contact:createType"/>
+ <element name="delete" type="contact:sIDType"/>
+ <element name="info" type="contact:authIDType"/>
+ <element name="transfer" type="contact:authIDType"/>
+ <element name="update" type="contact:updateType"/>
+
+<!--
+Utility types.
+-->
+ <simpleType name="ccType">
+   <restriction base="token">
+     <length value="2"/>
+   </restriction>
+ </simpleType>
+
+ <complexType name="e164Type">
+   <simpleContent>
+     <extension base="contact:e164StringType">
+       <attribute name="x" type="token"/>
+     </extension>
+   </simpleContent>
+ </complexType>
+
+ <simpleType name="e164StringType">
+   <restriction base="token">
+     <pattern value="(\+[0-9]{1,3}\.[0-9]{1,14})?"/>
+     <maxLength value="17"/>
+   </restriction>
+ </simpleType>
+
+ <simpleType name="pcType">
+   <restriction base="token">
+     <maxLength value="16"/>
+   </restriction>
+ </simpleType>
+
+ <simpleType name="postalLineType">
+    <restriction base="normalizedString">
+      <minLength value="1"/>
+      <maxLength value="255"/>
+    </restriction>
+ </simpleType>
+
+ <simpleType name="optPostalLineType">
+    <restriction base="normalizedString">
+      <maxLength value="255"/>
+    </restriction>
+ </simpleType>
+
+<!--
+Child elements of the <create> command.
+-->
+ <complexType name="createType">
+   <sequence>
+     <element name="id" type="eppcom:clIDType"/>
+     <element name="postalInfo" type="contact:postalInfoType"
+      maxOccurs="2"/>
+     <element name="voice" type="contact:e164Type"
+      minOccurs="0"/>
+     <element name="fax" type="contact:e164Type"
+      minOccurs="0"/>
+     <element name="email" type="eppcom:minTokenType"/>
+     <element name="authInfo" type="contact:authInfoType"/>
+     <element name="disclose" type="contact:discloseType"
+      minOccurs="0"/>
+   </sequence>
+ </complexType>
+
+ <complexType name="postalInfoType">
+   <sequence>
+     <element name="name" type="contact:postalLineType"/>
+     <element name="org" type="contact:optPostalLineType"
+      minOccurs="0"/>
+     <element name="addr" type="contact:addrType"/>
+   </sequence>
+   <attribute name="type" type="contact:postalInfoEnumType"
+    use="required"/>
+ </complexType>
+
+ <simpleType name="postalInfoEnumType">
+   <restriction base="token">
+     <enumeration value="loc"/>
+     <enumeration value="int"/>
+   </restriction>
+ </simpleType>
+
+ <complexType name="addrType">
+   <sequence>
+     <element name="street" type="contact:optPostalLineType"
+      minOccurs="0" maxOccurs="3"/>
+     <element name="city" type="contact:postalLineType"/>
+     <element name="sp" type="contact:optPostalLineType"
+      minOccurs="0"/>
+     <element name="pc" type="contact:pcType"
+      minOccurs="0"/>
+     <element name="cc" type="contact:ccType"/>
+   </sequence>
+ </complexType>
+
+ <complexType name="authInfoType">
+   <choice>
+     <element name="pw" type="eppcom:pwAuthInfoType"/>
+     <element name="ext" type="eppcom:extAuthInfoType"/>
+   </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"/>
+ </complexType>
+
+<!--
+Child element of commands that require only an identifier.
+-->
+ <complexType name="sIDType">
+   <sequence>
+     <element name="id" type="eppcom:clIDType"/>
+   </sequence>
+ </complexType>
+
+<!--
+Child element of commands that accept multiple identifiers.
+-->
+ <complexType name="mIDType">
+   <sequence>
+     <element name="id" type="eppcom:clIDType"
+      maxOccurs="unbounded"/>
+   </sequence>
+ </complexType>
+
+<!--
+Child elements of the <info> and <transfer> commands.
+-->
+ <complexType name="authIDType">
+   <sequence>
+     <element name="id" type="eppcom:clIDType"/>
+     <element name="authInfo" type="contact:authInfoType"
+      minOccurs="0"/>
+   </sequence>
+ </complexType>
+
+<!--
+Child elements of the <update> command.
+-->
+ <complexType name="updateType">
+   <sequence>
+     <element name="id" type="eppcom:clIDType"/>
+     <element name="add" type="contact:addRemType"
+      minOccurs="0"/>
+     <element name="rem" type="contact:addRemType"
+      minOccurs="0"/>
+     <element name="chg" type="contact:chgType"
+      minOccurs="0"/>
+   </sequence>
+ </complexType>
+
+<!--
+Data elements that can be added or removed.
+-->
+ <complexType name="addRemType">
+   <sequence>
+     <element name="status" type="contact:statusType"
+      maxOccurs="7"/>
+   </sequence>
+ </complexType>
+
+<!--
+Data elements that can be changed.
+-->
+ <complexType name="chgType">
+   <sequence>
+     <element name="postalInfo" type="contact:chgPostalInfoType"
+      minOccurs="0" maxOccurs="2"/>
+     <element name="voice" type="contact:e164Type"
+      minOccurs="0"/>
+     <element name="fax" type="contact:e164Type"
+      minOccurs="0"/>
+     <element name="email" type="eppcom:minTokenType"
+      minOccurs="0"/>
+     <element name="authInfo" type="contact:authInfoType"
+      minOccurs="0"/>
+     <element name="disclose" type="contact:discloseType"
+      minOccurs="0"/>
+   </sequence>
+ </complexType>
+
+ <complexType name="chgPostalInfoType">
+   <sequence>
+     <element name="name" type="contact:postalLineType"
+      minOccurs="0"/>
+     <element name="org" type="contact:optPostalLineType"
+      minOccurs="0"/>
+     <element name="addr" type="contact:addrType"
+      minOccurs="0"/>
+   </sequence>
+   <attribute name="type" type="contact:postalInfoEnumType"
+    use="required"/>
+ </complexType>
+
+<!--
+Child response elements.
+-->
+ <element name="chkData" type="contact:chkDataType"/>
+ <element name="creData" type="contact:creDataType"/>
+ <element name="infData" type="contact:infDataType"/>
+ <element name="panData" type="contact:panDataType"/>
+ <element name="trnData" type="contact:trnDataType"/>
+
+<!--
+<check> response elements.
+-->
+ <complexType name="chkDataType">
+   <sequence>
+     <element name="cd" type="contact:checkType"
+      maxOccurs="unbounded"/>
+   </sequence>
+ </complexType>
+
+ <complexType name="checkType">
+   <sequence>
+     <element name="id" type="contact:checkIDType"/>
+     <element name="reason" type="eppcom:reasonType"
+      minOccurs="0"/>
+   </sequence>
+ </complexType>
+
+ <complexType name="checkIDType">
+   <simpleContent>
+     <extension base="eppcom:clIDType">
+       <attribute name="avail" type="boolean"
+        use="required"/>
+     </extension>
+   </simpleContent>
+ </complexType>
+
+<!--
+<create> response elements.
+-->
+ <complexType name="creDataType">
+   <sequence>
+     <element name="id" type="eppcom:clIDType"/>
+     <element name="crDate" type="dateTime"/>
+   </sequence>
+ </complexType>
+
+<!--
+<info> response elements.
+-->
+ <complexType name="infDataType">
+   <sequence>
+     <element name="id" type="eppcom:clIDType"/>
+     <element name="roid" type="eppcom:roidType"/>
+     <element name="status" type="contact:statusType"
+      maxOccurs="7"/>
+     <element name="postalInfo" type="contact:postalInfoType"
+      maxOccurs="2"/>
+     <element name="voice" type="contact:e164Type"
+      minOccurs="0"/>
+     <element name="fax" type="contact:e164Type"
+      minOccurs="0"/>
+     <element name="email" type="eppcom:minTokenType"/>
+     <element name="clID" type="eppcom:clIDType"/>
+     <element name="crID" type="eppcom:clIDType"/>
+     <element name="crDate" type="dateTime"/>
+     <element name="upID" type="eppcom:clIDType"
+      minOccurs="0"/>
+     <element name="upDate" type="dateTime"
+      minOccurs="0"/>
+     <element name="trDate" type="dateTime"
+      minOccurs="0"/>
+     <element name="authInfo" type="contact:authInfoType"
+      minOccurs="0"/>
+     <element name="disclose" type="contact:discloseType"
+      minOccurs="0"/>
+   </sequence>
+ </complexType>
+
+<!--
+Status is a combination of attributes and an optional human-readable
+message that may be expressed in languages other than English.
+-->
+ <complexType name="statusType">
+   <simpleContent>
+     <extension base="normalizedString">
+       <attribute name="s" type="contact:statusValueType"
+        use="required"/>
+       <attribute name="lang" type="language"
+        default="en"/>
+     </extension>
+   </simpleContent>
+ </complexType>
+
+ <simpleType name="statusValueType">
+   <restriction base="token">
+     <enumeration value="clientDeleteProhibited"/>
+     <enumeration value="clientTransferProhibited"/>
+     <enumeration value="clientUpdateProhibited"/>
+     <enumeration value="linked"/>
+     <enumeration value="ok"/>
+     <enumeration value="pendingCreate"/>
+     <enumeration value="pendingDelete"/>
+     <enumeration value="pendingTransfer"/>
+     <enumeration value="pendingUpdate"/>
+     <enumeration value="serverDeleteProhibited"/>
+     <enumeration value="serverTransferProhibited"/>
+     <enumeration value="serverUpdateProhibited"/>
+   </restriction>
+ </simpleType>
+
+<!--
+Pending action notification response elements.
+-->
+ <complexType name="panDataType">
+   <sequence>
+     <element name="id" type="contact:paCLIDType"/>
+     <element name="paTRID" type="epp:trIDType"/>
+     <element name="paDate" type="dateTime"/>
+   </sequence>
+ </complexType>
+
+ <complexType name="paCLIDType">
+   <simpleContent>
+     <extension base="eppcom:clIDType">
+       <attribute name="paResult" type="boolean"
+        use="required"/>
+     </extension>
+   </simpleContent>
+ </complexType>
+
+<!--
+<transfer> response elements.
+-->
+ <complexType name="trnDataType">
+   <sequence>
+     <element name="id" type="eppcom:clIDType"/>
+     <element name="trStatus" type="eppcom:trStatusType"/>
+     <element name="reID" type="eppcom:clIDType"/>
+     <element name="reDate" type="dateTime"/>
+     <element name="acID" type="eppcom:clIDType"/>
+     <element name="acDate" type="dateTime"/>
+   </sequence>
+ </complexType>
+
+<!--
+End of schema.
+-->
+</schema>
\ No newline at end of file
diff --git a/lib/schemas/contact-eis-1.0.xsd b/lib/schemas/contact-eis-1.0.xsd
index ed0596c96..cec571cec 100644
--- a/lib/schemas/contact-eis-1.0.xsd
+++ b/lib/schemas/contact-eis-1.0.xsd
@@ -10,9 +10,9 @@
    <!--
    Import common element types.
    -->
-    <import namespace="urn:ietf:params:xml:ns:eppcom-1.0" schemaLocation="lib/schemas/eppcom-1.0.xsd"/>
-    <import namespace="urn:ietf:params:xml:ns:epp-1.0" schemaLocation="lib/schemas/epp-1.0.xsd"/>
-    <import namespace="https://epp.tld.ee/schema/eis-1.0.xsd" schemaLocation="lib/schemas/eis-1.0.xsd"/>
+    <import namespace="urn:ietf:params:xml:ns:eppcom-1.0"/>
+    <import namespace="urn:ietf:params:xml:ns:epp-1.0"/>
+    <import namespace="https://epp.tld.ee/schema/eis-1.0.xsd"/>
 
     <annotation>
       <documentation>
diff --git a/lib/schemas/domain-1.0.xsd b/lib/schemas/domain-1.0.xsd
new file mode 100644
index 000000000..46859859e
--- /dev/null
+++ b/lib/schemas/domain-1.0.xsd
@@ -0,0 +1,432 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<schema targetNamespace="urn:ietf:params:xml:ns:domain-1.0"
+     xmlns:domain="urn:ietf:params:xml:ns:domain-1.0"
+     xmlns:host="urn:ietf:params:xml:ns:host-1.0"
+     xmlns:epp="urn:ietf:params:xml:ns:epp-1.0"
+     xmlns:eppcom="urn:ietf:params:xml:ns:eppcom-1.0"
+     xmlns="http://www.w3.org/2001/XMLSchema"
+     elementFormDefault="qualified">
+
+<!--
+Import common element types.
+-->
+<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>
+   Extensible Provisioning Protocol v1.0
+   domain provisioning schema.
+ </documentation>
+</annotation>
+
+<!--
+Child elements found in EPP commands.
+-->
+<element name="check" type="domain:mNameType"/>
+<element name="create" type="domain:createType"/>
+<element name="delete" type="domain:sNameType"/>
+<element name="info" type="domain:infoType"/>
+<element name="renew" type="domain:renewType"/>
+<element name="transfer" type="domain:transferType"/>
+<element name="update" type="domain:updateType"/>
+<!--
+Child elements of the <create> command.
+-->
+<complexType name="createType">
+ <sequence>
+   <element name="name" type="eppcom:labelType"/>
+   <element name="period" type="domain:periodType"
+    minOccurs="0"/>
+   <element name="ns" type="domain:nsType"
+    minOccurs="0"/>
+   <element name="registrant" type="eppcom:clIDType"
+    minOccurs="0"/>
+   <element name="contact" type="domain:contactType"
+    minOccurs="0" maxOccurs="unbounded"/>
+   <element name="authInfo" type="domain:authInfoType"/>
+ </sequence>
+</complexType>
+
+<complexType name="periodType">
+ <simpleContent>
+   <extension base="domain:pLimitType">
+     <attribute name="unit" type="domain:pUnitType"
+      use="required"/>
+   </extension>
+ </simpleContent>
+</complexType>
+
+<simpleType name="pLimitType">
+ <restriction base="unsignedShort">
+   <minInclusive value="1"/>
+   <maxInclusive value="99"/>
+ </restriction>
+</simpleType>
+
+<simpleType name="pUnitType">
+ <restriction base="token">
+   <enumeration value="y"/>
+   <enumeration value="m"/>
+ </restriction>
+</simpleType>
+
+<complexType name="nsType">
+ <choice>
+   <element name="hostObj" type="eppcom:labelType"
+    maxOccurs="unbounded"/>
+   <element name="hostAttr" type="domain:hostAttrType"
+    maxOccurs="unbounded"/>
+ </choice>
+</complexType>
+<!--
+Name servers are either host objects or attributes.
+-->
+
+<complexType name="hostAttrType">
+ <sequence>
+   <element name="hostName" type="eppcom:labelType"/>
+   <element name="hostAddr" type="host:addrType"
+    minOccurs="0" maxOccurs="unbounded"/>
+ </sequence>
+</complexType>
+<!--
+If attributes, addresses are optional and follow the
+structure defined in the host mapping.
+-->
+
+<complexType name="contactType">
+ <simpleContent>
+ <extension base="eppcom:clIDType">
+     <attribute name="type" type="domain:contactAttrType"/>
+   </extension>
+ </simpleContent>
+</complexType>
+
+<simpleType name="contactAttrType">
+ <restriction base="token">
+   <enumeration value="admin"/>
+   <enumeration value="billing"/>
+   <enumeration value="tech"/>
+ </restriction>
+</simpleType>
+
+<complexType name="authInfoType">
+ <choice>
+   <element name="pw" type="eppcom:pwAuthInfoType"/>
+   <element name="ext" type="eppcom:extAuthInfoType"/>
+ </choice>
+</complexType>
+
+<!--
+Child element of commands that require a single name.
+-->
+<complexType name="sNameType">
+ <sequence>
+   <element name="name" type="eppcom:labelType"/>
+ </sequence>
+</complexType>
+<!--
+Child element of commands that accept multiple names.
+-->
+<complexType name="mNameType">
+ <sequence>
+   <element name="name" type="eppcom:labelType"
+    maxOccurs="unbounded"/>
+ </sequence>
+</complexType>
+
+<!--
+Child elements of the <info> command.
+-->
+<complexType name="infoType">
+ <sequence>
+   <element name="name" type="domain:infoNameType"/>
+   <element name="authInfo" type="domain:authInfoType"
+    minOccurs="0"/>
+ </sequence>
+</complexType>
+
+<complexType name="infoNameType">
+ <simpleContent>
+   <extension base = "eppcom:labelType">
+     <attribute name="hosts" type="domain:hostsType"
+      default="all"/>
+   </extension>
+ </simpleContent>
+</complexType>
+
+<simpleType name="hostsType">
+ <restriction base="token">
+   <enumeration value="all"/>
+   <enumeration value="del"/>
+   <enumeration value="none"/>
+   <enumeration value="sub"/>
+ </restriction>
+</simpleType>
+
+<!--
+Child elements of the <renew> command.
+-->
+<complexType name="renewType">
+ <sequence>
+   <element name="name" type="eppcom:labelType"/>
+   <element name="curExpDate" type="date"/>
+   <element name="period" type="domain:periodType"
+    minOccurs="0"/>
+ </sequence>
+</complexType>
+
+<!--
+Child elements of the <transfer> command.
+-->
+<complexType name="transferType">
+ <sequence>
+   <element name="name" type="eppcom:labelType"/>
+   <element name="period" type="domain:periodType"
+    minOccurs="0"/>
+   <element name="authInfo" type="domain:authInfoType"
+    minOccurs="0"/>
+ </sequence>
+</complexType>
+
+<!--
+Child elements of the <update> command.
+-->
+
+<complexType name="updateType">
+ <sequence>
+   <element name="name" type="eppcom:labelType"/>
+   <element name="add" type="domain:addRemType"
+    minOccurs="0"/>
+   <element name="rem" type="domain:addRemType"
+    minOccurs="0"/>
+   <element name="chg" type="domain:chgType"
+    minOccurs="0"/>
+ </sequence>
+</complexType>
+
+<!--
+Data elements that can be added or removed.
+-->
+<complexType name="addRemType">
+ <sequence>
+   <element name="ns" type="domain:nsType"
+    minOccurs="0"/>
+   <element name="contact" type="domain:contactType"
+    minOccurs="0" maxOccurs="unbounded"/>
+   <element name="status" type="domain:statusType"
+    minOccurs="0" maxOccurs="11"/>
+ </sequence>
+</complexType>
+
+<!--
+Data elements that can be changed.
+-->
+<complexType name="chgType">
+ <sequence>
+   <element name="registrant" type="domain:clIDChgType"
+    minOccurs="0"/>
+   <element name="authInfo" type="domain:authInfoChgType"
+    minOccurs="0"/>
+ </sequence>
+</complexType>
+
+<!--
+Allow the registrant value to be nullified by changing the
+minLength restriction to "0".
+-->
+<simpleType name="clIDChgType">
+ <restriction base="token">
+   <minLength value="0"/>
+   <maxLength value="16"/>
+ </restriction>
+</simpleType>
+
+<!--
+Allow the authInfo value to be nullified by including an
+empty element within the choice.
+-->
+<complexType name="authInfoChgType">
+ <choice>
+   <element name="pw" type="eppcom:pwAuthInfoType"/>
+   <element name="ext" type="eppcom:extAuthInfoType"/>
+   <element name="null"/>
+ </choice>
+</complexType>
+
+<!--
+Child response elements.
+-->
+<element name="chkData" type="domain:chkDataType"/>
+<element name="creData" type="domain:creDataType"/>
+<element name="infData" type="domain:infDataType"/>
+<element name="panData" type="domain:panDataType"/>
+<element name="renData" type="domain:renDataType"/>
+<element name="trnData" type="domain:trnDataType"/>
+
+<!--
+<check> response elements.
+-->
+<complexType name="chkDataType">
+ <sequence>
+   <element name="cd" type="domain:checkType"
+    maxOccurs="unbounded"/>
+ </sequence>
+</complexType>
+
+<complexType name="checkType">
+ <sequence>
+   <element name="name" type="domain:checkNameType"/>
+   <element name="reason" type="eppcom:reasonType"
+    minOccurs="0"/>
+ </sequence>
+</complexType>
+
+<complexType name="checkNameType">
+ <simpleContent>
+   <extension base="eppcom:labelType">
+     <attribute name="avail" type="boolean"
+      use="required"/>
+   </extension>
+ </simpleContent>
+</complexType>
+
+<!--
+<create> response elements.
+-->
+<complexType name="creDataType">
+ <sequence>
+   <element name="name" type="eppcom:labelType"/>
+   <element name="crDate" type="dateTime"/>
+   <element name="exDate" type="dateTime"
+    minOccurs="0"/>
+ </sequence>
+</complexType>
+
+<!--
+<info> response elements.
+-->
+<complexType name="infDataType">
+ <sequence>
+   <element name="name" type="eppcom:labelType"/>
+   <element name="roid" type="eppcom:roidType"/>
+   <element name="status" type="domain:statusType"
+    minOccurs="0" maxOccurs="11"/>
+   <element name="registrant" type="eppcom:clIDType"
+    minOccurs="0"/>
+   <element name="contact" type="domain:contactType"
+    minOccurs="0" maxOccurs="unbounded"/>
+   <element name="ns" type="domain:nsType"
+    minOccurs="0"/>
+   <element name="host" type="eppcom:labelType"
+    minOccurs="0" maxOccurs="unbounded"/>
+   <element name="clID" type="eppcom:clIDType"/>
+   <element name="crID" type="eppcom:clIDType"
+    minOccurs="0"/>
+   <element name="crDate" type="dateTime"
+    minOccurs="0"/>
+   <element name="upID" type="eppcom:clIDType"
+    minOccurs="0"/>
+   <element name="upDate" type="dateTime"
+    minOccurs="0"/>
+   <element name="exDate" type="dateTime"
+    minOccurs="0"/>
+   <element name="trDate" type="dateTime"
+    minOccurs="0"/>
+   <element name="authInfo" type="domain:authInfoType"
+    minOccurs="0"/>
+ </sequence>
+</complexType>
+
+<!--
+Status is a combination of attributes and an optional
+human-readable message that may be expressed in languages other
+than English.
+-->
+<complexType name="statusType">
+ <simpleContent>
+   <extension base="normalizedString">
+     <attribute name="s" type="domain:statusValueType"
+      use="required"/>
+     <attribute name="lang" type="language"
+      default="en"/>
+   </extension>
+ </simpleContent>
+</complexType>
+
+<simpleType name="statusValueType">
+ <restriction base="token">
+   <enumeration value="clientDeleteProhibited"/>
+   <enumeration value="clientHold"/>
+   <enumeration value="clientRenewProhibited"/>
+   <enumeration value="clientTransferProhibited"/>
+   <enumeration value="clientUpdateProhibited"/>
+   <enumeration value="inactive"/>
+   <enumeration value="ok"/>
+   <enumeration value="pendingCreate"/>
+   <enumeration value="pendingDelete"/>
+   <enumeration value="pendingRenew"/>
+   <enumeration value="pendingTransfer"/>
+   <enumeration value="pendingUpdate"/>
+   <enumeration value="serverDeleteProhibited"/>
+   <enumeration value="serverHold"/>
+   <enumeration value="serverRenewProhibited"/>
+   <enumeration value="serverTransferProhibited"/>
+   <enumeration value="serverUpdateProhibited"/>
+ </restriction>
+</simpleType>
+
+<!--
+Pending action notification response elements.
+-->
+<complexType name="panDataType">
+ <sequence>
+   <element name="name" type="domain:paNameType"/>
+   <element name="paTRID" type="epp:trIDType"/>
+   <element name="paDate" type="dateTime"/>
+ </sequence>
+</complexType>
+
+<complexType name="paNameType">
+ <simpleContent>
+   <extension base="eppcom:labelType">
+     <attribute name="paResult" type="boolean"
+      use="required"/>
+   </extension>
+ </simpleContent>
+</complexType>
+
+<!--
+<renew> response elements.
+-->
+<complexType name="renDataType">
+<sequence>
+ <element name="name" type="eppcom:labelType"/>
+ <element name="exDate" type="dateTime"
+  minOccurs="0"/>
+</sequence>
+</complexType>
+
+<!--
+<transfer> response elements.
+-->
+<complexType name="trnDataType">
+<sequence>
+ <element name="name" type="eppcom:labelType"/>
+ <element name="trStatus" type="eppcom:trStatusType"/>
+ <element name="reID" type="eppcom:clIDType"/>
+ <element name="reDate" type="dateTime"/>
+ <element name="acID" type="eppcom:clIDType"/>
+ <element name="acDate" type="dateTime"/>
+ <element name="exDate" type="dateTime"
+  minOccurs="0"/>
+</sequence>
+</complexType>
+
+<!--
+End of schema.
+-->
+</schema>
\ No newline at end of file
diff --git a/lib/schemas/domain-eis-1.0.xsd b/lib/schemas/domain-eis-1.0.xsd
index eb2b420da..b38abf9d4 100644
--- a/lib/schemas/domain-eis-1.0.xsd
+++ b/lib/schemas/domain-eis-1.0.xsd
@@ -1,460 +1,458 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-   <schema targetNamespace="https://epp.tld.ee/schema/domain-eis-1.0.xsd"
-        xmlns:domain="https://epp.tld.ee/schema/domain-eis-1.0.xsd"
-        xmlns:host="urn:ietf:params:xml:ns:host-1.0"
-        xmlns:epp="urn:ietf:params:xml:ns:epp-1.0"
-        xmlns:eppcom="urn:ietf:params:xml:ns:eppcom-1.0"
-        xmlns="http://www.w3.org/2001/XMLSchema"
-        elementFormDefault="qualified">
+<schema targetNamespace="https://epp.tld.ee/schema/domain-eis-1.0.xsd"
+     xmlns:domain="https://epp.tld.ee/schema/domain-eis-1.0.xsd"
+     xmlns:host="urn:ietf:params:xml:ns:host-1.0"
+     xmlns:epp="urn:ietf:params:xml:ns:epp-1.0"
+     xmlns:eppcom="urn:ietf:params:xml:ns:eppcom-1.0"
+     xmlns="http://www.w3.org/2001/XMLSchema"
+     elementFormDefault="qualified">
 
-   <!--
-   Import common element types.
-   -->
-   <import namespace="urn:ietf:params:xml:ns:eppcom-1.0" schemaLocation="lib/schemas/eppcom-1.0.xsd"/>
-   <import namespace="urn:ietf:params:xml:ns:epp-1.0" schemaLocation="lib/schemas/epp-1.0.xsd"/>
-   <import namespace="urn:ietf:params:xml:ns:host-1.0" schemaLocation="lib/schemas/host-1.0.xsd"/>
-   <import namespace="urn:ietf:params:xml:ns:secDNS-1.1" schemaLocation="lib/schemas/secDNS-1.1.xsd"/>
-   <import namespace="https://epp.tld.ee/schema/eis-1.0.xsd" schemaLocation="lib/schemas/eis-1.0.xsd"/>
+<!--
+Import common element types.
+-->
+<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"/>
+<import namespace="urn:ietf:params:xml:ns:secDNS-1.1"/>
+<import namespace="https://epp.tld.ee/schema/eis-1.0.xsd"/>
 
-   <annotation>
-    <documentation>
-      Extensible Provisioning Protocol v1.0
-      domain provisioning schema.
-    </documentation>
-   </annotation>
+<annotation>
+  <documentation>
+    Extensible Provisioning Protocol v1.0
+    domain provisioning schema.
+  </documentation>
+</annotation>
 
-   <!--
-   Child elements found in EPP commands.
-   -->
-   <element name="check" type="domain:mNameType"/>
-   <element name="create" type="domain:createType"/>
-   <element name="delete" type="domain:verifiedDeleteType"/>
-   <element name="info" type="domain:infoType"/>
-   <element name="renew" type="domain:renewType"/>
-   <element name="transfer" type="domain:transferType"/>
-   <element name="update" type="domain:updateType"/>
-   <!--
-   Child elements of the <create> command.
-   -->
-   <complexType name="createType">
-    <sequence>
-      <element name="name" type="eppcom:labelType"/>
-      <element name="period" type="domain:periodType"
-       minOccurs="0"/>
-      <element name="ns" type="domain:nsType"
-       minOccurs="0"/>
-      <element name="registrant" type="eppcom:clIDType"
-       minOccurs="0"/>
-      <element name="contact" type="domain:contactType"
-       minOccurs="0" maxOccurs="unbounded"/>
-      <element name="authInfo" type="domain:authInfoType" minOccurs="0"/>
-    </sequence>
-   </complexType>
+<!--
+Child elements found in EPP commands.
+-->
+<element name="check" type="domain:mNameType"/>
+<element name="create" type="domain:createType"/>
+<element name="delete" type="domain:deleteType"/>
+<element name="info" type="domain:infoType"/>
+<element name="renew" type="domain:renewType"/>
+<element name="transfer" type="domain:transferType"/>
+<element name="update" type="domain:updateType"/>
 
-   <complexType name="periodType">
-    <simpleContent>
-      <extension base="domain:pLimitType">
-        <attribute name="unit" type="domain:pUnitType"
-         use="required"/>
-      </extension>
-    </simpleContent>
-   </complexType>
+<!--
+Child elements of the <create> command.
+-->
+<complexType name="createType">
+  <sequence>
+    <element name="name" type="eppcom:labelType"/>
+    <element name="period" type="domain:periodType"
+     minOccurs="0"/>
+    <element name="ns" type="domain:nsType"
+     minOccurs="0"/>
+    <element name="registrant" type="eppcom:clIDType"
+     minOccurs="0"/>
+    <element name="contact" type="domain:contactType"
+     minOccurs="0" maxOccurs="unbounded"/>
+    <element name="authInfo" type="domain:authInfoType" minOccurs="0"/>
+  </sequence>
+</complexType>
 
-   <simpleType name="pLimitType">
-    <restriction base="unsignedShort">
-      <minInclusive value="1"/>
-      <maxInclusive value="1095"/>
-    </restriction>
-   </simpleType>
+<complexType name="periodType">
+  <simpleContent>
+    <extension base="domain:pLimitType">
+      <attribute name="unit" type="domain:pUnitType"
+       use="required"/>
+    </extension>
+  </simpleContent>
+</complexType>
 
-   <simpleType name="pUnitType">
-    <restriction base="token">
-      <enumeration value="y"/>
-      <enumeration value="m"/>
-      <enumeration value="d"/>
-    </restriction>
-   </simpleType>
+<simpleType name="pLimitType">
+  <restriction base="unsignedShort">
+    <minInclusive value="1"/>
+    <maxInclusive value="1095"/>
+  </restriction>
+</simpleType>
 
-   <complexType name="nsType">
-    <choice>
-      <element name="hostObj" type="eppcom:labelType"
-       maxOccurs="unbounded"/>
-      <element name="hostAttr" type="domain:hostAttrType"
-       maxOccurs="unbounded"/>
-    </choice>
-   </complexType>
-   <!--
-   Name servers are either host objects or attributes.
-   -->
+<simpleType name="pUnitType">
+  <restriction base="token">
+    <enumeration value="y"/>
+    <enumeration value="m"/>
+    <enumeration value="d"/>
+  </restriction>
+</simpleType>
 
-   <complexType name="hostAttrType">
-    <sequence>
-      <element name="hostName" type="eppcom:labelType"/>
-      <element name="hostAddr" type="host:addrType"
+<complexType name="nsType">
+  <choice>
+    <element name="hostObj" type="eppcom:labelType"
+     maxOccurs="unbounded"/>
+    <element name="hostAttr" type="domain:hostAttrType"
+     maxOccurs="unbounded"/>
+  </choice>
+</complexType>
+<!--
+Name servers are either host objects or attributes.
+-->
 
-       minOccurs="0" maxOccurs="unbounded"/>
-    </sequence>
-   </complexType>
-   <!--
-   If attributes, addresses are optional and follow the
-   structure defined in the host mapping.
-   -->
+<complexType name="hostAttrType">
+  <sequence>
+    <element name="hostName" type="eppcom:labelType"/>
+    <element name="hostAddr" type="host:addrType"
+     minOccurs="0" maxOccurs="unbounded"/>
+  </sequence>
+</complexType>
+<!--
+If attributes, addresses are optional and follow the
+structure defined in the host mapping.
+-->
 
-   <complexType name="contactType">
-    <simpleContent>
-      <extension base="eppcom:clIDType">
-        <attribute name="type" type="domain:contactAttrType"/>
-      </extension>
-    </simpleContent>
-   </complexType>
+<complexType name="contactType">
+  <simpleContent>
+    <extension base="eppcom:clIDType">
+      <attribute name="type" type="domain:contactAttrType"/>
+    </extension>
+  </simpleContent>
+</complexType>
 
-   <simpleType name="contactAttrType">
-    <restriction base="token">
-      <enumeration value="admin"/>
-      <enumeration value="billing"/>
-      <enumeration value="tech"/>
-    </restriction>
-   </simpleType>
+<simpleType name="contactAttrType">
+  <restriction base="token">
+    <enumeration value="admin"/>
+    <enumeration value="billing"/>
+    <enumeration value="tech"/>
+  </restriction>
+</simpleType>
 
-   <complexType name="authInfoType">
-    <choice>
-      <element name="pw" type="eppcom:pwAuthInfoType"/>
-      <element name="ext" type="eppcom:extAuthInfoType"/>
-    </choice>
-   </complexType>
+<complexType name="authInfoType">
+  <choice>
+    <element name="pw" type="eppcom:pwAuthInfoType"/>
+    <element name="ext" type="eppcom:extAuthInfoType"/>
+  </choice>
+</complexType>
 
-   <!--
-   Child element of commands that require a single name.
-   -->
-   <complexType name="sNameType">
-    <sequence>
-      <element name="name" type="eppcom:labelType"/>
-    </sequence>
-   </complexType>
-   <!--
-   Extended delete with verified attribute and include single name content
-   -->
-   <complexType name="verifiedDeleteType">
-     <sequence>
-     <element name="name" type="eppcom:labelType"/>
-     </sequence>
-       <attribute name="verified" use="optional">
-         <simpleType>
-         <restriction base="string">
-           <enumeration value="yes"/>
-           <enumeration value="no"/>
-         </restriction>
-         </simpleType>
-       </attribute>
-   </complexType>
-   <!--
-   Child element of commands that accept multiple names.
-   -->
-   <complexType name="mNameType">
-    <sequence>
-      <element name="name" type="eppcom:labelType"
-       maxOccurs="unbounded"/>
-    </sequence>
-   </complexType>
+<!--
+Child element of commands that require a single name.
+-->
+<complexType name="sNameType">
+  <sequence>
+    <element name="name" type="eppcom:labelType"/>
+  </sequence>
+</complexType>
+<!--
+Child element of commands that accept multiple names.
+-->
+<complexType name="mNameType">
+  <sequence>
+    <element name="name" type="eppcom:labelType"
+     maxOccurs="unbounded"/>
+  </sequence>
+</complexType>
 
-   <!--
-   Child elements of the <info> command.
-   -->
-   <complexType name="infoType">
-    <sequence>
-      <element name="name" type="domain:infoNameType"/>
-      <element name="authInfo" type="domain:authInfoType"
-       minOccurs="0"/>
-    </sequence>
-   </complexType>
+<!--
+Child element of the <delete> command - .ee specific (verified)
+-->
+<complexType name="deleteType">
+  <sequence>
+    <element name="name" type="eppcom:labelType"/>
+  </sequence>
+  <attribute name="verified" type="domain:verifiedType"
+   use="optional"/>
+</complexType>
 
-   <complexType name="infoNameType">
-    <simpleContent>
-      <extension base = "eppcom:labelType">
-        <attribute name="hosts" type="domain:hostsType"
-         default="all"/>
-      </extension>
-    </simpleContent>
-   </complexType>
+<!--
+Child elements of the <info> command.
+-->
+<complexType name="infoType">
+  <sequence>
+    <element name="name" type="domain:infoNameType"/>
+    <element name="authInfo" type="domain:authInfoType"
+     minOccurs="0"/>
+  </sequence>
+</complexType>
 
-   <simpleType name="hostsType">
-    <restriction base="token">
-      <enumeration value="all"/>
-      <enumeration value="del"/>
-      <enumeration value="none"/>
-      <enumeration value="sub"/>
-    </restriction>
-   </simpleType>
+<complexType name="infoNameType">
+  <simpleContent>
+    <extension base = "eppcom:labelType">
+      <attribute name="hosts" type="domain:hostsType"
+       default="all"/>
+    </extension>
+  </simpleContent>
+</complexType>
 
-   <!--
-   Child elements of the <renew> command.
-   -->
-   <complexType name="renewType">
-    <sequence>
-      <element name="name" type="eppcom:labelType"/>
-      <element name="curExpDate" type="date"/>
-      <element name="period" type="domain:periodType"
-       minOccurs="0"/>
-    </sequence>
-   </complexType>
+<simpleType name="hostsType">
+  <restriction base="token">
+    <enumeration value="all"/>
+    <enumeration value="del"/>
+    <enumeration value="none"/>
+    <enumeration value="sub"/>
+  </restriction>
+</simpleType>
 
-   <!--
-   Child elements of the <transfer> command.
-   -->
-   <complexType name="transferType">
-    <sequence>
-      <element name="name" type="eppcom:labelType"/>
-      <element name="period" type="domain:periodType"
-       minOccurs="0"/>
-      <element name="authInfo" type="domain:authInfoType"
-       minOccurs="0"/>
-    </sequence>
-   </complexType>
+<!--
+Child elements of the <renew> command.
+-->
+<complexType name="renewType">
+  <sequence>
+    <element name="name" type="eppcom:labelType"/>
+    <element name="curExpDate" type="date"/>
+    <element name="period" type="domain:periodType"
+     minOccurs="0"/>
+  </sequence>
+ </complexType>
 
-   <!--
-   Child elements of the <update> command.
-   -->
-   <complexType name="updateType">
-    <sequence>
-      <element name="name" type="eppcom:labelType"/>
-      <element name="add" type="domain:addRemType"
-       minOccurs="0"/>
-      <element name="rem" type="domain:addRemType"
-       minOccurs="0"/>
-      <element name="chg" type="domain:chgType"
-       minOccurs="0"/>
-    </sequence>
-   </complexType>
+<!--
+Child elements of the <transfer> command.
+-->
+<complexType name="transferType">
+  <sequence>
+    <element name="name" type="eppcom:labelType"/>
+    <element name="period" type="domain:periodType"
+     minOccurs="0"/>
+    <element name="authInfo" type="domain:authInfoType"
+     minOccurs="0"/>
+  </sequence>
+</complexType>
 
-   <!--
-   Data elements that can be added or removed.
-   -->
-   <complexType name="addRemType">
-    <sequence>
-      <element name="ns" type="domain:nsType"
-       minOccurs="0"/>
-      <element name="contact" type="domain:contactType"
-       minOccurs="0" maxOccurs="unbounded"/>
-      <element name="status" type="domain:statusType"
-       minOccurs="0" maxOccurs="11"/>
-    </sequence>
-   </complexType>
+<!--
+Child elements of the <update> command.
+-->
+<complexType name="updateType">
+  <sequence>
+    <element name="name" type="eppcom:labelType"/>
+    <element name="add" type="domain:addRemType"
+     minOccurs="0"/>
+    <element name="rem" type="domain:addRemType"
+     minOccurs="0"/>
+    <element name="chg" type="domain:chgType"
+     minOccurs="0"/>
+  </sequence>
+</complexType>
 
-   <!--
-   Data elements that can be changed.
-   -->
-   <complexType name="chgType">
-    <sequence>
-      <element name="registrant" type="domain:clIDChgType"
-       minOccurs="0"/>
-      <element name="authInfo" type="domain:authInfoChgType"
-       minOccurs="0"/>
-    </sequence>
-   </complexType>
+<!--
+Data elements that can be added or removed.
+-->
+<complexType name="addRemType">
+  <sequence>
+    <element name="ns" type="domain:nsType"
+     minOccurs="0"/>
+    <element name="contact" type="domain:contactType"
+     minOccurs="0" maxOccurs="unbounded"/>
+    <element name="status" type="domain:statusType"
+     minOccurs="0" maxOccurs="11"/>
+  </sequence>
+</complexType>
 
-   <!--
-   Allow the registrant value to be nullified by changing the
-   minLength restriction to "0".
-   -->
+<!--
+Data elements that can be changed.
+-->
+<complexType name="chgType">
+  <sequence>
+    <element name="registrant" type="domain:clIDChgType"
+     minOccurs="0"/>
+    <element name="authInfo" type="domain:authInfoChgType"
+     minOccurs="0"/>
+  </sequence>
+</complexType>
 
-   <complexType name="clIDChgType">
-    <simpleContent>
-      <extension base="domain:clIDChgSimpleType">
-        <attribute name="verified" type="domain:verifiedType"/>
-      </extension>
-    </simpleContent>
-   </complexType>
+<!--
+Allow the registrant value to be nullified by changing the
+minLength restriction to "0".
+-->
 
-  <simpleType name="clIDChgSimpleType">
-    <restriction base="token">
-      <minLength value="0"/>
-    </restriction>
-  </simpleType>
+<complexType name="clIDChgType">
+  <simpleContent>
+    <extension base="domain:clIDChgSimpleType">
+      <attribute name="verified" type="domain:verifiedType"/>
+    </extension>
+  </simpleContent>
+</complexType>
 
-  <simpleType name="verifiedType">
-    <restriction base="token">
-      <enumeration value="yes"/>
-      <enumeration value="no"/>
-    </restriction>
-  </simpleType>
+<simpleType name="clIDChgSimpleType">
+  <restriction base="token">
+    <minLength value="0"/>
+  </restriction>
+</simpleType>
 
+<simpleType name="verifiedType">
+  <restriction base="token">
+    <enumeration value="yes"/>
+    <enumeration value="no"/>
+  </restriction>
+</simpleType>
 
-   <!--
-   Allow the authInfo value to be nullified by including an
-   empty element within the choice.
-   -->
-   <complexType name="authInfoChgType">
-    <choice>
-      <element name="pw" type="eppcom:pwAuthInfoType"/>
-      <element name="ext" type="eppcom:extAuthInfoType"/>
-      <element name="null"/>
-    </choice>
-   </complexType>
+<!--
+Allow the authInfo value to be nullified by including an
+empty element within the choice.
+-->
+<complexType name="authInfoChgType">
+  <choice>
+    <element name="pw" type="eppcom:pwAuthInfoType"/>
+    <element name="ext" type="eppcom:extAuthInfoType"/>
+    <element name="null"/>
+  </choice>
+</complexType>
 
-   <!--
-   Child response elements.
-   -->
-   <element name="chkData" type="domain:chkDataType"/>
-   <element name="creData" type="domain:creDataType"/>
-   <element name="infData" type="domain:infDataType"/>
-   <element name="panData" type="domain:panDataType"/>
-   <element name="renData" type="domain:renDataType"/>
-   <element name="trnData" type="domain:trnDataType"/>
+<!--
+Child response elements.
+-->
+<element name="chkData" type="domain:chkDataType"/>
+<element name="creData" type="domain:creDataType"/>
+<element name="infData" type="domain:infDataType"/>
+<element name="panData" type="domain:panDataType"/>
+<element name="renData" type="domain:renDataType"/>
+<element name="trnData" type="domain:trnDataType"/>
 
-   <!--
-   <check> response elements.
-   -->
-   <complexType name="chkDataType">
-    <sequence>
-      <element name="cd" type="domain:checkType"
-       maxOccurs="unbounded"/>
-    </sequence>
-   </complexType>
+<!--
+<check> response elements.
+-->
+<complexType name="chkDataType">
+  <sequence>
+    <element name="cd" type="domain:checkType"
+     maxOccurs="unbounded"/>
+  </sequence>
+ </complexType>
 
-   <complexType name="checkType">
-    <sequence>
-      <element name="name" type="domain:checkNameType"/>
-      <element name="reason" type="eppcom:reasonType"
-       minOccurs="0"/>
-    </sequence>
-   </complexType>
+<complexType name="checkType">
+  <sequence>
+    <element name="name" type="domain:checkNameType"/>
+    <element name="reason" type="eppcom:reasonType"
+     minOccurs="0"/>
+  </sequence>
+</complexType>
 
-   <complexType name="checkNameType">
-    <simpleContent>
-      <extension base="eppcom:labelType">
-        <attribute name="avail" type="boolean"
-         use="required"/>
-      </extension>
-    </simpleContent>
-   </complexType>
+<complexType name="checkNameType">
+  <simpleContent>
+    <extension base="eppcom:labelType">
+      <attribute name="avail" type="boolean"
+       use="required"/>
+    </extension>
+  </simpleContent>
+</complexType>
 
-   <!--
-   <create> response elements.
-   -->
-   <complexType name="creDataType">
-    <sequence>
-      <element name="name" type="eppcom:labelType"/>
-      <element name="crDate" type="dateTime"/>
-      <element name="exDate" type="dateTime"
-       minOccurs="0"/>
-    </sequence>
-   </complexType>
+<!--
+<create> response elements.
+-->
+<complexType name="creDataType">
+  <sequence>
+    <element name="name" type="eppcom:labelType"/>
+    <element name="crDate" type="dateTime"/>
+    <element name="exDate" type="dateTime"
+     minOccurs="0"/>
+  </sequence>
+</complexType>
 
-   <!--
-   <info> response elements.
-   -->
+<!--
+<info> response elements.
+-->
 
-   <complexType name="infDataType">
-    <sequence>
-      <element name="name" type="eppcom:labelType"/>
-      <element name="roid" type="eppcom:roidType"/>
-      <element name="status" type="domain:statusType"
-       minOccurs="0" maxOccurs="11"/>
-      <element name="registrant" type="eppcom:clIDType"
-       minOccurs="0"/>
-      <element name="contact" type="domain:contactType"
-       minOccurs="0" maxOccurs="unbounded"/>
-      <element name="ns" type="domain:nsType"
-       minOccurs="0"/>
-      <element name="host" type="eppcom:labelType"
-       minOccurs="0" maxOccurs="unbounded"/>
-      <element name="clID" type="eppcom:clIDType"/>
-      <element name="crID" type="eppcom:clIDType"
-       minOccurs="0"/>
-      <element name="crDate" type="dateTime"
-       minOccurs="0"/>
-      <element name="upID" type="eppcom:clIDType"
-       minOccurs="0"/>
-      <element name="upDate" type="dateTime"
-       minOccurs="0"/>
-      <element name="exDate" type="dateTime"
-       minOccurs="0"/>
-      <element name="trDate" type="dateTime"
-       minOccurs="0"/>
-      <element name="authInfo" type="domain:authInfoType"
-       minOccurs="0"/>
-    </sequence>
-   </complexType>
+<complexType name="infDataType">
+  <sequence>
+    <element name="name" type="eppcom:labelType"/>
+    <element name="roid" type="eppcom:roidType"/>
+    <element name="status" type="domain:statusType"
+     minOccurs="0" maxOccurs="11"/>
+    <element name="registrant" type="eppcom:clIDType"
+     minOccurs="0"/>
+    <element name="contact" type="domain:contactType"
+     minOccurs="0" maxOccurs="unbounded"/>
+    <element name="ns" type="domain:nsType"
+     minOccurs="0"/>
+    <element name="host" type="eppcom:labelType"
+     minOccurs="0" maxOccurs="unbounded"/>
+    <element name="clID" type="eppcom:clIDType"/>
+    <element name="crID" type="eppcom:clIDType"
+     minOccurs="0"/>
+    <element name="crDate" type="dateTime"
+     minOccurs="0"/>
+    <element name="upID" type="eppcom:clIDType"
+     minOccurs="0"/>
+    <element name="upDate" type="dateTime"
+     minOccurs="0"/>
+    <element name="exDate" type="dateTime"
+     minOccurs="0"/>
+    <element name="trDate" type="dateTime"
+     minOccurs="0"/>
+    <element name="authInfo" type="domain:authInfoType"
+     minOccurs="0"/>
+  </sequence>
+</complexType>
 
-   <!--
-   Status is a combination of attributes and an optional
-   human-readable message that may be expressed in languages other
-   than English.
-   -->
-   <complexType name="statusType">
-    <simpleContent>
-      <extension base="normalizedString">
-        <attribute name="s" type="domain:statusValueType"
-         use="required"/>
-        <attribute name="lang" type="language"
-         default="en"/>
-      </extension>
-    </simpleContent>
-   </complexType>
+<!--
+Status is a combination of attributes and an optional
+human-readable message that may be expressed in languages other
+than English.
+-->
+<complexType name="statusType">
+  <simpleContent>
+    <extension base="normalizedString">
+      <attribute name="s" type="domain:statusValueType"
+       use="required"/>
+      <attribute name="lang" type="language"
+       default="en"/>
+    </extension>
+  </simpleContent>
+</complexType>
 
-   <simpleType name="statusValueType">
-    <restriction base="token">
-      <enumeration value="clientDeleteProhibited"/>
-      <enumeration value="clientHold"/>
-      <enumeration value="clientRenewProhibited"/>
-      <enumeration value="clientTransferProhibited"/>
-      <enumeration value="clientUpdateProhibited"/>
-      <enumeration value="inactive"/>
-      <enumeration value="ok"/>
-      <enumeration value="pendingCreate"/>
-      <enumeration value="pendingDelete"/>
-      <enumeration value="pendingRenew"/>
-      <enumeration value="pendingTransfer"/>
-      <enumeration value="pendingUpdate"/>
-      <enumeration value="serverDeleteProhibited"/>
-      <enumeration value="serverHold"/>
-      <enumeration value="serverRenewProhibited"/>
-      <enumeration value="serverTransferProhibited"/>
-      <enumeration value="serverUpdateProhibited"/>
-      <!-- Custom EIS domain status values -->
-      <enumeration value="serverTechChangeProhibited"/>
-      <enumeration value="serverAdminChangeProhibited"/>
-      <enumeration value="serverRegistrantChangeProhibited"/>
-    </restriction>
-   </simpleType>
+<simpleType name="statusValueType">
+  <restriction base="token">
+    <enumeration value="clientDeleteProhibited"/>
+    <enumeration value="clientHold"/>
+    <enumeration value="clientRenewProhibited"/>
+    <enumeration value="clientTransferProhibited"/>
+    <enumeration value="clientUpdateProhibited"/>
+    <enumeration value="inactive"/>
+    <enumeration value="ok"/>
+    <enumeration value="expired"/>
+    <enumeration value="pendingCreate"/>
+    <enumeration value="pendingDelete"/>
+    <enumeration value="pendingRenew"/>
+    <enumeration value="pendingTransfer"/>
+    <enumeration value="pendingUpdate"/>
+    <enumeration value="pendingDeleteConfirmation"/>
+    <enumeration value="serverDeleteProhibited"/>
+    <enumeration value="serverHold"/>
+    <enumeration value="serverRenewProhibited"/>
+    <enumeration value="serverTransferProhibited"/>
+    <enumeration value="serverUpdateProhibited"/>
+    <enumeration value="serverForceDelete"/>
+    <enumeration value="serverManualInzone"/>
+    <enumeration value="serverRegistrantChangeProhibited"/>
+    <enumeration value="serverAdminChangeProhibited"/>
+    <enumeration value="serverTechChangeProhibited"/>
+    <enumeration value="deleteCandidate"/>
+  </restriction>
+</simpleType>
 
-   <!--
-   Pending action notification response elements.
-   -->
-   <complexType name="panDataType">
-    <sequence>
-      <element name="name" type="domain:paNameType"/>
-      <element name="paTRID" type="epp:trIDType"/>
-      <element name="paDate" type="dateTime"/>
-    </sequence>
-   </complexType>
+<!--
+Pending action notification response elements.
+-->
+<complexType name="panDataType">
+  <sequence>
+    <element name="name" type="domain:paNameType"/>
+    <element name="paTRID" type="epp:trIDType"/>
+    <element name="paDate" type="dateTime"/>
+  </sequence>
+</complexType>
 
-   <complexType name="paNameType">
-    <simpleContent>
-      <extension base="eppcom:labelType">
-        <attribute name="paResult" type="boolean"
-         use="required"/>
-      </extension>
-    </simpleContent>
-   </complexType>
+<complexType name="paNameType">
+  <simpleContent>
+    <extension base="eppcom:labelType">
+      <attribute name="paResult" type="boolean"
+       use="required"/>
+    </extension>
+  </simpleContent>
+</complexType>
 
-   <!--
-   <renew> response elements.
-   -->
-   <complexType name="renDataType">
-   <sequence>
+<!--
+<renew> response elements.
+-->
+<complexType name="renDataType">
+  <sequence>
     <element name="name" type="eppcom:labelType"/>
     <element name="exDate" type="dateTime"
      minOccurs="0"/>
-   </sequence>
-   </complexType>
+  </sequence>
+</complexType>
 
-   <!--
-   <transfer> response elements.
-   -->
-   <complexType name="trnDataType">
-   <sequence>
+<!--
+<transfer> response elements.
+-->
+<complexType name="trnDataType">
+  <sequence>
     <element name="name" type="eppcom:labelType"/>
     <element name="trStatus" type="eppcom:trStatusType"/>
     <element name="reID" type="eppcom:clIDType"/>
@@ -463,9 +461,10 @@
     <element name="acDate" type="dateTime"/>
     <element name="exDate" type="dateTime"
      minOccurs="0"/>
-   </sequence>
-   </complexType>
-   <!--
-   End of schema.
-   -->
-   </schema>
+  </sequence>
+</complexType>
+
+<!--
+End of schema.
+ -->
+</schema>
diff --git a/lib/schemas/eis-1.0.xsd b/lib/schemas/eis-1.0.xsd
index 8093c832d..0b2ad8f89 100644
--- a/lib/schemas/eis-1.0.xsd
+++ b/lib/schemas/eis-1.0.xsd
@@ -83,7 +83,7 @@
     <simpleContent>
       <extension base="normalizedString">
         <attribute name="type" type="eis:identEnumType" use="required"/>
-        <attribute name="cc" type="eis:ccType" use="required"/>
+        <attribute name="cc" type="eis:ccType"/>
       </extension>
     </simpleContent>
   </complexType>
diff --git a/lib/schemas/epp-1.0.xsd b/lib/schemas/epp-1.0.xsd
index 448b9ae25..3609ad55d 100644
--- a/lib/schemas/epp-1.0.xsd
+++ b/lib/schemas/epp-1.0.xsd
@@ -1,443 +1,446 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-   <schema targetNamespace="urn:ietf:params:xml:ns:epp-1.0"
-           xmlns:epp="urn:ietf:params:xml:ns:epp-1.0"
-           xmlns:eppcom="urn:ietf:params:xml:ns:eppcom-1.0"
-           xmlns="http://www.w3.org/2001/XMLSchema"
-           elementFormDefault="qualified">
+<schema targetNamespace="urn:ietf:params:xml:ns:epp-1.0"
+        xmlns:epp="urn:ietf:params:xml:ns:epp-1.0"
+        xmlns:eppcom="urn:ietf:params:xml:ns:eppcom-1.0"
+        xmlns="http://www.w3.org/2001/XMLSchema"
+        elementFormDefault="qualified">
 
-   <!--
-   Import common element types.
-   -->
-     <import namespace="urn:ietf:params:xml:ns:eppcom-1.0" schemaLocation="lib/schemas/eppcom-1.0.xsd" />
+<!--
+Import common element types.
+-->
 
-     <annotation>
-       <documentation>
-         Extensible Provisioning Protocol v1.0 schema.
-       </documentation>
-     </annotation>
+  <import namespace="urn:ietf:params:xml:ns:eppcom-1.0"/>
 
-   <!--
-   Every EPP XML instance must begin with this element.
-   -->
-     <element name="epp" type="epp:eppType"/>
+  <annotation>
+    <documentation>
+      Extensible Provisioning Protocol v1.0 schema.
+    </documentation>
+  </annotation>
 
-   <!--
-   An EPP XML instance must contain a greeting, hello, command,
-   response, or extension.
-   -->
-     <complexType name="eppType">
-       <choice>
-         <element name="greeting" type="epp:greetingType"/>
-         <element name="hello"/>
-         <element name="command" type="epp:commandType"/>
-         <element name="response" type="epp:responseType"/>
-         <element name="extension" type="epp:extAnyType"/>
-       </choice>
-     </complexType>
+<!--
+Every EPP XML instance must begin with this element.
+-->
+  <element name="epp" type="epp:eppType"/>
 
-   <!--
-   A greeting is sent by a server in response to a client connection
-   or <hello>.
-   -->
-     <complexType name="greetingType">
-       <sequence>
-         <element name="svID" type="epp:sIDType"/>
-         <element name="svDate" type="dateTime"/>
-         <element name="svcMenu" type="epp:svcMenuType"/>
-         <element name="dcp" type="epp:dcpType"/>
-       </sequence>
-     </complexType>
+<!--
+An EPP XML instance must contain a greeting, hello, command,
+response, or extension.
+-->
+  <complexType name="eppType">
+    <choice>
+      <element name="greeting" type="epp:greetingType"/>
+      <element name="hello"/>
+      <element name="command" type="epp:commandType"/>
+      <element name="response" type="epp:responseType"/>
+      <element name="extension" type="epp:extAnyType"/>
+    </choice>
+  </complexType>
 
-   <!--
-   Server IDs are strings with minimum and maximum length restrictions.
-   -->
-     <simpleType name="sIDType">
-       <restriction base="normalizedString">
-         <minLength value="3"/>
-         <maxLength value="64"/>
-       </restriction>
-     </simpleType>
+<!--
+A greeting is sent by a server in response to a client connection
+or <hello>.
+-->
+  <complexType name="greetingType">
+    <sequence>
+      <element name="svID" type="epp:sIDType"/>
+      <element name="svDate" type="dateTime"/>
+      <element name="svcMenu" type="epp:svcMenuType"/>
+      <element name="dcp" type="epp:dcpType"/>
+    </sequence>
+  </complexType>
 
-   <!--
-   A server greeting identifies available object services.
-   -->
-     <complexType name="svcMenuType">
-       <sequence>
-         <element name="version" type="epp:versionType"
-          maxOccurs="unbounded"/>
-         <element name="lang" type="language"
-          maxOccurs="unbounded"/>
-         <element name="objURI" type="anyURI"
-          maxOccurs="unbounded"/>
-         <element name="svcExtension" type="epp:extURIType"
-          minOccurs="0"/>
-       </sequence>
-     </complexType>
+<!--
+Server IDs are strings with minimum and maximum length restrictions.
+-->
+  <simpleType name="sIDType">
+    <restriction base="normalizedString">
+      <minLength value="3"/>
+      <maxLength value="64"/>
+    </restriction>
+  </simpleType>
 
-   <!--
-   Data Collection Policy types.
-   -->
-     <complexType name="dcpType">
-       <sequence>
-         <element name="access" type="epp:dcpAccessType"/>
-         <element name="statement" type="epp:dcpStatementType"
-          maxOccurs="unbounded"/>
-         <element name="expiry" type="epp:dcpExpiryType"
-          minOccurs="0"/>
-       </sequence>
-     </complexType>
+<!--
+A server greeting identifies available object services.
+-->
+  <complexType name="svcMenuType">
+    <sequence>
+      <element name="version" type="epp:versionType"
+       maxOccurs="unbounded"/>
+      <element name="lang" type="language"
+       maxOccurs="unbounded"/>
+      <element name="objURI" type="anyURI"
+       maxOccurs="unbounded"/>
+      <element name="svcExtension" type="epp:extURIType"
+       minOccurs="0"/>
+    </sequence>
+  </complexType>
 
-     <complexType name="dcpAccessType">
-       <choice>
-         <element name="all"/>
-         <element name="none"/>
-         <element name="null"/>
-         <element name="other"/>
-         <element name="personal"/>
-         <element name="personalAndOther"/>
-       </choice>
-     </complexType>
+<!--
+Data Collection Policy types.
+-->
+  <complexType name="dcpType">
+    <sequence>
+      <element name="access" type="epp:dcpAccessType"/>
+      <element name="statement" type="epp:dcpStatementType"
+       maxOccurs="unbounded"/>
+      <element name="expiry" type="epp:dcpExpiryType"
+       minOccurs="0"/>
+    </sequence>
+  </complexType>
 
-     <complexType name="dcpStatementType">
-       <sequence>
-         <element name="purpose" type="epp:dcpPurposeType"/>
-         <element name="recipient" type="epp:dcpRecipientType"/>
-         <element name="retention" type="epp:dcpRetentionType"/>
-       </sequence>
-     </complexType>
+  <complexType name="dcpAccessType">
+    <choice>
+      <element name="all"/>
+      <element name="none"/>
+      <element name="null"/>
+      <element name="other"/>
+      <element name="personal"/>
+      <element name="personalAndOther"/>
+    </choice>
+  </complexType>
 
-     <complexType name="dcpPurposeType">
-       <sequence>
-         <element name="admin"
-          minOccurs="0"/>
-         <element name="contact"
-          minOccurs="0"/>
-         <element name="other"
-          minOccurs="0"/>
-         <element name="prov"
-          minOccurs="0"/>
-       </sequence>
-     </complexType>
+  <complexType name="dcpStatementType">
+    <sequence>
+      <element name="purpose" type="epp:dcpPurposeType"/>
+      <element name="recipient" type="epp:dcpRecipientType"/>
+      <element name="retention" type="epp:dcpRetentionType"/>
+    </sequence>
+  </complexType>
 
-     <complexType name="dcpRecipientType">
-       <sequence>
-         <element name="other"
-          minOccurs="0"/>
-         <element name="ours" type="epp:dcpOursType"
-          minOccurs="0" maxOccurs="unbounded"/>
-         <element name="public"
-          minOccurs="0"/>
-         <element name="same"
-          minOccurs="0"/>
-         <element name="unrelated"
-          minOccurs="0"/>
-       </sequence>
-     </complexType>
+  <complexType name="dcpPurposeType">
+    <sequence>
+      <element name="admin"
+       minOccurs="0"/>
+      <element name="contact"
+       minOccurs="0"/>
+      <element name="other"
+       minOccurs="0"/>
+      <element name="prov"
+       minOccurs="0"/>
+    </sequence>
+  </complexType>
 
-     <complexType name="dcpOursType">
-       <sequence>
-         <element name="recDesc" type="epp:dcpRecDescType"
-          minOccurs="0"/>
-       </sequence>
-     </complexType>
+  <complexType name="dcpRecipientType">
+    <sequence>
+      <element name="other"
+       minOccurs="0"/>
+      <element name="ours" type="epp:dcpOursType"
+       minOccurs="0" maxOccurs="unbounded"/>
+      <element name="public"
+       minOccurs="0"/>
+      <element name="same"
+       minOccurs="0"/>
+      <element name="unrelated"
+       minOccurs="0"/>
+    </sequence>
+  </complexType>
 
-     <simpleType name="dcpRecDescType">
-       <restriction base="token">
-         <minLength value="1"/>
-         <maxLength value="255"/>
-       </restriction>
-     </simpleType>
+  <complexType name="dcpOursType">
+    <sequence>
+      <element name="recDesc" type="epp:dcpRecDescType"
+       minOccurs="0"/>
+    </sequence>
+  </complexType>
 
-     <complexType name="dcpRetentionType">
-       <choice>
-         <element name="business"/>
-         <element name="indefinite"/>
-         <element name="legal"/>
-         <element name="none"/>
-         <element name="stated"/>
-       </choice>
-     </complexType>
+  <simpleType name="dcpRecDescType">
+    <restriction base="token">
+      <minLength value="1"/>
+      <maxLength value="255"/>
+    </restriction>
+  </simpleType>
 
-     <complexType name="dcpExpiryType">
-       <choice>
-         <element name="absolute" type="dateTime"/>
-         <element name="relative" type="duration"/>
-       </choice>
-     </complexType>
+  <complexType name="dcpRetentionType">
+    <choice>
+      <element name="business"/>
+      <element name="indefinite"/>
+      <element name="legal"/>
+      <element name="none"/>
+      <element name="stated"/>
+    </choice>
+  </complexType>
 
-   <!--
-   Extension framework types.
-   -->
-     <complexType name="extAnyType">
-       <sequence>
-         <any namespace="##other"
-          maxOccurs="unbounded"/>
-       </sequence>
-     </complexType>
+  <complexType name="dcpExpiryType">
+    <choice>
+      <element name="absolute" type="dateTime"/>
+      <element name="relative" type="duration"/>
+    </choice>
+  </complexType>
 
-     <complexType name="extURIType">
-       <sequence>
-         <element name="extURI" type="anyURI"
-          maxOccurs="unbounded"/>
-       </sequence>
-     </complexType>
+<!--
+Extension framework types.
+-->
+  <complexType name="extAnyType">
+    <sequence>
+      <any namespace="##other"
+       maxOccurs="unbounded"/>
+    </sequence>
+  </complexType>
 
-   <!--
-   An EPP version number is a dotted pair of decimal numbers.
-   -->
-     <simpleType name="versionType">
-       <restriction base="token">
-         <pattern value="[1-9]+\.[0-9]+"/>
-         <enumeration value="1.0"/>
-       </restriction>
-     </simpleType>
+  <complexType name="extURIType">
+    <sequence>
+      <element name="extURI" type="anyURI"
+       maxOccurs="unbounded"/>
+    </sequence>
+  </complexType>
 
-   <!--
-   Command types.
-   -->
-     <complexType name="commandType">
-       <sequence>
-         <choice>
-           <element name="check" type="epp:readWriteType"/>
-           <element name="create" type="epp:readWriteType"/>
-           <element name="delete" type="epp:readWriteType"/>
-           <element name="info" type="epp:readWriteType"/>
-           <element name="login" type="epp:loginType"/>
-           <element name="logout"/>
-           <element name="poll" type="epp:pollType"/>
-           <element name="renew" type="epp:readWriteType"/>
-           <element name="transfer" type="epp:transferType"/>
-           <element name="update" type="epp:readWriteType"/>
-         </choice>
-         <element name="extension" type="epp:extAnyType"
-          minOccurs="0"/>
-         <element name="clTRID" type="epp:trIDStringType"
-          minOccurs="0"/>
-       </sequence>
-     </complexType>
+<!--
+An EPP version number is a dotted pair of decimal numbers.
+-->
+  <simpleType name="versionType">
+    <restriction base="token">
+      <pattern value="[1-9]+\.[0-9]+"/>
+      <enumeration value="1.0"/>
+    </restriction>
+  </simpleType>
 
-   <!--
-   The <login> command.
-   -->
-     <complexType name="loginType">
-       <sequence>
-         <element name="clID" type="eppcom:clIDType"/>
-         <element name="pw" type="epp:pwType"/>
-         <element name="newPW" type="epp:pwType"
-          minOccurs="0"/>
-         <element name="options" type="epp:credsOptionsType"/>
-         <element name="svcs" type="epp:loginSvcType"/>
-       </sequence>
-     </complexType>
+<!--
+Command types.
+-->
+  <complexType name="commandType">
+    <sequence>
+      <choice>
+        <element name="check" type="epp:readWriteType"/>
+        <element name="create" type="epp:readWriteType"/>
+        <element name="delete" type="epp:readWriteType"/>
+        <element name="info" type="epp:readWriteType"/>
+        <element name="login" type="epp:loginType"/>
+        <element name="logout"/>
+        <element name="poll" type="epp:pollType"/>
+        <element name="renew" type="epp:readWriteType"/>
+        <element name="transfer" type="epp:transferType"/>
+        <element name="update" type="epp:readWriteType"/>
+      </choice>
+      <element name="extension" type="epp:extAnyType"
+       minOccurs="0"/>
+      <element name="clTRID" type="epp:trIDStringType"
+       minOccurs="0"/>
+    </sequence>
+  </complexType>
 
-     <complexType name="credsOptionsType">
-       <sequence>
-         <element name="version" type="epp:versionType"/>
-         <element name="lang" type="language"/>
-       </sequence>
-     </complexType>
+<!--
+The <login> command.
+-->
+  <complexType name="loginType">
+    <sequence>
+      <element name="clID" type="eppcom:clIDType"/>
+      <element name="pw" type="epp:pwType"/>
+      <element name="newPW" type="epp:pwType"
+       minOccurs="0"/>
+      <element name="options" type="epp:credsOptionsType"/>
+      <element name="svcs" type="epp:loginSvcType"/>
+    </sequence>
+  </complexType>
 
-     <simpleType name="pwType">
-       <restriction base="token">
-         <minLength value="6"/>
-         <maxLength value="16"/>
-       </restriction>
-     </simpleType>
+  <complexType name="credsOptionsType">
+    <sequence>
+      <element name="version" type="epp:versionType"/>
+      <element name="lang" type="language"/>
+    </sequence>
+  </complexType>
 
-     <complexType name="loginSvcType">
-       <sequence>
-         <element name="objURI" type="anyURI"
-          maxOccurs="unbounded"/>
-         <element name="svcExtension" type="epp:extURIType"
-          minOccurs="0"/>
-       </sequence>
-     </complexType>
+  <simpleType name="pwType">
+    <restriction base="token">
+      <minLength value="6"/>
+      <maxLength value="16"/>
+    </restriction>
+  </simpleType>
 
-   <!--
-   The <poll> command.
-   -->
-     <complexType name="pollType">
-       <attribute name="op" type="epp:pollOpType"
-        use="required"/>
-       <attribute name="msgID" type="token"/>
-     </complexType>
+  <complexType name="loginSvcType">
+    <sequence>
+      <element name="objURI" type="anyURI"
+       maxOccurs="unbounded"/>
+      <element name="svcExtension" type="epp:extURIType"
+       minOccurs="0"/>
+    </sequence>
+  </complexType>
 
-     <simpleType name="pollOpType">
-       <restriction base="token">
-         <enumeration value="ack"/>
-         <enumeration value="req"/>
-       </restriction>
-     </simpleType>
+<!--
+The <poll> command.
+-->
+  <complexType name="pollType">
+    <attribute name="op" type="epp:pollOpType"
+     use="required"/>
+    <attribute name="msgID" type="token"/>
+  </complexType>
 
-   <!--
-   The <transfer> command.  This is object-specific, and uses attributes
-   to identify the requested operation.
-   -->
-     <complexType name="transferType">
-       <sequence>
-         <any namespace="##other"/>
-       </sequence>
-       <attribute name="op" type="epp:transferOpType"
-        use="required"/>
-     </complexType>
+  <simpleType name="pollOpType">
+    <restriction base="token">
+      <enumeration value="ack"/>
+      <enumeration value="req"/>
+    </restriction>
+  </simpleType>
 
-     <simpleType name="transferOpType">
-       <restriction base="token">
-         <enumeration value="approve"/>
-         <enumeration value="cancel"/>
-         <enumeration value="query"/>
-         <enumeration value="reject"/>
-         <enumeration value="request"/>
-       </restriction>
-     </simpleType>
+<!--
+The <transfer> command.  This is object-specific, and uses attributes
+to identify the requested operation.
+-->
+  <complexType name="transferType">
+    <sequence>
+      <any namespace="##other"/>
+    </sequence>
+    <attribute name="op" type="epp:transferOpType"
+     use="required"/>
+  </complexType>
 
-   <!--
-   All other object-centric commands.  EPP doesn't specify the syntax or
-   semantics of object-centric command elements.  The elements MUST be
-   described in detail in another schema specific to the object.
-   -->
-     <complexType name="readWriteType">
-       <sequence>
-         <any namespace="##other"/>
-       </sequence>
-     </complexType>
+  <simpleType name="transferOpType">
+    <restriction base="token">
+      <enumeration value="approve"/>
+      <enumeration value="cancel"/>
+      <enumeration value="query"/>
+      <enumeration value="reject"/>
+      <enumeration value="request"/>
+    </restriction>
+  </simpleType>
 
-     <complexType name="trIDType">
-       <sequence>
-         <element name="clTRID" type="epp:trIDStringType"
-          minOccurs="0"/>
-         <element name="svTRID" type="epp:trIDStringType"/>
-       </sequence>
-     </complexType>
+<!--
+All other object-centric commands.  EPP doesn't specify the syntax or
+semantics of object-centric command elements.  The elements MUST be
+described in detail in another schema specific to the object.
+-->
+  <complexType name="readWriteType">
+    <sequence>
+      <any namespace="##other"/>
+    </sequence>
+  </complexType>
 
-     <simpleType name="trIDStringType">
-       <restriction base="token">
-         <minLength value="3"/>
-         <maxLength value="64"/>
-       </restriction>
-     </simpleType>
+  <complexType name="trIDType">
+    <sequence>
+      <element name="clTRID" type="epp:trIDStringType"
+       minOccurs="0"/>
+      <element name="svTRID" type="epp:trIDStringType"/>
+    </sequence>
+  </complexType>
 
-   <!--
-   Response types.
-   -->
-     <complexType name="responseType">
-       <sequence>
-         <element name="result" type="epp:resultType"
-          maxOccurs="unbounded"/>
-         <element name="msgQ" type="epp:msgQType"
-          minOccurs="0"/>
+  <simpleType name="trIDStringType">
+    <restriction base="token">
+      <minLength value="3"/>
+      <maxLength value="64"/>
+    </restriction>
+  </simpleType>
 
-         <element name="resData" type="epp:extAnyType"
-          minOccurs="0"/>
-         <element name="extension" type="epp:extAnyType"
-          minOccurs="0"/>
-         <element name="trID" type="epp:trIDType"/>
-       </sequence>
-     </complexType>
+<!--
+Response types.
+-->
+  <complexType name="responseType">
+    <sequence>
+      <element name="result" type="epp:resultType"
+       maxOccurs="unbounded"/>
+      <element name="msgQ" type="epp:msgQType"
+       minOccurs="0"/>
+      <element name="resData" type="epp:extAnyType"
+       minOccurs="0"/>
+      <element name="extension" type="epp:extAnyType"
+       minOccurs="0"/>
+      <element name="trID" type="epp:trIDType"/>
+    </sequence>
+  </complexType>
 
-     <complexType name="resultType">
-       <sequence>
-         <element name="msg" type="epp:msgType"/>
-         <choice minOccurs="0" maxOccurs="unbounded">
-           <element name="value" type="epp:errValueType"/>
-           <element name="extValue" type="epp:extErrValueType"/>
-         </choice>
-       </sequence>
-       <attribute name="code" type="epp:resultCodeType"
-        use="required"/>
-     </complexType>
+  <complexType name="resultType">
+    <sequence>
+      <element name="msg" type="epp:msgType"/>
+      <choice minOccurs="0" maxOccurs="unbounded">
+        <element name="value" type="epp:errValueType"/>
+        <element name="extValue" type="epp:extErrValueType"/>
+      </choice>
+    </sequence>
+    <attribute name="code" type="epp:resultCodeType"
+     use="required"/>
+  </complexType>
 
-     <complexType name="errValueType" mixed="true">
-       <sequence>
-         <any namespace="##any" processContents="skip"/>
-       </sequence>
-       <anyAttribute namespace="##any" processContents="skip"/>
-     </complexType>
-     <complexType name="extErrValueType">
-       <sequence>
-         <element name="value" type="epp:errValueType"/>
-         <element name="reason" type="epp:msgType"/>
-       </sequence>
-     </complexType>
+  <complexType name="errValueType" mixed="true">
+    <sequence>
+      <any namespace="##any" processContents="skip"/>
+    </sequence>
+    <anyAttribute namespace="##any" processContents="skip"/>
+  </complexType>
 
-     <complexType name="msgQType">
-       <sequence>
-         <element name="qDate" type="dateTime"
-          minOccurs="0"/>
-         <element name="msg" type="epp:mixedMsgType"
-          minOccurs="0"/>
-       </sequence>
-       <attribute name="count" type="unsignedLong"
-        use="required"/>
-       <attribute name="id" type="eppcom:minTokenType"
-        use="required"/>
-     </complexType>
+  <complexType name="extErrValueType">
+    <sequence>
+      <element name="value" type="epp:errValueType"/>
+      <element name="reason" type="epp:msgType"/>
+    </sequence>
+  </complexType>
 
-     <complexType name="mixedMsgType" mixed="true">
-       <sequence>
-         <any processContents="skip"
-          minOccurs="0" maxOccurs="unbounded"/>
-       </sequence>
-       <attribute name="lang" type="language"
-        default="en"/>
-     </complexType>
+  <complexType name="msgQType">
+    <sequence>
+      <element name="qDate" type="dateTime"
+       minOccurs="0"/>
+      <element name="msg" type="epp:mixedMsgType"
+       minOccurs="0"/>
+    </sequence>
+    <attribute name="count" type="unsignedLong"
+     use="required"/>
+    <attribute name="id" type="eppcom:minTokenType"
+     use="required"/>
+  </complexType>
 
-   <!--
-   Human-readable text may be expressed in languages other than English.
-   -->
-     <complexType name="msgType">
-       <simpleContent>
-         <extension base="normalizedString">
-           <attribute name="lang" type="language"
-            default="en"/>
-         </extension>
-       </simpleContent>
-     </complexType>
+  <complexType name="mixedMsgType" mixed="true">
+    <sequence>
+      <any processContents="skip"
+       minOccurs="0" maxOccurs="unbounded"/>
+    </sequence>
+    <attribute name="lang" type="language"
+     default="en"/>
+  </complexType>
+
+<!--
+Human-readable text may be expressed in languages other than English.
+-->
+  <complexType name="msgType">
+    <simpleContent>
+      <extension base="normalizedString">
+        <attribute name="lang" type="language"
+         default="en"/>
+      </extension>
+    </simpleContent>
+  </complexType>
+
+<!--
+EPP result codes.
+-->
+  <simpleType name="resultCodeType">
+    <restriction base="unsignedShort">
+      <enumeration value="1000"/>
+      <enumeration value="1001"/>
+      <enumeration value="1300"/>
+      <enumeration value="1301"/>
+      <enumeration value="1500"/>
+      <enumeration value="2000"/>
+      <enumeration value="2001"/>
+      <enumeration value="2002"/>
+      <enumeration value="2003"/>
+      <enumeration value="2004"/>
+      <enumeration value="2005"/>
+      <enumeration value="2100"/>
+      <enumeration value="2101"/>
+      <enumeration value="2102"/>
+      <enumeration value="2103"/>
+      <enumeration value="2104"/>
+      <enumeration value="2105"/>
+      <enumeration value="2106"/>
+      <enumeration value="2200"/>
+      <enumeration value="2201"/>
+      <enumeration value="2202"/>
+      <enumeration value="2300"/>
+      <enumeration value="2301"/>
+      <enumeration value="2302"/>
+      <enumeration value="2303"/>
+      <enumeration value="2304"/>
+      <enumeration value="2305"/>
+      <enumeration value="2306"/>
+      <enumeration value="2307"/>
+      <enumeration value="2308"/>
+      <enumeration value="2400"/>
+      <enumeration value="2500"/>
+      <enumeration value="2501"/>
+      <enumeration value="2502"/>
+    </restriction>
+  </simpleType>
+
+<!--
+End of schema.
+-->
+</schema>
 
-   <!--
-   EPP result codes.
-   -->
-     <simpleType name="resultCodeType">
-       <restriction base="unsignedShort">
-         <enumeration value="1000"/>
-         <enumeration value="1001"/>
-         <enumeration value="1300"/>
-         <enumeration value="1301"/>
-         <enumeration value="1500"/>
-         <enumeration value="2000"/>
-         <enumeration value="2001"/>
-         <enumeration value="2002"/>
-         <enumeration value="2003"/>
-         <enumeration value="2004"/>
-         <enumeration value="2005"/>
-         <enumeration value="2100"/>
-         <enumeration value="2101"/>
-         <enumeration value="2102"/>
-         <enumeration value="2103"/>
-         <enumeration value="2104"/>
-         <enumeration value="2105"/>
-         <enumeration value="2106"/>
-         <enumeration value="2200"/>
-         <enumeration value="2201"/>
-         <enumeration value="2202"/>
-         <enumeration value="2300"/>
-         <enumeration value="2301"/>
-         <enumeration value="2302"/>
-         <enumeration value="2303"/>
-         <enumeration value="2304"/>
-         <enumeration value="2305"/>
-         <enumeration value="2306"/>
-         <enumeration value="2307"/>
-         <enumeration value="2308"/>
-         <enumeration value="2400"/>
-         <enumeration value="2500"/>
-         <enumeration value="2501"/>
-         <enumeration value="2502"/>
-       </restriction>
-     </simpleType>
 
-   <!--
-   End of schema.
-   -->
-   </schema>
diff --git a/lib/schemas/eppcom-1.0.xsd b/lib/schemas/eppcom-1.0.xsd
index 3d1c44e44..3b7d5d65c 100644
--- a/lib/schemas/eppcom-1.0.xsd
+++ b/lib/schemas/eppcom-1.0.xsd
@@ -53,6 +53,7 @@ Abstract client and object identifier type.
   <simpleType name="clIDType">
     <restriction base="token">
       <minLength value="3"/>
+<!--      <maxLength value="16"/> -->
     </restriction>
   </simpleType>
 
diff --git a/lib/schemas/host-1.0.xsd b/lib/schemas/host-1.0.xsd
index 47015ec83..d4bbc043e 100644
--- a/lib/schemas/host-1.0.xsd
+++ b/lib/schemas/host-1.0.xsd
@@ -1,244 +1,238 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <schema targetNamespace="urn:ietf:params:xml:ns:host-1.0"
-        xmlns:host="urn:ietf:params:xml:ns:host-1.0"
-        xmlns:epp="urn:ietf:params:xml:ns:epp-1.0"
-        xmlns:eppcom="urn:ietf:params:xml:ns:eppcom-1.0"
-        xmlns="http://www.w3.org/2001/XMLSchema"
-        elementFormDefault="qualified">
-
+       xmlns:host="urn:ietf:params:xml:ns:host-1.0"
+       xmlns:epp="urn:ietf:params:xml:ns:epp-1.0"
+       xmlns:eppcom="urn:ietf:params:xml:ns:eppcom-1.0"
+       xmlns="http://www.w3.org/2001/XMLSchema"
+       elementFormDefault="qualified">
 <!--
 Import common element types.
 -->
-  <import namespace="urn:ietf:params:xml:ns:eppcom-1.0"
-          schemaLocation="eppcom-1.0.xsd"/>
-  <import namespace="urn:ietf:params:xml:ns:epp-1.0" 
-  			 schemaLocation="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>
-      Extensible Provisioning Protocol v1.0
-      host provisioning schema.
-    </documentation>
-  </annotation>
+ <annotation>
+   <documentation>
+     Extensible Provisioning Protocol v1.0
+     host provisioning schema.
+   </documentation>
+ </annotation>
 
 <!--
 Child elements found in EPP commands.
 -->
-  <element name="check" type="host:mNameType"/>
-  <element name="create" type="host:createType"/>
-  <element name="delete" type="host:sNameType"/>
-  <element name="info" type="host:sNameType"/>
-  <element name="update" type="host:updateType"/>
+ <element name="check" type="host:mNameType"/>
+ <element name="create" type="host:createType"/>
+ <element name="delete" type="host:sNameType"/>
+ <element name="info" type="host:sNameType"/>
+ <element name="update" type="host:updateType"/>
 
 <!--
 Child elements of the <create> command.
 -->
-  <complexType name="createType">
-    <sequence>
-      <element name="name" type="eppcom:labelType"/>
-      <element name="addr" type="host:addrType"
-       minOccurs="0" maxOccurs="unbounded"/>
-    </sequence>
-  </complexType>
+ <complexType name="createType">
+   <sequence>
+     <element name="name" type="eppcom:labelType"/>
+     <element name="addr" type="host:addrType"
+      minOccurs="0" maxOccurs="unbounded"/>
+   </sequence>
+ </complexType>
 
-  <complexType name="addrType">
-    <simpleContent>
-      <extension base="host:addrStringType">
-        <attribute name="ip" type="host:ipType"
-         default="v4"/>
-      </extension>
-    </simpleContent>
-  </complexType>
+ <complexType name="addrType">
+   <simpleContent>
+     <extension base="host:addrStringType">
+       <attribute name="ip" type="host:ipType"
+        default="v4"/>
+     </extension>
+   </simpleContent>
+ </complexType>
 
-  <simpleType name="addrStringType">
-    <restriction base="token">
-      <minLength value="3"/>
-      <maxLength value="45"/>
-    </restriction>
-  </simpleType>
-
-  <simpleType name="ipType">
-    <restriction base="token">
-      <enumeration value="v4"/>
-      <enumeration value="v6"/>
-    </restriction>
-  </simpleType>
+ <simpleType name="addrStringType">
+   <restriction base="token">
+     <minLength value="3"/>
+     <maxLength value="45"/>
+   </restriction>
+ </simpleType>
+ <simpleType name="ipType">
+   <restriction base="token">
+     <enumeration value="v4"/>
+     <enumeration value="v6"/>
+   </restriction>
+ </simpleType>
 
 <!--
 Child elements of the <delete> and <info> commands.
 -->
-  <complexType name="sNameType">
-    <sequence>
-      <element name="name" type="eppcom:labelType"/>
-    </sequence>
-  </complexType>
+ <complexType name="sNameType">
+   <sequence>
+     <element name="name" type="eppcom:labelType"/>
+   </sequence>
+ </complexType>
 
 <!--
 Child element of commands that accept multiple names.
 -->
-  <complexType name="mNameType">
-    <sequence>
-      <element name="name" type="eppcom:labelType"
-       maxOccurs="unbounded"/>
-    </sequence>
-  </complexType>
-
+ <complexType name="mNameType">
+   <sequence>
+     <element name="name" type="eppcom:labelType"
+      maxOccurs="unbounded"/>
+   </sequence>
+ </complexType>
 <!--
 Child elements of the <update> command.
 -->
-  <complexType name="updateType">
-    <sequence>
-      <element name="name" type="eppcom:labelType"/>
-      <element name="add" type="host:addRemType"
-       minOccurs="0"/>
-      <element name="rem" type="host:addRemType"
-       minOccurs="0"/>
-      <element name="chg" type="host:chgType"
-       minOccurs="0"/>
-    </sequence>
-  </complexType>
+ <complexType name="updateType">
+   <sequence>
+     <element name="name" type="eppcom:labelType"/>
+     <element name="add" type="host:addRemType"
+      minOccurs="0"/>
+     <element name="rem" type="host:addRemType"
+      minOccurs="0"/>
+     <element name="chg" type="host:chgType"
+      minOccurs="0"/>
+   </sequence>
+ </complexType>
 
 <!--
 Data elements that can be added or removed.
 -->
-  <complexType name="addRemType">
-    <sequence>
-      <element name="addr" type="host:addrType"
-       minOccurs="0" maxOccurs="unbounded"/>
-      <element name="status" type="host:statusType"
-       minOccurs="0" maxOccurs="7"/>
-    </sequence>
-  </complexType>
+ <complexType name="addRemType">
+   <sequence>
+     <element name="addr" type="host:addrType"
+      minOccurs="0" maxOccurs="unbounded"/>
+     <element name="status" type="host:statusType"
+      minOccurs="0" maxOccurs="7"/>
+   </sequence>
+ </complexType>
 
 <!--
 Data elements that can be changed.
 -->
-  <complexType name="chgType">
-    <sequence>
-      <element name="name" type="eppcom:labelType"/>
-    </sequence>
-  </complexType>
+ <complexType name="chgType">
+   <sequence>
+     <element name="name" type="eppcom:labelType"/>
+   </sequence>
+ </complexType>
 
 <!--
 Child response elements.
 -->
-  <element name="chkData" type="host:chkDataType"/>
-  <element name="creData" type="host:creDataType"/>
-  <element name="infData" type="host:infDataType"/>
-  <element name="panData" type="host:panDataType"/>
+ <element name="chkData" type="host:chkDataType"/>
+ <element name="creData" type="host:creDataType"/>
+ <element name="infData" type="host:infDataType"/>
+ <element name="panData" type="host:panDataType"/>
 
 <!--
 <check> response elements.
 -->
-  <complexType name="chkDataType">
-    <sequence>
-      <element name="cd" type="host:checkType"
-       maxOccurs="unbounded"/>
-    </sequence>
-  </complexType>
+ <complexType name="chkDataType">
+   <sequence>
+     <element name="cd" type="host:checkType"
+      maxOccurs="unbounded"/>
+   </sequence>
+ </complexType>
 
-  <complexType name="checkType">
-    <sequence>
-      <element name="name" type="host:checkNameType"/>
-      <element name="reason" type="eppcom:reasonType"
-       minOccurs="0"/>
-    </sequence>
-  </complexType>
+ <complexType name="checkType">
+   <sequence>
+     <element name="name" type="host:checkNameType"/>
+     <element name="reason" type="eppcom:reasonType"
+      minOccurs="0"/>
+   </sequence>
+ </complexType>
 
-  <complexType name="checkNameType">
-    <simpleContent>
-      <extension base="eppcom:labelType">
-        <attribute name="avail" type="boolean"
-         use="required"/>
-      </extension>
-    </simpleContent>
-  </complexType>
+ <complexType name="checkNameType">
+   <simpleContent>
+     <extension base="eppcom:labelType">
+       <attribute name="avail" type="boolean"
+        use="required"/>
+     </extension>
+   </simpleContent>
+ </complexType>
 
 <!--
 <create> response elements.
 -->
-  <complexType name="creDataType">
-    <sequence>
-      <element name="name" type="eppcom:labelType"/>
-      <element name="crDate" type="dateTime"/>
-    </sequence>
-  </complexType>
+ <complexType name="creDataType">
+   <sequence>
+     <element name="name" type="eppcom:labelType"/>
+     <element name="crDate" type="dateTime"/>
+   </sequence>
+ </complexType>
 
 <!--
 <info> response elements.
 -->
-  <complexType name="infDataType">
-    <sequence>
-      <element name="name" type="eppcom:labelType"/>
-      <element name="roid" type="eppcom:roidType"/>
-      <element name="status" type="host:statusType"
-       maxOccurs="7"/>
-      <element name="addr" type="host:addrType"
-       minOccurs="0" maxOccurs="unbounded"/>
-      <element name="clID" type="eppcom:clIDType"/>
-      <element name="crID" type="eppcom:clIDType"/>
-      <element name="crDate" type="dateTime"/>
-      <element name="upID" type="eppcom:clIDType"
-       minOccurs="0"/>
-      <element name="upDate" type="dateTime"
-       minOccurs="0"/>
-      <element name="trDate" type="dateTime"
-       minOccurs="0"/>
-    </sequence>
-  </complexType>
+ <complexType name="infDataType">
+   <sequence>
+     <element name="name" type="eppcom:labelType"/>
+     <element name="roid" type="eppcom:roidType"/>
+     <element name="status" type="host:statusType"
+      maxOccurs="7"/>
+     <element name="addr" type="host:addrType"
+      minOccurs="0" maxOccurs="unbounded"/>
+     <element name="clID" type="eppcom:clIDType"/>
+     <element name="crID" type="eppcom:clIDType"/>
+     <element name="crDate" type="dateTime"/>
+     <element name="upID" type="eppcom:clIDType"
+      minOccurs="0"/>
+     <element name="upDate" type="dateTime"
+      minOccurs="0"/>
+     <element name="trDate" type="dateTime"
+      minOccurs="0"/>
+   </sequence>
+ </complexType>
 
 <!--
 Status is a combination of attributes and an optional human-readable
 message that may be expressed in languages other than English.
 -->
-  <complexType name="statusType">
-    <simpleContent>
-      <extension base="normalizedString">
-        <attribute name="s" type="host:statusValueType"
-         use="required"/>
-        <attribute name="lang" type="language"
-         default="en"/>
-      </extension>
-    </simpleContent>
-  </complexType>
+ <complexType name="statusType">
+   <simpleContent>
+     <extension base="normalizedString">
+       <attribute name="s" type="host:statusValueType"
+        use="required"/>
+       <attribute name="lang" type="language"
+        default="en"/>
+     </extension>
+   </simpleContent>
+ </complexType>
 
-  <simpleType name="statusValueType">
-    <restriction base="token">
-      <enumeration value="clientDeleteProhibited"/>
-      <enumeration value="clientUpdateProhibited"/>
-      <enumeration value="linked"/>
-      <enumeration value="ok"/>
-      <enumeration value="pendingCreate"/>
-      <enumeration value="pendingDelete"/>
-      <enumeration value="pendingTransfer"/>
-      <enumeration value="pendingUpdate"/>
-      <enumeration value="serverDeleteProhibited"/>
-      <enumeration value="serverUpdateProhibited"/>
-    </restriction>
-  </simpleType>
+ <simpleType name="statusValueType">
+   <restriction base="token">
+     <enumeration value="clientDeleteProhibited"/>
+     <enumeration value="clientUpdateProhibited"/>
+     <enumeration value="linked"/>
+     <enumeration value="ok"/>
+     <enumeration value="pendingCreate"/>
+     <enumeration value="pendingDelete"/>
+     <enumeration value="pendingTransfer"/>
+     <enumeration value="pendingUpdate"/>
+     <enumeration value="serverDeleteProhibited"/>
+     <enumeration value="serverUpdateProhibited"/>
+   </restriction>
+ </simpleType>
 
 <!--
 Pending action notification response elements.
 -->
-  <complexType name="panDataType">
-    <sequence>
-      <element name="name" type="host:paNameType"/>
-      <element name="paTRID" type="epp:trIDType"/>
-      <element name="paDate" type="dateTime"/>
-    </sequence>
-  </complexType>
-
-  <complexType name="paNameType">
-    <simpleContent>
-      <extension base="eppcom:labelType">
-        <attribute name="paResult" type="boolean"
-         use="required"/>
-      </extension>
-    </simpleContent>
-  </complexType>
+ <complexType name="panDataType">
+   <sequence>
+     <element name="name" type="host:paNameType"/>
+     <element name="paTRID" type="epp:trIDType"/>
+     <element name="paDate" type="dateTime"/>
+   </sequence>
+ </complexType>
+ <complexType name="paNameType">
+   <simpleContent>
+     <extension base="eppcom:labelType">
+       <attribute name="paResult" type="boolean"
+        use="required"/>
+     </extension>
+   </simpleContent>
+ </complexType>
 
 <!--
 End of schema.
 -->
-</schema>
+</schema>
\ No newline at end of file
diff --git a/lib/schemas/keyrelay-1.0.xsd b/lib/schemas/keyrelay-1.0.xsd
new file mode 100644
index 000000000..2239754e7
--- /dev/null
+++ b/lib/schemas/keyrelay-1.0.xsd
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<schema targetNamespace="urn:ietf:params:xml:ns:keyrelay-1.0"
+  xmlns:keyrelay="urn:ietf:params:xml:ns:keyrelay-1.0"
+  xmlns:epp="urn:ietf:params:xml:ns:epp-1.0"
+  xmlns:eppcom="urn:ietf:params:xml:ns:eppcom-1.0"
+  xmlns:secDNS="urn:ietf:params:xml:ns:secDNS-1.1"
+  xmlns:domain="urn:ietf:params:xml:ns:domain-1.0"
+  xmlns="http://www.w3.org/2001/XMLSchema"
+  elementFormDefault="qualified">
+
+  <annotation>
+    <documentation>
+      Extensible Provisioning Protocol v1.0 protocol
+      extension schema for relaying DNSSEC key material.
+    </documentation>
+  </annotation>
+
+  <import namespace="urn:ietf:params:xml:ns:epp-1.0"/>
+  <import namespace="urn:ietf:params:xml:ns:eppcom-1.0"/>
+  <import namespace="urn:ietf:params:xml:ns:secDNS-1.1"/>
+  <import namespace="urn:ietf:params:xml:ns:domain-1.0"/>
+
+  <element name="keyRelayData" type="keyrelay:keyRelayDataType" />
+  <element name="infData" type="keyrelay:infDataType" />
+  <element name="create" type="keyrelay:createType" />
+
+  <complexType name="createType">
+    <sequence>
+      <element name="name" type="eppcom:labelType"/>
+      <!-- <element name="authInfo" type="domain:authInfoType"/> -->
+      <element name="keyRelayData" type="keyrelay:keyRelayDataType"
+          maxOccurs="unbounded"/>
+    </sequence>
+  </complexType>
+
+  <complexType name="infDataType">
+    <sequence>
+      <element name="name" type="eppcom:labelType"/>
+      <!-- <element name="authInfo" type="domain:authInfoType"/> -->
+      <element name="keyRelayData" type="keyrelay:keyRelayDataType"
+          maxOccurs="unbounded"/>
+      <element name="crDate" type="dateTime"/>
+      <element name="reID" type="eppcom:clIDType" />
+      <element name="acID" type="eppcom:clIDType" />
+    </sequence>
+  </complexType>
+
+  <complexType name="keyRelayDataType">
+    <sequence>
+      <element name="keyData" type="secDNS:keyDataType" />
+      <element name="expiry" type="keyrelay:keyRelayExpiryType"
+          minOccurs="0" />
+    </sequence>
+  </complexType>
+
+  <complexType name="keyRelayExpiryType">
+    <choice>
+      <element name="absolute" type="dateTime" />
+      <element name="relative" type="duration" />
+    </choice>
+  </complexType>
+</schema>
diff --git a/lib/schemas/secDNS-1.1.xsd b/lib/schemas/secDNS-1.1.xsd
index e9fe3f65a..a47c07a23 100644
--- a/lib/schemas/secDNS-1.1.xsd
+++ b/lib/schemas/secDNS-1.1.xsd
@@ -1,130 +1,134 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <schema
- targetNamespace="urn:ietf:params:xml:ns:secDNS-1.1"
- xmlns:secDNS="urn:ietf:params:xml:ns:secDNS-1.1"
- xmlns="http://www.w3.org/2001/XMLSchema"
- elementFormDefault="qualified">
+  targetNamespace="urn:ietf:params:xml:ns:secDNS-1.1"
+  xmlns:secDNS="urn:ietf:params:xml:ns:secDNS-1.1"
+  xmlns="http://www.w3.org/2001/XMLSchema"
+  elementFormDefault="qualified">
 
   <annotation>
     <documentation>
-     Extensible Provisioning Protocol v1.0
-     domain name extension schema
-     for provisioning DNS security (DNSSEC) extensions.
+      Extensible Provisioning Protocol v1.0
+      domain name extension schema
+      for provisioning DNS security (DNSSEC) extensions.
     </documentation>
   </annotation>
 
- <!--
- Child elements found in EPP commands.
- -->
-
+  <!--
+  Child elements found in EPP commands.
+  -->
   <element name="create" type="secDNS:dsOrKeyType"/>
   <element name="update" type="secDNS:updateType"/>
 
- <!--
- Child elements supporting either the
- dsData or the keyData interface.
- -->
- <complexType name="dsOrKeyType">
-   <sequence>
-     <element name="maxSigLife" type="secDNS:maxSigLifeType"
-     minOccurs="0"/>
-     <choice>
-       <element name="dsData" type="secDNS:dsDataType"
-       maxOccurs="unbounded"/>
-       <element name="keyData" type="secDNS:keyDataType"
-       maxOccurs="unbounded"/>
-     </choice>
-  </sequence>
- </complexType>
 
- <!--
- Definition for the maximum signature lifetime (maxSigLife)
- -->
- <simpleType name="maxSigLifeType">
-   <restriction base="int">
-     <minInclusive value="1"/>
-   </restriction>
- </simpleType>
+  <!--
+  Child elements supporting either the
+  dsData or the keyData interface.
+  -->
+  <complexType name="dsOrKeyType">
+    <sequence>
+      <element name="maxSigLife" type="secDNS:maxSigLifeType"
+      minOccurs="0"/>
+      <choice>
+        <element name="dsData" type="secDNS:dsDataType"
+        maxOccurs="unbounded"/>
+        <element name="keyData" type="secDNS:keyDataType"
+        maxOccurs="unbounded"/>
+      </choice>
+        </sequence>
+  </complexType>
 
- <!--
- Child elements of dsData used for dsData interface
- -->
- <complexType name="dsDataType">
-   <sequence>
-     <element name="keyTag" type="unsignedShort"/>
-     <element name="alg" type="unsignedByte"/>
-     <element name="digestType" type="unsignedByte"/>
-     <element name="digest" type="hexBinary"/>
-     <element name="keyData" type="secDNS:keyDataType"
-     minOccurs="0"/>
-   </sequence>
- </complexType>
 
- <!--
- Child elements of keyData used for keyData interface
- and optionally with dsData interface
- -->
- <complexType name="keyDataType">
 
-   <sequence>
-     <element name="flags" type="unsignedShort"/>
-     <element name="protocol" type="unsignedByte"/>
-     <element name="alg" type="unsignedByte"/>
-     <element name="pubKey" type="secDNS:keyType"/>
-   </sequence>
- </complexType>
+  <!--
+  Definition for the maximum signature life (maxSigLife)
+  -->
+  <simpleType name="maxSigLifeType">
+    <restriction base="int">
+      <minInclusive value="1"/>
+    </restriction>
+  </simpleType>
 
- <!--
- Definition for the public key
- -->
- <simpleType name="keyType">
-   <restriction base="base64Binary">
-     <minLength value="1"/>
-   </restriction>
- </simpleType>
 
- <!--
- Child elements of the <update> element.
- -->
- <complexType name="updateType">
-   <sequence>
-         <element name="rem" type="secDNS:remType"
-         minOccurs="0"/>
-         <element name="add" type="secDNS:dsOrKeyType"
-         minOccurs="0"/>
-         <element name="chg" type="secDNS:chgType"
-         minOccurs="0"/>
-       </sequence>
-   <attribute name="urgent" type="boolean" default="false"/>
- </complexType>
+  <!--
+  Child elements of dsData used for dsData interface
+  -->
+  <complexType name="dsDataType">
+    <sequence>
+      <element name="keyTag" type="unsignedShort"/>
+      <element name="alg" type="unsignedByte"/>
+      <element name="digestType" type="unsignedByte"/>
+      <element name="digest" type="hexBinary"/>
+      <element name="keyData" type="secDNS:keyDataType"
+      minOccurs="0"/>
+    </sequence>
+  </complexType>
 
- <!--
- Child elements of the <rem> command.
- -->
- <complexType name="remType">
-       <choice>
-         <element name="all" type="boolean"/>
-         <element name="dsData" type="secDNS:dsDataType"
-         maxOccurs="unbounded"/>
-         <element name="keyData" type="secDNS:keyDataType"
-         maxOccurs="unbounded"/>
-       </choice>
- </complexType>
 
- <!--
- Child elements supporting the <chg> element.
- -->
+  <!--
+  Child elements of keyData used for keyData interface
+  and optionally with dsData interface
+  -->
+  <complexType name="keyDataType">
+    <sequence>
+      <element name="flags" type="unsignedShort"/>
+      <element name="protocol" type="unsignedByte"/>
+      <element name="alg" type="unsignedByte"/>
+      <element name="pubKey" type="secDNS:keyType"/>
+    </sequence>
+  </complexType>
 
- <complexType name="chgType">
-   <sequence>
-     <element name="maxSigLife" type="secDNS:maxSigLifeType"
-     minOccurs="0"/>
-   </sequence>
- </complexType>
+  <!--
+  Definition for the public key
+  -->
+  <simpleType name="keyType">
+    <restriction base="base64Binary">
+      <minLength value="1"/>
+    </restriction>
+  </simpleType>
 
- <!--
- Child response elements.
- -->
- <element name="infData" type="secDNS:dsOrKeyType"/>
+  <!--
+  Child elements of the <update> element.
+  -->
+  <complexType name="updateType">
+    <sequence>
+          <element name="rem" type="secDNS:remType"
+          minOccurs="0"/>
+          <element name="add" type="secDNS:dsOrKeyType"
+          minOccurs="0"/>
+          <element name="chg" type="secDNS:chgType"
+          minOccurs="0"/>
+        </sequence>
+    <attribute name="urgent" type="boolean" default="false"/>
+  </complexType>
+
+
+  <!--
+  Child elements of the <rem> command.
+  -->
+  <complexType name="remType">
+        <choice>
+          <element name="all" type="boolean"/>
+          <element name="dsData" type="secDNS:dsDataType"
+          maxOccurs="unbounded"/>
+          <element name="keyData" type="secDNS:keyDataType"
+          maxOccurs="unbounded"/>
+        </choice>
+  </complexType>
+
+  <!--
+  Child elements supporting the <chg> element.
+  -->
+  <complexType name="chgType">
+    <sequence>
+      <element name="maxSigLife" type="secDNS:maxSigLifeType"
+      minOccurs="0"/>
+    </sequence>
+  </complexType>
+
+
+  <!--
+  Child response elements.
+  -->
+  <element name="infData" type="secDNS:dsOrKeyType"/>
 
 </schema>
diff --git a/lib/tasks/import.rake b/lib/tasks/import.rake
index de9c17a44..64aa9688c 100644
--- a/lib/tasks/import.rake
+++ b/lib/tasks/import.rake
@@ -57,6 +57,7 @@ namespace :import do
     Rake::Task['import:reserved'].invoke
     Rake::Task['import:domains'].invoke
     Rake::Task['import:zones'].invoke
+    Rake::Task['zonefile:replace_procedure'].invoke
   end
 
   desc 'Import registrars'
@@ -172,11 +173,15 @@ namespace :import do
       x.acl.all.each do |y|
         next if existing_ips.include?(y.ipaddr)
         if !y.ipaddr.nil? && y.ipaddr != ''
-          ips << WhiteIp.new({
-            registrar_id: Registrar.find_by(legacy_id: x.try(:id)).try(:id),
-            ipv4: y.ipaddr,
-            interfaces: ['api', 'registrar']
-            })
+
+          y.ipaddr.split(',').each do |ip|
+            ips << WhiteIp.new({
+              registrar_id: Registrar.find_by(legacy_id: x.try(:id)).try(:id),
+              ipv4: ip,
+              interfaces: ['api', 'registrar']
+              })
+
+          end
         end
       end
     end
diff --git a/lib/tasks/zonefile.rake b/lib/tasks/zonefile.rake
index 510bb60c1..5cec28cc3 100644
--- a/lib/tasks/zonefile.rake
+++ b/lib/tasks/zonefile.rake
@@ -103,8 +103,8 @@ namespace :zonefile do
         SELECT array_to_string(
           array(
             SELECT concat(
-              d.name_puny, '. IN DS ', dk.ds_key_tag, ' ',
-              dk.ds_alg, ' ', dk.ds_digest_type, ' ( ', dk.ds_digest, ' )'
+              d.name_puny, '. 3600 IN DS ', dk.ds_key_tag, ' ',
+              dk.ds_alg, ' ', dk.ds_digest_type, ' ', dk.ds_digest
             )
             FROM domains d
             JOIN dnskeys dk ON dk.domain_id = d.id