@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" version="1.43; March 8, 2017">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" version="1.42; February 8, 2017">
   <xs:element name="ReleaseSet" type="ReleaseType"/>
   <xs:element name="ClinVarSet" type="PublicSetType">
     <xs:annotation>
@@ -24,172 +24,6 @@
       <xs:enumeration value="under review"/>
     </xs:restriction>
   </xs:simpleType>
-  <xs:complexType name="MeasureType">
-    <xs:sequence>
-      <xs:element maxOccurs="unbounded" minOccurs="0" name="Name" type="SetElementSetType"/>
-      <xs:element maxOccurs="unbounded" minOccurs="0" name="Symbol" type="SetElementSetType"/>
-      <xs:element maxOccurs="unbounded" minOccurs="0" name="AttributeSet">
-        <xs:complexType>
-          <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="1" name="Attribute">
-              <xs:complexType>
-                <xs:simpleContent>
-                  <xs:extension base="AttributeType">
-                    <xs:attribute name="Type" use="required">
-                      <xs:simpleType>
-                        <xs:restriction base="xs:string">
-                          <xs:enumeration value="HGVS, genomic, top level"/>
-                          <xs:enumeration value="HGVS, genomic, top level, previous"/>
-                          <xs:enumeration value="HGVS, genomic, top level, other"/>
-                          <xs:enumeration value="HGVS, genomic, RefSeqGene"/>
-                          <xs:enumeration value="HGVS, genomic, LRG"/>
-                          <xs:enumeration value="HGVS, genomic"/>
-                          <xs:enumeration value="HGVS, coding, RefSeq"/>
-                          <xs:enumeration value="HGVS, coding, LRG"/>
-                          <xs:enumeration value="HGVS, coding"/>
-                          <xs:enumeration value="HGVS, incomplete"/>
-                          <xs:enumeration value="HGVS, previous"/>
-                          <xs:enumeration value="HGVS, protein"/>
-                          <xs:enumeration value="HGVS, protein, RefSeq"/>
-                          <xs:enumeration value="HGVS, non-coding"/>
-                          <xs:enumeration value="HGVS, non-validated"/>
-                          <xs:enumeration value="HGVS, RNA"/>
-                          <xs:enumeration value="HGVS, legacy"/>
-                          <xs:enumeration value="HGVS, uncertain"/>
-                          <xs:enumeration value="HGVS"/>
-                          <xs:enumeration value="NonHGVS"/>
-                          <xs:enumeration value="Location"/>
-                          <xs:enumeration value="MiscellaneousDescription"/>
-                          <xs:enumeration value="Description"/>
-                          <xs:enumeration value="FunctionalConsequence"/>
-                          <xs:enumeration value="MolecularConsequence"/>
-                          <xs:enumeration value="ProteinChange1LetterCode"/>
-                          <xs:enumeration value="ProteinChange3LetterCode"/>
-                          <xs:enumeration value="ActivityLevel"/>
-                          <xs:enumeration value="GlobalMinorAlleleFrequency"/>
-                          <xs:enumeration value="AlleleFrequency"/>
-                          <xs:enumeration value="Suspect"/>
-                          <xs:enumeration value="Allelic Variant, previous"/>
-                          <xs:enumeration value="acceptor splice site"/>
-                          <xs:enumeration value="donor splice site"/>
-                          <xs:enumeration value="nucleotide change"/>
-                          <xs:enumeration value="protein change, historical"/>
-                          <xs:enumeration value="transcript variant"/>
-                          <xs:enumeration value="AbsoluteCopyNumber"/>
-                          <xs:enumeration value="ReferenceCopyNumber"/>
-                          <xs:enumeration value="CopyNumberTuple"/>
-                          <xs:enumeration value="COSMIC"/>
-                          <xs:enumeration value="SubmitterVariantId"/>
-                          <xs:enumeration value="ISCNCoordinates"/>
-                        </xs:restriction>
-                      </xs:simpleType>
-                    </xs:attribute>
-                    <xs:attribute name="Change" use="optional"/>
-                    <xs:attribute name="Accession" type="xs:string" use="optional"/>
-                    <xs:attribute name="Version" type="xs:positiveInteger" use="optional"/>
-                  </xs:extension>
-                </xs:simpleContent>
-              </xs:complexType>
-            </xs:element>
-            <xs:element maxOccurs="unbounded" minOccurs="0" name="Citation" type="CitationType"/>
-            <xs:element maxOccurs="unbounded" minOccurs="0" name="XRef" type="XrefType"/>
-            <xs:element maxOccurs="unbounded" minOccurs="0" name="Comment" type="CommentType"/>
-          </xs:sequence>
-        </xs:complexType>
-      </xs:element>
-      <xs:element maxOccurs="2" minOccurs="0" name="CytogeneticLocation" type="xs:string">
-        <xs:annotation>
-          <xs:documentation>Cytogenetic location is maintained independent of sequence location.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element maxOccurs="unbounded" minOccurs="0" name="SequenceLocation" type="SequenceLocationType"/>
-      <xs:element maxOccurs="unbounded" minOccurs="0" name="MeasureRelationship">
-        <xs:annotation>
-          <xs:documentation>MeasureRelationship is used to represent relationships between the type of measure being represented, and other object. This can be gene/variant, protein/gene, etc., as in when a variation is reported to be within a gene.</xs:documentation>
-        </xs:annotation>
-        <xs:complexType>
-          <xs:sequence>
-            <xs:element maxOccurs="unbounded" minOccurs="0" name="Name" type="SetElementSetType"/>
-            <xs:element maxOccurs="unbounded" minOccurs="0" name="Symbol" type="SetElementSetType"/>
-            <xs:element maxOccurs="unbounded" minOccurs="0" name="AttributeSet">
-              <xs:complexType>
-                <xs:sequence>
-                  <xs:element maxOccurs="1" minOccurs="1" name="Attribute">
-                    <xs:complexType>
-                      <xs:simpleContent>
-                        <xs:extension base="AttributeType">
-                          <xs:attribute name="Type" use="required">
-                            <xs:simpleType>
-                              <xs:restriction base="xs:string">
-                                <xs:enumeration value="HGVS"/>
-                                <xs:enumeration value="genotype"/>
-                                <xs:enumeration value="Haploinsufficiency"/>
-                                <xs:enumeration value="Triplosensitivity"/>
-                                <xs:enumeration value="gene relationships"/>
-                              </xs:restriction>
-                            </xs:simpleType>
-                          </xs:attribute>
-                        </xs:extension>
-                      </xs:simpleContent>
-                    </xs:complexType>
-                  </xs:element>
-                  <xs:element maxOccurs="unbounded" minOccurs="0" name="Citation" type="CitationType"/>
-                </xs:sequence>
-              </xs:complexType>
-            </xs:element>
-            <xs:element maxOccurs="unbounded" minOccurs="0" name="SequenceLocation" type="SequenceLocationType"/>
-            <xs:element maxOccurs="unbounded" minOccurs="0" name="Citation" type="CitationType"/>
-            <xs:element maxOccurs="unbounded" minOccurs="0" name="XRef" type="XrefType"/>
-            <xs:element maxOccurs="unbounded" minOccurs="0" name="Comment" type="CommentType"/>
-          </xs:sequence>
-          <xs:attribute name="Type" use="required">
-            <xs:simpleType>
-              <xs:restriction base="xs:string">
-                <xs:enumeration value="variant in gene"/>
-                <xs:enumeration value="co-occurring variant"/>
-                <xs:enumeration value="within single gene"/>
-                <xs:enumeration value="within multiple genes by overlap"/>
-                <xs:enumeration value="genes overlapped by variant"/>
-                <xs:enumeration value="near gene, upstream"/>
-                <xs:enumeration value="near gene, downstream"/>
-                <xs:enumeration value="asserted, but not computed"/>
-              </xs:restriction>
-            </xs:simpleType>
-          </xs:attribute>
-          <xs:attributeGroup ref="CVIdentifiers"/>
-        </xs:complexType>
-      </xs:element>
-      <xs:element maxOccurs="unbounded" minOccurs="0" name="Citation" type="CitationType"/>
-      <xs:element maxOccurs="unbounded" minOccurs="0" name="XRef" type="XrefType"/>
-      <xs:element maxOccurs="unbounded" minOccurs="0" name="Comment" type="CommentType"/>
-      <xs:element maxOccurs="unbounded" minOccurs="0" name="Source" type="DataSourceType"/>
-    </xs:sequence>
-    <xs:attribute name="Type" use="required">
-      <xs:simpleType>
-        <xs:restriction base="xs:string">
-          <xs:enumeration value="Gene"/>
-          <xs:enumeration value="Variation"/>
-          <xs:enumeration value="Insertion"/>
-          <xs:enumeration value="Deletion"/>
-          <xs:enumeration value="single nucleotide variant"/>
-          <xs:enumeration value="Indel"/>
-          <xs:enumeration value="Duplication"/>
-          <xs:enumeration value="Tandem duplication"/>
-          <xs:enumeration value="Structural variant"/>
-          <xs:enumeration value="copy number gain"/>
-          <xs:enumeration value="copy number loss"/>
-          <xs:enumeration value="protein only"/>
-          <xs:enumeration value="Microsatellite"/>
-          <xs:enumeration value="fusion"/>
-          <xs:enumeration value="Inversion"/>
-          <xs:enumeration value="Translocation"/>
-          <xs:enumeration value="QTL"/>
-          <xs:enumeration value="Complex"/>
-        </xs:restriction>
-      </xs:simpleType>
-    </xs:attribute>
-    <xs:attributeGroup ref="CVIdentifiers"/>
-  </xs:complexType>
   <xs:complexType name="XrefType">
     <xs:annotation>
       <xs:documentation>This structure is used to represent how an object described in the submission relates to objects in other databases.</xs:documentation>
