diff --git a/GitVersion.yml b/GitVersion.yml
index 656697c..483fb05 100644
--- a/GitVersion.yml
+++ b/GitVersion.yml
@@ -1,4 +1,4 @@
-next-version: 1.0.0
+next-version: 4.5.0
 tag-prefix: '[vV]'
 mode: ContinuousDeployment
 branches:
diff --git a/README.md b/README.md
index 56ad801..6acda6b 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@
 Install the latest version of `Secure.SAML` nuget package with command below. 
 
 ```
-NuGet\Install-Package Secure.SAML 
+ Install-Package Secure.SAML
 ```
 #### ii. Implementation: Using `Secure.SAML`
 
@@ -136,12 +136,6 @@ If you are having problems, please let me know by [raising a new issue](https://
 
 This project is licensed with the [MIT license](LICENSE).
 
-## Version History
-The main branch is now on .NET 9.0. 
-| Version  | Release Notes |
-| -------- | --------|
-| [`v1.0.0`](https://github.com/CodeShayk/Secure.SAML/tree/release/v1.0.0) |  [Notes](https://github.com/CodeShayk/Secure.SAML/releases/tag/v1.0.0) |
-
 ## Credits
 Thank you for reading. Please fork, explore, contribute and report. Happy Coding !! :)
 
diff --git a/src/Secure.SAML/Signing/ISamlSignerFactory.cs b/src/Secure.SAML/Signing/ISamlSignerFactory.cs
index 1ce1aca..6fbf5e8 100644
--- a/src/Secure.SAML/Signing/ISamlSignerFactory.cs
+++ b/src/Secure.SAML/Signing/ISamlSignerFactory.cs
@@ -1,5 +1,3 @@
-using Secure.SAML;
-
 namespace Secure.SAML.Signing
 {
     internal interface ISamlSignerFactory
diff --git a/src/Secure.SAML/Signing/SamlSignerFactory.cs b/src/Secure.SAML/Signing/SamlSignerFactory.cs
index 6bba8cb..44e1d77 100644
--- a/src/Secure.SAML/Signing/SamlSignerFactory.cs
+++ b/src/Secure.SAML/Signing/SamlSignerFactory.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Security.Cryptography.X509Certificates;
-using Secure.SAML.Signing;
-using Secure.SAML;
 
 namespace Secure.SAML.Signing
 {
diff --git a/src/Secure.SAML/v2/SAML.cs b/src/Secure.SAML/v2/SAML.cs
index ec9c918..8daa270 100644
--- a/src/Secure.SAML/v2/SAML.cs
+++ b/src/Secure.SAML/v2/SAML.cs
@@ -4,7 +4,6 @@
 using System.Security.Cryptography.X509Certificates;
 using System.Text;
 using System.Xml;
-using Secure.SAML.v2;
 using Secure.SAML.Signing;
 
 namespace Secure.SAML.v2
diff --git a/src/Secure.SAML/v2/SamlExtensions.cs b/src/Secure.SAML/v2/SamlExtensions.cs
index e677b43..a67da4f 100644
--- a/src/Secure.SAML/v2/SamlExtensions.cs
+++ b/src/Secure.SAML/v2/SamlExtensions.cs
@@ -3,7 +3,6 @@
 using System.Text;
 using System.Xml;
 using System.Xml.Serialization;
-using Secure.SAML.v2;
 
 namespace Secure.SAML.v2
 {
diff --git a/src/Secure.SAML/v2/Xsds/xenc-core-schema.xsd b/src/Secure.SAML/v2/Xsds/xenc-core-schema.xsd
index 55030ac..e5dae89 100644
--- a/src/Secure.SAML/v2/Xsds/xenc-core-schema.xsd
+++ b/src/Secure.SAML/v2/Xsds/xenc-core-schema.xsd
@@ -17,58 +17,58 @@
         elementFormDefault='qualified'>
 
     <import namespace='http://www.w3.org/2000/09/xmldsig#'
-            schemaLocation='http://www.w3.org/TR/2002/REC-xmldsig-core-20020212/xmldsig-core-schema.xsd'/>
+            schemaLocation='http://www.w3.org/TR/2002/REC-xmldsig-core-20020212/xmldsig-core-schema.xsd' />
 
     <complexType name='EncryptedType' abstract='true'>
         <sequence>
             <element name='EncryptionMethod' type='xenc:EncryptionMethodType'
-                     minOccurs='0'/>
-            <element ref='ds:KeyInfo' minOccurs='0'/>
-            <element ref='xenc:CipherData'/>
-            <element ref='xenc:EncryptionProperties' minOccurs='0'/>
+                     minOccurs='0' />
+            <element ref='ds:KeyInfo' minOccurs='0' />
+            <element ref='xenc:CipherData' />
+            <element ref='xenc:EncryptionProperties' minOccurs='0' />
         </sequence>
-        <attribute name='Id' type='ID' use='optional'/>
-        <attribute name='Type' type='anyURI' use='optional'/>
-        <attribute name='MimeType' type='string' use='optional'/>
-        <attribute name='Encoding' type='anyURI' use='optional'/>
+        <attribute name='Id' type='ID' use='optional' />
+        <attribute name='Type' type='anyURI' use='optional' />
+        <attribute name='MimeType' type='string' use='optional' />
+        <attribute name='Encoding' type='anyURI' use='optional' />
     </complexType>
 
     <complexType name='EncryptionMethodType' mixed='true'>
         <sequence>
-            <element name='KeySize' minOccurs='0' type='xenc:KeySizeType'/>
-            <element name='OAEPparams' minOccurs='0' type='base64Binary'/>
-            <any namespace='##other' minOccurs='0' maxOccurs='unbounded'/>
+            <element name='KeySize' minOccurs='0' type='xenc:KeySizeType' />
+            <element name='OAEPparams' minOccurs='0' type='base64Binary' />
+            <any namespace='##other' minOccurs='0' maxOccurs='unbounded' />
         </sequence>
-        <attribute name='Algorithm' type='anyURI' use='required'/>
+        <attribute name='Algorithm' type='anyURI' use='required' />
     </complexType>
 
     <simpleType name='KeySizeType'>
-        <restriction base="integer"/>
+        <restriction base="integer" />
     </simpleType>
 
-    <element name='CipherData' type='xenc:CipherDataType'/>
+    <element name='CipherData' type='xenc:CipherDataType' />
     <complexType name='CipherDataType'>
         <choice>
-            <element name='CipherValue' type='base64Binary'/>
-            <element ref='xenc:CipherReference'/>
+            <element name='CipherValue' type='base64Binary' />
+            <element ref='xenc:CipherReference' />
         </choice>
     </complexType>
 
-    <element name='CipherReference' type='xenc:CipherReferenceType'/>
+    <element name='CipherReference' type='xenc:CipherReferenceType' />
     <complexType name='CipherReferenceType'>
         <choice>
-            <element name='Transforms' type='xenc:TransformsType' minOccurs='0'/>
+            <element name='Transforms' type='xenc:TransformsType' minOccurs='0' />
         </choice>
-        <attribute name='URI' type='anyURI' use='required'/>
+        <attribute name='URI' type='anyURI' use='required' />
     </complexType>
 
     <complexType name='TransformsType'>
         <sequence>
-            <element ref='ds:Transform' maxOccurs='unbounded'/>
+            <element ref='ds:Transform' maxOccurs='unbounded' />
         </sequence>
     </complexType>
 
-    <element name='EncryptedData' type='xenc:EncryptedDataType'/>
+    <element name='EncryptedData' type='xenc:EncryptedDataType' />
     <complexType name='EncryptedDataType'>
         <complexContent>
             <extension base='xenc:EncryptedType'>
@@ -78,30 +78,30 @@
 
     <!-- Children of ds:KeyInfo -->
 
-    <element name='EncryptedKey' type='xenc:EncryptedKeyType'/>
+    <element name='EncryptedKey' type='xenc:EncryptedKeyType' />
     <complexType name='EncryptedKeyType'>
         <complexContent>
             <extension base='xenc:EncryptedType'>
                 <sequence>
-                    <element ref='xenc:ReferenceList' minOccurs='0'/>
-                    <element name='CarriedKeyName' type='string' minOccurs='0'/>
+                    <element ref='xenc:ReferenceList' minOccurs='0' />
+                    <element name='CarriedKeyName' type='string' minOccurs='0' />
                 </sequence>
                 <attribute name='Recipient' type='string'
-                           use='optional'/>
+                           use='optional' />
             </extension>
         </complexContent>
     </complexType>
 
-    <element name="AgreementMethod" type="xenc:AgreementMethodType"/>
+    <element name="AgreementMethod" type="xenc:AgreementMethodType" />
     <complexType name="AgreementMethodType" mixed="true">
         <sequence>
-            <element name="KA-Nonce" minOccurs="0" type="base64Binary"/>
+            <element name="KA-Nonce" minOccurs="0" type="base64Binary" />
             <!-- <element ref="ds:DigestMethod" minOccurs="0" /> -->
-            <any namespace="##other" minOccurs="0" maxOccurs="unbounded"/>
-            <element name="OriginatorKeyInfo" minOccurs="0" type="ds:KeyInfoType"/>
-            <element name="RecipientKeyInfo" minOccurs="0" type="ds:KeyInfoType"/>
+            <any namespace="##other" minOccurs="0" maxOccurs="unbounded" />
+            <element name="OriginatorKeyInfo" minOccurs="0" type="ds:KeyInfoType" />
+            <element name="RecipientKeyInfo" minOccurs="0" type="ds:KeyInfoType" />
         </sequence>
-        <attribute name="Algorithm" type="anyURI" use="required"/>
+        <attribute name="Algorithm" type="anyURI" use="required" />
     </complexType>
 
     <!-- End Children of ds:KeyInfo -->
@@ -109,34 +109,34 @@
     <element name='ReferenceList'>
         <complexType>
             <choice minOccurs='1' maxOccurs='unbounded'>
-                <element name='DataReference' type='xenc:ReferenceType'/>
-                <element name='KeyReference' type='xenc:ReferenceType'/>
+                <element name='DataReference' type='xenc:ReferenceType' />
+                <element name='KeyReference' type='xenc:ReferenceType' />
             </choice>
         </complexType>
     </element>
 
     <complexType name='ReferenceType'>
         <sequence>
-            <any namespace='##other' minOccurs='0' maxOccurs='unbounded'/>
+            <any namespace='##other' minOccurs='0' maxOccurs='unbounded' />
         </sequence>
-        <attribute name='URI' type='anyURI' use='required'/>
+        <attribute name='URI' type='anyURI' use='required' />
     </complexType>
 
-    <element name='EncryptionProperties' type='xenc:EncryptionPropertiesType'/>
+    <element name='EncryptionProperties' type='xenc:EncryptionPropertiesType' />
     <complexType name='EncryptionPropertiesType'>
         <sequence>
-            <element ref='xenc:EncryptionProperty' maxOccurs='unbounded'/>
+            <element ref='xenc:EncryptionProperty' maxOccurs='unbounded' />
         </sequence>
-        <attribute name='Id' type='ID' use='optional'/>
+        <attribute name='Id' type='ID' use='optional' />
     </complexType>
 
-    <element name='EncryptionProperty' type='xenc:EncryptionPropertyType'/>
+    <element name='EncryptionProperty' type='xenc:EncryptionPropertyType' />
     <complexType name='EncryptionPropertyType' mixed='true'>
         <choice maxOccurs='unbounded'>
-            <any namespace='##other' processContents='lax'/>
+            <any namespace='##other' processContents='lax' />
         </choice>
-        <attribute name='Target' type='anyURI' use='optional'/>
-        <attribute name='Id' type='ID' use='optional'/>
-        <anyAttribute namespace="http://www.w3.org/XML/1998/namespace"/>
+        <attribute name='Target' type='anyURI' use='optional' />
+        <attribute name='Id' type='ID' use='optional' />
+        <anyAttribute namespace="http://www.w3.org/XML/1998/namespace" />
     </complexType>
 </schema>
\ No newline at end of file
diff --git a/src/Secure.SAML/v2/Xsds/xmldsig-core-schema.xsd b/src/Secure.SAML/v2/Xsds/xmldsig-core-schema.xsd
index 5b6f2de..14b58c7 100644
--- a/src/Secure.SAML/v2/Xsds/xmldsig-core-schema.xsd
+++ b/src/Secure.SAML/v2/Xsds/xmldsig-core-schema.xsd
@@ -39,164 +39,164 @@
 
     <!-- Start Signature -->
 
-    <element name="Signature" type="ds:SignatureType"/>
+    <element name="Signature" type="ds:SignatureType" />
     <complexType name="SignatureType">
         <sequence>
-            <element ref="ds:SignedInfo"/>
-            <element ref="ds:SignatureValue"/>
-            <element ref="ds:KeyInfo" minOccurs="0"/>
-            <element ref="ds:Object" minOccurs="0" maxOccurs="unbounded"/>
+            <element ref="ds:SignedInfo" />
+            <element ref="ds:SignatureValue" />
+            <element ref="ds:KeyInfo" minOccurs="0" />
+            <element ref="ds:Object" minOccurs="0" maxOccurs="unbounded" />
         </sequence>
-        <attribute name="Id" type="ID" use="optional"/>
+        <attribute name="Id" type="ID" use="optional" />
     </complexType>
 
-    <element name="SignatureValue" type="ds:SignatureValueType"/>
+    <element name="SignatureValue" type="ds:SignatureValueType" />
     <complexType name="SignatureValueType">
         <simpleContent>
             <extension base="base64Binary">
-                <attribute name="Id" type="ID" use="optional"/>
+                <attribute name="Id" type="ID" use="optional" />
             </extension>
         </simpleContent>
     </complexType>
 
     <!-- Start SignedInfo -->
 
-    <element name="SignedInfo" type="ds:SignedInfoType"/>
+    <element name="SignedInfo" type="ds:SignedInfoType" />
     <complexType name="SignedInfoType">
         <sequence>
-            <element ref="ds:CanonicalizationMethod"/>
-            <element ref="ds:SignatureMethod"/>
-            <element ref="ds:Reference" maxOccurs="unbounded"/>
+            <element ref="ds:CanonicalizationMethod" />
+            <element ref="ds:SignatureMethod" />
+            <element ref="ds:Reference" maxOccurs="unbounded" />
         </sequence>
-        <attribute name="Id" type="ID" use="optional"/>
+        <attribute name="Id" type="ID" use="optional" />
     </complexType>
 
-    <element name="CanonicalizationMethod" type="ds:CanonicalizationMethodType"/>
+    <element name="CanonicalizationMethod" type="ds:CanonicalizationMethodType" />
     <complexType name="CanonicalizationMethodType" mixed="true">
         <sequence>
-            <any namespace="##any" minOccurs="0" maxOccurs="unbounded"/>
+            <any namespace="##any" minOccurs="0" maxOccurs="unbounded" />
             <!-- (0,unbounded) elements from (1,1) namespace -->
         </sequence>
-        <attribute name="Algorithm" type="anyURI" use="required"/>
+        <attribute name="Algorithm" type="anyURI" use="required" />
     </complexType>
 
-    <element name="SignatureMethod" type="ds:SignatureMethodType"/>
+    <element name="SignatureMethod" type="ds:SignatureMethodType" />
     <complexType name="SignatureMethodType" mixed="true">
         <sequence>
-            <element name="HMACOutputLength" minOccurs="0" type="ds:HMACOutputLengthType"/>
-            <any namespace="##other" minOccurs="0" maxOccurs="unbounded"/>
+            <element name="HMACOutputLength" minOccurs="0" type="ds:HMACOutputLengthType" />
+            <any namespace="##other" minOccurs="0" maxOccurs="unbounded" />
             <!-- (0,unbounded) elements from (1,1) external namespace -->
         </sequence>
-        <attribute name="Algorithm" type="anyURI" use="required"/>
+        <attribute name="Algorithm" type="anyURI" use="required" />
     </complexType>
 
     <!-- Start Reference -->
 
-    <element name="Reference" type="ds:ReferenceType"/>
+    <element name="Reference" type="ds:ReferenceType" />
     <complexType name="ReferenceType">
         <sequence>
-            <element ref="ds:Transforms" minOccurs="0"/>
-            <element ref="ds:DigestMethod"/>
-            <element ref="ds:DigestValue"/>
+            <element ref="ds:Transforms" minOccurs="0" />
+            <element ref="ds:DigestMethod" />
+            <element ref="ds:DigestValue" />
         </sequence>
-        <attribute name="Id" type="ID" use="optional"/>
-        <attribute name="URI" type="anyURI" use="optional"/>
-        <attribute name="Type" type="anyURI" use="optional"/>
+        <attribute name="Id" type="ID" use="optional" />
+        <attribute name="URI" type="anyURI" use="optional" />
+        <attribute name="Type" type="anyURI" use="optional" />
     </complexType>
 
-    <element name="Transforms" type="ds:TransformsType"/>
+    <element name="Transforms" type="ds:TransformsType" />
     <complexType name="TransformsType">
         <sequence>
-            <element ref="ds:Transform" maxOccurs="unbounded"/>
+            <element ref="ds:Transform" maxOccurs="unbounded" />
         </sequence>
     </complexType>
 
-    <element name="Transform" type="ds:TransformType"/>
+    <element name="Transform" type="ds:TransformType" />
     <complexType name="TransformType" mixed="true">
         <choice minOccurs="0" maxOccurs="unbounded">
-            <any namespace="##other" processContents="lax"/>
+            <any namespace="##other" processContents="lax" />
             <!-- (1,1) elements from (0,unbounded) namespaces -->
-            <element name="XPath" type="string"/>
+            <element name="XPath" type="string" />
         </choice>
-        <attribute name="Algorithm" type="anyURI" use="required"/>
+        <attribute name="Algorithm" type="anyURI" use="required" />
     </complexType>
 
     <!-- End Reference -->
 
-    <element name="DigestMethod" type="ds:DigestMethodType"/>
+    <element name="DigestMethod" type="ds:DigestMethodType" />
     <complexType name="DigestMethodType" mixed="true">
         <sequence>
-            <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+            <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
         </sequence>
-        <attribute name="Algorithm" type="anyURI" use="required"/>
+        <attribute name="Algorithm" type="anyURI" use="required" />
     </complexType>
 
-    <element name="DigestValue" type="ds:DigestValueType"/>
+    <element name="DigestValue" type="ds:DigestValueType" />
     <simpleType name="DigestValueType">
-        <restriction base="base64Binary"/>
+        <restriction base="base64Binary" />
     </simpleType>
 
     <!-- End SignedInfo -->
 
     <!-- Start KeyInfo -->
 
-    <element name="KeyInfo" type="ds:KeyInfoType"/>
+    <element name="KeyInfo" type="ds:KeyInfoType" />
     <complexType name="KeyInfoType" mixed="true">
         <choice maxOccurs="unbounded">
-            <element ref="ds:KeyName"/>
-            <element ref="ds:KeyValue"/>
-            <element ref="ds:RetrievalMethod"/>
-            <element ref="ds:X509Data"/>
-            <element ref="ds:PGPData"/>
-            <element ref="ds:SPKIData"/>
-            <element ref="ds:MgmtData"/>
-            <any processContents="lax" namespace="##other"/>
+            <element ref="ds:KeyName" />
+            <element ref="ds:KeyValue" />
+            <element ref="ds:RetrievalMethod" />
+            <element ref="ds:X509Data" />
+            <element ref="ds:PGPData" />
+            <element ref="ds:SPKIData" />
+            <element ref="ds:MgmtData" />
+            <any processContents="lax" namespace="##other" />
             <!-- (1,1) elements from (0,unbounded) namespaces -->
         </choice>
-        <attribute name="Id" type="ID" use="optional"/>
+        <attribute name="Id" type="ID" use="optional" />
     </complexType>
 
-    <element name="KeyName" type="string"/>
-    <element name="MgmtData" type="string"/>
+    <element name="KeyName" type="string" />
+    <element name="MgmtData" type="string" />
 
-    <element name="KeyValue" type="ds:KeyValueType"/>
+    <element name="KeyValue" type="ds:KeyValueType" />
     <complexType name="KeyValueType" mixed="true">
         <choice>
-            <element ref="ds:DSAKeyValue"/>
-            <element ref="ds:RSAKeyValue"/>
-            <any namespace="##other" processContents="lax"/>
+            <element ref="ds:DSAKeyValue" />
+            <element ref="ds:RSAKeyValue" />
+            <any namespace="##other" processContents="lax" />
         </choice>
     </complexType>
 
-    <element name="RetrievalMethod" type="ds:RetrievalMethodType"/>
+    <element name="RetrievalMethod" type="ds:RetrievalMethodType" />
     <complexType name="RetrievalMethodType">
         <sequence>
-            <element ref="ds:Transforms" minOccurs="0"/>
+            <element ref="ds:Transforms" minOccurs="0" />
         </sequence>
-        <attribute name="URI" type="anyURI"/>
-        <attribute name="Type" type="anyURI" use="optional"/>
+        <attribute name="URI" type="anyURI" />
+        <attribute name="Type" type="anyURI" use="optional" />
     </complexType>
 
     <!-- Start X509Data -->
 
-    <element name="X509Data" type="ds:X509DataType"/>
+    <element name="X509Data" type="ds:X509DataType" />
     <complexType name="X509DataType">
         <sequence maxOccurs="unbounded">
             <choice>
-                <element name="X509IssuerSerial" type="ds:X509IssuerSerialType"/>
-                <element name="X509SKI" type="base64Binary"/>
-                <element name="X509SubjectName" type="string"/>
-                <element name="X509Certificate" type="base64Binary"/>
-                <element name="X509CRL" type="base64Binary"/>
-                <any namespace="##other" processContents="lax"/>
+                <element name="X509IssuerSerial" type="ds:X509IssuerSerialType" />
+                <element name="X509SKI" type="base64Binary" />
+                <element name="X509SubjectName" type="string" />
+                <element name="X509Certificate" type="base64Binary" />
+                <element name="X509CRL" type="base64Binary" />
+                <any namespace="##other" processContents="lax" />
             </choice>
         </sequence>
     </complexType>
 
     <complexType name="X509IssuerSerialType">
         <sequence>
-            <element name="X509IssuerName" type="string"/>
-            <element name="X509SerialNumber" type="integer"/>
+            <element name="X509IssuerName" type="string" />
+            <element name="X509SerialNumber" type="integer" />
         </sequence>
     </complexType>
 
@@ -204,19 +204,19 @@
 
     <!-- Begin PGPData -->
 
-    <element name="PGPData" type="ds:PGPDataType"/>
+    <element name="PGPData" type="ds:PGPDataType" />
     <complexType name="PGPDataType">
         <choice>
             <sequence>
-                <element name="PGPKeyID" type="base64Binary"/>
-                <element name="PGPKeyPacket" type="base64Binary" minOccurs="0"/>
+                <element name="PGPKeyID" type="base64Binary" />
+                <element name="PGPKeyPacket" type="base64Binary" minOccurs="0" />
                 <any namespace="##other" processContents="lax" minOccurs="0"
-                     maxOccurs="unbounded"/>
+                     maxOccurs="unbounded" />
             </sequence>
             <sequence>
-                <element name="PGPKeyPacket" type="base64Binary"/>
+                <element name="PGPKeyPacket" type="base64Binary" />
                 <any namespace="##other" processContents="lax" minOccurs="0"
-                     maxOccurs="unbounded"/>
+                     maxOccurs="unbounded" />
             </sequence>
         </choice>
     </complexType>
@@ -225,11 +225,11 @@
 
     <!-- Begin SPKIData -->
 
-    <element name="SPKIData" type="ds:SPKIDataType"/>
+    <element name="SPKIData" type="ds:SPKIDataType" />
     <complexType name="SPKIDataType">
         <sequence maxOccurs="unbounded">
-            <element name="SPKISexp" type="base64Binary"/>
-            <any namespace="##other" processContents="lax" minOccurs="0"/>
+            <element name="SPKISexp" type="base64Binary" />
+            <any namespace="##other" processContents="lax" minOccurs="0" />
         </sequence>
     </complexType>
 
@@ -239,40 +239,40 @@
 
     <!-- Start Object (Manifest, SignatureProperty) -->
 
-    <element name="Object" type="ds:ObjectType"/>
+    <element name="Object" type="ds:ObjectType" />
     <complexType name="ObjectType" mixed="true">
         <sequence minOccurs="0" maxOccurs="unbounded">
-            <any namespace="##any" processContents="lax"/>
+            <any namespace="##any" processContents="lax" />
         </sequence>
-        <attribute name="Id" type="ID" use="optional"/>
-        <attribute name="MimeType" type="string" use="optional"/> <!-- add a grep facet -->
-        <attribute name="Encoding" type="anyURI" use="optional"/>
+        <attribute name="Id" type="ID" use="optional" />
+        <attribute name="MimeType" type="string" use="optional" /> <!-- add a grep facet -->
+        <attribute name="Encoding" type="anyURI" use="optional" />
     </complexType>
 
-    <element name="Manifest" type="ds:ManifestType"/>
+    <element name="Manifest" type="ds:ManifestType" />
     <complexType name="ManifestType">
         <sequence>
-            <element ref="ds:Reference" maxOccurs="unbounded"/>
+            <element ref="ds:Reference" maxOccurs="unbounded" />
         </sequence>
-        <attribute name="Id" type="ID" use="optional"/>
+        <attribute name="Id" type="ID" use="optional" />
     </complexType>
 
-    <element name="SignatureProperties" type="ds:SignaturePropertiesType"/>
+    <element name="SignatureProperties" type="ds:SignaturePropertiesType" />
     <complexType name="SignaturePropertiesType">
         <sequence>
-            <element ref="ds:SignatureProperty" maxOccurs="unbounded"/>
+            <element ref="ds:SignatureProperty" maxOccurs="unbounded" />
         </sequence>
-        <attribute name="Id" type="ID" use="optional"/>
+        <attribute name="Id" type="ID" use="optional" />
     </complexType>
 
-    <element name="SignatureProperty" type="ds:SignaturePropertyType"/>
+    <element name="SignatureProperty" type="ds:SignaturePropertyType" />
     <complexType name="SignaturePropertyType" mixed="true">
         <choice maxOccurs="unbounded">
-            <any namespace="##other" processContents="lax"/>
+            <any namespace="##other" processContents="lax" />
             <!-- (1,1) elements from (1,unbounded) namespaces -->
         </choice>
-        <attribute name="Target" type="anyURI" use="required"/>
-        <attribute name="Id" type="ID" use="optional"/>
+        <attribute name="Target" type="anyURI" use="required" />
+        <attribute name="Id" type="ID" use="optional" />
     </complexType>
 
     <!-- End Object (Manifest, SignatureProperty) -->
@@ -280,33 +280,33 @@
     <!-- Start Algorithm Parameters -->
 
     <simpleType name="HMACOutputLengthType">
-        <restriction base="integer"/>
+        <restriction base="integer" />
     </simpleType>
 
     <!-- Start KeyValue Element-types -->
 
-    <element name="DSAKeyValue" type="ds:DSAKeyValueType"/>
+    <element name="DSAKeyValue" type="ds:DSAKeyValueType" />
     <complexType name="DSAKeyValueType">
         <sequence>
             <sequence minOccurs="0">
-                <element name="P" type="ds:CryptoBinary"/>
-                <element name="Q" type="ds:CryptoBinary"/>
+                <element name="P" type="ds:CryptoBinary" />
+                <element name="Q" type="ds:CryptoBinary" />
             </sequence>
-            <element name="G" type="ds:CryptoBinary" minOccurs="0"/>
-            <element name="Y" type="ds:CryptoBinary"/>
-            <element name="J" type="ds:CryptoBinary" minOccurs="0"/>
+            <element name="G" type="ds:CryptoBinary" minOccurs="0" />
+            <element name="Y" type="ds:CryptoBinary" />
+            <element name="J" type="ds:CryptoBinary" minOccurs="0" />
             <sequence minOccurs="0">
-                <element name="Seed" type="ds:CryptoBinary"/>
-                <element name="PgenCounter" type="ds:CryptoBinary"/>
+                <element name="Seed" type="ds:CryptoBinary" />
+                <element name="PgenCounter" type="ds:CryptoBinary" />
             </sequence>
         </sequence>
     </complexType>
 
-    <element name="RSAKeyValue" type="ds:RSAKeyValueType"/>
+    <element name="RSAKeyValue" type="ds:RSAKeyValueType" />
     <complexType name="RSAKeyValueType">
         <sequence>
-            <element name="Modulus" type="ds:CryptoBinary"/>
-            <element name="Exponent" type="ds:CryptoBinary"/>
+            <element name="Modulus" type="ds:CryptoBinary" />
+            <element name="Exponent" type="ds:CryptoBinary" />
         </sequence>
     </complexType>