@@ -428,10 +262,7 @@
         </xs:complexType>
       </xs:element>
       <xs:element maxOccurs="unbounded" name="ObservedIn" type="ObservationSet"/>
-      <xs:choice maxOccurs="1" minOccurs="1">
-        <xs:element maxOccurs="1" minOccurs="1" name="MeasureSet" type="MeasureSetType"/>
-        <xs:element maxOccurs="1" minOccurs="1" name="GenotypeSet" type="GenotypeSetType"/>
-      </xs:choice>
+      <xs:element maxOccurs="1" minOccurs="1" name="MeasureSet" type="MeasureSetType"/>
       <xs:element maxOccurs="1" minOccurs="1" name="TraitSet" type="ClinAsserTraitSetType"/>
       <xs:element maxOccurs="unbounded" minOccurs="0" name="Citation" type="CitationType"/>
       <xs:element maxOccurs="1" minOccurs="0" name="StudyName" type="xs:string"/>
@@ -522,10 +353,7 @@
         </xs:complexType>
       </xs:element>
       <xs:element maxOccurs="unbounded" minOccurs="0" name="ObservedIn" type="ObservationSet"/>
-      <xs:choice maxOccurs="1" minOccurs="1">
-        <xs:element maxOccurs="1" minOccurs="1" name="MeasureSet" type="MeasureSetType"/>
-        <xs:element maxOccurs="1" minOccurs="1" name="GenotypeSet" type="GenotypeSetType"/>
-      </xs:choice>
+      <xs:element maxOccurs="1" minOccurs="1" name="MeasureSet" type="MeasureSetType"/>
       <xs:element maxOccurs="1" minOccurs="1" name="TraitSet" type="TraitSetType"/>
       <xs:element maxOccurs="unbounded" minOccurs="0" name="Citation" type="CitationType"/>
       <xs:element maxOccurs="unbounded" minOccurs="0" name="Comment" type="CommentType"/>
@@ -535,56 +363,218 @@
     <xs:attribute name="SubmissionDate" type="xs:date"/>
     <xs:attributeGroup ref="CVIdentifiers"/>
   </xs:complexType>
-  <xs:complexType name="MeasureSetAttributeSet">
+  <xs:complexType name="MeasureSetType">
     <xs:sequence>
-      <xs:element maxOccurs="1" minOccurs="1" name="Attribute">
+      <xs:element maxOccurs="unbounded" minOccurs="1" name="Measure">
         <xs:complexType>
-          <xs:simpleContent>
-            <xs:extension base="AttributeType">
-              <xs:attribute name="Type" use="required">
-                <xs:annotation>
-                  <xs:documentation>MGG-2713 added HGVS, Description, and MolecularConsequence for AttributeType because they are in the submission xsd. Skipping Location, which is also in the submission xsd. In the current set of submissions, (March 2017) only HGVS is used. djh</xs:documentation>
-                </xs:annotation>
-                <xs:simpleType>
-                  <xs:restriction base="xs:string">
-                    <xs:enumeration value="Description"/>
-                    <xs:enumeration value="MolecularConsequence"/>
-                    <xs:enumeration value="HGVS"/>
-                    <xs:enumeration value="HGVS, genomic, top level"/>
-                    <xs:enumeration value="HGVS, genomic, top level, previous"/>
-                    <xs:enumeration value="HGVS, genomic, top level, other"/>
-                    <xs:enumeration value="HGVS, genomic, RefSeqGene"/>
-                    <xs:enumeration value="HGVS, genomic, LRG"/>
-                    <xs:enumeration value="HGVS, coding, RefSeq"/>
-                    <xs:enumeration value="HGVS, coding, LRG"/>
-                    <xs:enumeration value="HGVS, coding"/>
-                    <xs:enumeration value="HGVS, previous"/>
-                    <xs:enumeration value="HGVS, protein"/>
-                    <xs:enumeration value="HGVS, protein, RefSeq"/>
-                    <xs:enumeration value="HGVS, nucleotide"/>
-                    <xs:enumeration value="HGVS, non-validated"/>
-                    <xs:enumeration value="HGVS, uncertain"/>
-                    <xs:enumeration value="FunctionalConsequence"/>
-                    <xs:enumeration value="ISCNCoordinates"/>
-                  </xs:restriction>
-                </xs:simpleType>
-              </xs:attribute>
-              <xs:attribute name="Change" use="optional"/>
-            </xs:extension>
-          </xs:simpleContent>
+          <xs:sequence>
+            <xs:element maxOccurs="unbounded" minOccurs="0" name="Name" type="SetElementSetType"/>
+            <xs:element maxOccurs="unbounded" minOccurs="0" name="Symbol" type="SetElementSetType"/>
+            <xs:element maxOccurs="unbounded" minOccurs="0" name="AttributeSet">
+              <xs:complexType>
+                <xs:sequence>
+                  <xs:element maxOccurs="1" minOccurs="1" name="Attribute">
+                    <xs:complexType>
+                      <xs:simpleContent>
+                        <xs:extension base="AttributeType">
+                          <xs:attribute name="Type" use="required">
+                            <xs:simpleType>
+                              <xs:restriction base="xs:string">
+                                <xs:enumeration value="HGVS, genomic, top level"/>
+                                <xs:enumeration value="HGVS, genomic, top level, previous"/>
+                                <xs:enumeration value="HGVS, genomic, top level, other"/>
+                                <xs:enumeration value="HGVS, genomic, RefSeqGene"/>
+                                <xs:enumeration value="HGVS, genomic, LRG"/>
+                                <xs:enumeration value="HGVS, genomic"/>
+                                <xs:enumeration value="HGVS, coding, RefSeq"/>
+                                <xs:enumeration value="HGVS, coding, LRG"/>
+                                <xs:enumeration value="HGVS, coding"/>
+                                <xs:enumeration value="HGVS, incomplete"/>
+                                <xs:enumeration value="HGVS, previous"/>
+                                <xs:enumeration value="HGVS, protein"/>
+                                <xs:enumeration value="HGVS, protein, RefSeq"/>
+                                <xs:enumeration value="HGVS, non-coding"/>
+                                <xs:enumeration value="HGVS, non-validated"/>
+                                <xs:enumeration value="HGVS, RNA"/>
+                                <xs:enumeration value="HGVS, legacy"/>
+                                <xs:enumeration value="HGVS, uncertain"/>
+                                <xs:enumeration value="HGVS"/>
+                                <xs:enumeration value="NonHGVS"/>
+                                <xs:enumeration value="Location"/>
+                                <xs:enumeration value="MiscellaneousDescription"/>
+                                <xs:enumeration value="Description"/>
+                                <xs:enumeration value="FunctionalConsequence"/>
+                                <xs:enumeration value="MolecularConsequence"/>
+                                <xs:enumeration value="ProteinChange1LetterCode"/>
+                                <xs:enumeration value="ProteinChange3LetterCode"/>
+                                <xs:enumeration value="ActivityLevel"/>
+                                <xs:enumeration value="GlobalMinorAlleleFrequency"/>
+                                <xs:enumeration value="AlleleFrequency"/>
+                                <xs:enumeration value="Suspect"/>
+                                <xs:enumeration value="Allelic Variant, previous"/>
+                                <xs:enumeration value="acceptor splice site"/>
+                                <xs:enumeration value="donor splice site"/>
+                                <xs:enumeration value="nucleotide change"/>
+                                <xs:enumeration value="protein change, historical"/>
+                                <xs:enumeration value="transcript variant"/>
+                                <xs:enumeration value="AbsoluteCopyNumber"/>
+                                <xs:enumeration value="ReferenceCopyNumber"/>
+                                <xs:enumeration value="CopyNumberTuple"/>
+                                <xs:enumeration value="COSMIC"/>
+                                <xs:enumeration value="SubmitterVariantId"/>
+                                <xs:enumeration value="ISCNCoordinates"/>
+                              </xs:restriction>
+                            </xs:simpleType>
+                          </xs:attribute>
+                          <xs:attribute name="Change" use="optional"/>
+                          <xs:attribute name="Accession" type="xs:string" use="optional"/>
+                          <xs:attribute name="Version" type="xs:positiveInteger" use="optional"/>
+                        </xs:extension>
+                      </xs:simpleContent>
+                    </xs:complexType>
+                  </xs:element>
+                  <xs:element maxOccurs="unbounded" minOccurs="0" name="Citation" type="CitationType"/>
+                  <xs:element maxOccurs="unbounded" minOccurs="0" name="XRef" type="XrefType"/>
+                  <xs:element maxOccurs="unbounded" minOccurs="0" name="Comment" type="CommentType"/>
+                </xs:sequence>
+              </xs:complexType>
+            </xs:element>
+            <xs:element maxOccurs="2" minOccurs="0" name="CytogeneticLocation" type="xs:string">
+              <xs:annotation>
+                <xs:documentation>Cytogenetic location is maintained independent of sequence location.</xs:documentation>
+              </xs:annotation>
+            </xs:element>
+            <xs:element maxOccurs="unbounded" minOccurs="0" name="SequenceLocation" type="SequenceLocationType"/>
+            <xs:element maxOccurs="unbounded" minOccurs="0" name="MeasureRelationship">
+              <xs:annotation>
+                <xs:documentation>MeasureRelationship is used to represent relationships between the type of measure being represented, and other object. This can be gene/variant, protein/gene, etc., as in when a variation is reported to be within a gene.</xs:documentation>
+              </xs:annotation>
+              <xs:complexType>
+                <xs:sequence>
+                  <xs:element maxOccurs="unbounded" minOccurs="0" name="Name" type="SetElementSetType"/>
+                  <xs:element maxOccurs="unbounded" minOccurs="0" name="Symbol" type="SetElementSetType"/>
+                  <xs:element maxOccurs="unbounded" minOccurs="0" name="AttributeSet">
+                    <xs:complexType>
+                      <xs:sequence>
+                        <xs:element maxOccurs="1" minOccurs="1" name="Attribute">
+                          <xs:complexType>
+                            <xs:simpleContent>
+                              <xs:extension base="AttributeType">
+                                <xs:attribute name="Type" use="required">
+                                  <xs:simpleType>
+                                    <xs:restriction base="xs:string">
+                                      <xs:enumeration value="HGVS"/>
+                                      <xs:enumeration value="genotype"/>
+                                      <xs:enumeration value="Haploinsufficiency"/>
+                                      <xs:enumeration value="Triplosensitivity"/>
+                                      <xs:enumeration value="gene relationships"/>
+                                    </xs:restriction>
+                                  </xs:simpleType>
+                                </xs:attribute>
+                              </xs:extension>
+                            </xs:simpleContent>
+                          </xs:complexType>
+                        </xs:element>
+                        <xs:element maxOccurs="unbounded" minOccurs="0" name="Citation" type="CitationType"/>
+                      </xs:sequence>
+                    </xs:complexType>
+                  </xs:element>
+                  <xs:element maxOccurs="unbounded" minOccurs="0" name="SequenceLocation" type="SequenceLocationType"/>
+                  <xs:element maxOccurs="unbounded" minOccurs="0" name="Citation" type="CitationType"/>
+                  <xs:element maxOccurs="unbounded" minOccurs="0" name="XRef" type="XrefType"/>
+                  <xs:element maxOccurs="unbounded" minOccurs="0" name="Comment" type="CommentType"/>
+                </xs:sequence>
+                <xs:attribute name="Type" use="required">
+                  <xs:simpleType>
+                    <xs:restriction base="xs:string">
+                      <xs:enumeration value="variant in gene"/>
+                      <xs:enumeration value="co-occurring variant"/>
+                      <xs:enumeration value="within single gene"/>
+                      <xs:enumeration value="within multiple genes by overlap"/>
+                      <xs:enumeration value="genes overlapped by variant"/>
+                      <xs:enumeration value="near gene, upstream"/>
+                      <xs:enumeration value="near gene, downstream"/>
+                      <xs:enumeration value="asserted, but not computed"/>
+                    </xs:restriction>
+                  </xs:simpleType>
+                </xs:attribute>
+                <xs:attributeGroup ref="CVIdentifiers"/>
+              </xs:complexType>
+            </xs:element>
+            <xs:element maxOccurs="unbounded" minOccurs="0" name="Citation" type="CitationType"/>
+            <xs:element maxOccurs="unbounded" minOccurs="0" name="XRef" type="XrefType"/>
+            <xs:element maxOccurs="unbounded" minOccurs="0" name="Comment" type="CommentType"/>
+            <xs:element maxOccurs="unbounded" minOccurs="0" name="Source" type="DataSourceType"/>
+          </xs:sequence>
+          <xs:attribute name="Type" use="required">
+            <xs:simpleType>
+              <xs:restriction base="xs:string">
+                <xs:enumeration value="Gene"/>
+                <xs:enumeration value="Variation"/>
+                <xs:enumeration value="Insertion"/>
+                <xs:enumeration value="Deletion"/>
+                <xs:enumeration value="single nucleotide variant"/>
+                <xs:enumeration value="Indel"/>
+                <xs:enumeration value="Duplication"/>
+                <xs:enumeration value="Tandem duplication"/>
+                <xs:enumeration value="Structural variant"/>
+                <xs:enumeration value="copy number gain"/>
+                <xs:enumeration value="copy number loss"/>
+                <xs:enumeration value="protein only"/>
+                <xs:enumeration value="Microsatellite"/>
+                <xs:enumeration value="fusion"/>
+                <xs:enumeration value="Inversion"/>
+                <xs:enumeration value="Translocation"/>
+                <xs:enumeration value="QTL"/>
+                <xs:enumeration value="Complex"/>
+              </xs:restriction>
+            </xs:simpleType>
+          </xs:attribute>
+          <xs:attributeGroup ref="CVIdentifiers"/>
         </xs:complexType>
       </xs:element>
-      <xs:element maxOccurs="unbounded" minOccurs="0" name="Citation" type="CitationType"/>
-      <xs:element maxOccurs="unbounded" minOccurs="0" name="XRef" type="XrefType"/>
-      <xs:element maxOccurs="unbounded" minOccurs="0" name="Comment" type="CommentType"/>
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="MeasureSetType">
-    <xs:sequence>
-      <xs:element maxOccurs="unbounded" minOccurs="1" name="Measure" type="MeasureType"/>
       <xs:element maxOccurs="unbounded" minOccurs="0" name="Name" type="SetElementSetType"/>
       <xs:element maxOccurs="unbounded" minOccurs="0" name="Symbol" type="SetElementSetType"/>
-      <xs:element maxOccurs="unbounded" minOccurs="0" name="AttributeSet" type="MeasureSetAttributeSet"/>
+      <xs:element maxOccurs="unbounded" minOccurs="0" name="AttributeSet">
+        <xs:complexType>
+          <xs:sequence>
+            <xs:element maxOccurs="1" minOccurs="1" name="Attribute">
+              <xs:complexType>
+                <xs:simpleContent>
+                  <xs:extension base="AttributeType">
+                    <xs:attribute name="Type" use="required">
+                      <xs:simpleType>
+                        <xs:restriction base="xs:string">
+                          <xs:enumeration value="HGVS, genomic, top level"/>
+                          <xs:enumeration value="HGVS, genomic, top level, previous"/>
+                          <xs:enumeration value="HGVS, genomic, top level, other"/>
+                          <xs:enumeration value="HGVS, genomic, RefSeqGene"/>
+                          <xs:enumeration value="HGVS, genomic, LRG"/>
+                          <xs:enumeration value="HGVS, coding, RefSeq"/>
+                          <xs:enumeration value="HGVS, coding, LRG"/>
+                          <xs:enumeration value="HGVS, coding"/>
+                          <xs:enumeration value="HGVS, previous"/>
+                          <xs:enumeration value="HGVS, protein"/>
+                          <xs:enumeration value="HGVS, protein, RefSeq"/>
+                          <xs:enumeration value="HGVS, nucleotide"/>
+                          <xs:enumeration value="HGVS, non-validated"/>
+                          <xs:enumeration value="HGVS, uncertain"/>
+                          <xs:enumeration value="FunctionalConsequence"/>
+                          <xs:enumeration value="ISCNCoordinates"/>
+                        </xs:restriction>
+                      </xs:simpleType>
+                    </xs:attribute>
+                    <xs:attribute name="Change" use="optional"/>
+                  </xs:extension>
+                </xs:simpleContent>
+              </xs:complexType>
+            </xs:element>
+            <xs:element maxOccurs="unbounded" minOccurs="0" name="Citation" type="CitationType"/>
+            <xs:element maxOccurs="unbounded" minOccurs="0" name="XRef" type="XrefType"/>
+            <xs:element maxOccurs="unbounded" minOccurs="0" name="Comment" type="CommentType"/>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
       <xs:element maxOccurs="unbounded" minOccurs="0" name="Citation" type="CitationType"/>
       <xs:element maxOccurs="unbounded" minOccurs="0" name="XRef" type="XrefType"/>
       <xs:element maxOccurs="unbounded" minOccurs="0" name="Comment" type="CommentType"/>
@@ -606,26 +596,6 @@
     </xs:attribute>
     <xs:attributeGroup ref="CVIdentifiers"/>
   </xs:complexType>
-  <xs:complexType name="GenotypeSetType">
-    <xs:sequence>
-      <xs:element maxOccurs="unbounded" minOccurs="1" name="MeasureSet" type="MeasureSetType"/>
-      <xs:element maxOccurs="unbounded" minOccurs="0" name="Name" type="SetElementSetType"/>
-      <xs:element maxOccurs="unbounded" minOccurs="0" name="Symbol" type="SetElementSetType"/>
-      <xs:element maxOccurs="unbounded" minOccurs="0" name="AttributeSet" type="MeasureSetAttributeSet"/>
-      <xs:element maxOccurs="unbounded" minOccurs="0" name="Citation" type="CitationType"/>
-      <xs:element maxOccurs="unbounded" minOccurs="0" name="XRef" type="XrefType"/>
-      <xs:element maxOccurs="unbounded" minOccurs="0" name="Comment" type="CommentType"/>
-    </xs:sequence>
-    <xs:attribute name="Type" use="required">
-      <xs:simpleType>
-        <xs:restriction base="xs:string">
-          <xs:enumeration value="CompoundHeterozygote"/>
-          <xs:enumeration value="Diplotype"/>
-        </xs:restriction>
-      </xs:simpleType>
-    </xs:attribute>
-    <xs:attributeGroup ref="CVIdentifiers"/>
-  </xs:complexType>
   <xs:complexType name="TraitSetType">
     <xs:sequence>
       <xs:element maxOccurs="unbounded" minOccurs="1" name="Trait" type="TraitType"/>
@@ -794,7 +764,6 @@
         </xs:restriction>
       </xs:simpleType>
     </xs:attribute>
-    <xs:attribute name="DateLastEvaluated" type="xs:date"/>
     <xs:attributeGroup ref="CVIdentifiers"/>
   </xs:complexType>
   <xs:complexType name="ClinAsserTraitType">