diff --git a/README.md b/README.md
index 98cfa18..503342a 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ keywords:
 categories:
   - identity
   - security
-lastmod: 2023-03-30T22:40:05.226Z
+lastmod: 2023-06-10T04:11:49.055Z
 date: 2023-03-30T22:39:06.273Z
 type: readme
 license: MIT
@@ -18,6 +18,7 @@ project: Dgmjr.Identity
 ---
 
 # Identity
+
 Identity classes
 
 Classes for identity and security.  Once I get the Decomposer working, I'll be rewriing this to move away from the ASP.NET identity classes. They're too rigid and shoudlv'e been implemented as interfaces anyway.
diff --git a/src/Claims/ClaimTypes/ClaimType.cs b/src/Claims/ClaimTypes/ClaimType.cs
index 9961667..f5c3269 100644
--- a/src/Claims/ClaimTypes/ClaimType.cs
+++ b/src/Claims/ClaimTypes/ClaimType.cs
@@ -15,6 +15,8 @@ public virtual bool Equals(ClaimType? other)
 
     public override bool Equals(object? other) => Equas(other as ClaimType);
 
+    public override bool Equals(object? obj) => Equals(obj as ClaimType);
+
     public override int GetHashCode() => Uri.GetHashCode();
 
     public int CompareTo(ClaimValueType other)
diff --git a/src/Claims/ClaimValueTypes/ClaimValueTypes.Namespaces.cs b/src/Claims/ClaimValueTypes/ClaimValueTypes.Namespaces.cs
index 09d730e..35d977d 100644
--- a/src/Claims/ClaimValueTypes/ClaimValueTypes.Namespaces.cs
+++ b/src/Claims/ClaimValueTypes/ClaimValueTypes.Namespaces.cs
@@ -4,6 +4,7 @@ public static partial class ClaimValueTypeUris
 {
     public static class Namespaces
     {
+        public const string xs = "http://www.w3.org/2001/XMLSchema";
         /// <value><c>TR/</c></value>
         public const string TR = $"{nameof(TR)}/";
         /// <value><c>xmlschema11-2/</c></value>
diff --git a/src/Claims/ClaimValueTypes/ClaimValueTypes.cs b/src/Claims/ClaimValueTypes/ClaimValueTypes.cs
index 88a2aa1..2c484d2 100644
--- a/src/Claims/ClaimValueTypes/ClaimValueTypes.cs
+++ b/src/Claims/ClaimValueTypes/ClaimValueTypes.cs
@@ -38,87 +38,87 @@ public static partial class ClaimValueTypeUris
     /// <value><inheritdoc cref="BaseUri" path="/value" />:<inheritdoc cref="NS.PhoneNumber" path="/value" /></value>
     public const string PhoneNumber = $"{BaseUri}:{NS.PhoneNumber}";
 
+    public const string xs = nameof(xs);
+
     /// <summary>A URI that represents the base64Binary XML data type.</summary>
-    /// <value>http://www.w3.org/2001/XMLSchema#base64Binary</value>
+    /// <value>xs:base64Binary</value>
     public const string Base64Binary = SysSecCvt.Base64Binary;
     /// <summary>A URI that represents the base64Octet XML data type.</summary>
-    /// <value>http://www.w3.org/2001/XMLSchema#base64Octet</value>
-    public const string Base64Octet = SysSecCvt.Base64Octet;
+    /// <value>xs:base64Octet</value>
+    public const string Base64Octet = SysSecCvt.Base64octet;
     /// <summary>A URI that represents the boolean XML data type.</summary>
-    /// <value>http://www.w3.org/2001/XMLSchema#boolean</value>
+    /// <value>xs:boolean</value>
     public const string Boolean = SysSecCvt.Boolean;
     /// <summary>A URI that represents the date XML data type.</summary>
-    /// <value>http://www.w3.org/2001/XMLSchema#date</value>
+    /// <value>xs:date</value>
     public const string Date = SysSecCvt.Date;
     /// <summary>A URI that represents the dateTime XML data type.</summary>
-    /// <value>http://www.w3.org/2001/XMLSchema#dateTime</value>
-    public const string DateTime = SysSecCvt.DateTime;
+    /// <value>xs:dateTime</value>
+    public const string DateTime = SysSecCvt.Datetime;
     /// <summary>A URI that represents the daytimeDuration XQuery data type.</summary>
     /// <value>http://www.w3.org/TR/2002/WD-xquery-operators-20020816#dayTimeDuration</value>
-    public const string DaytimeDuration = SysSecCvt.DaytimeDuration;
+    public const string DaytimeDuration = SysSecCvt.Daytimeduration;
     /// <summary>A URI that represents the dns SOAP data type.</summary>
     /// <value>http://schemas.xmlsoap.org/claims/dns</value>
-    public const string DnsName = SysSecCvt.DnsName;
+    public const string DnsName = SysSecCvt.Dnsname;
     /// <summary>A URI that represents the double XML data type.</summary>
-    /// <value>http://www.w3.org/2001/XMLSchema#double</value>
+    /// <value>xs:double</value>
     public const string Double = SysSecCvt.Double;
     /// <summary>A URI that represents the DSAKeyValue XML Signature data type.</summary>
     /// <value>http://www.w3.org/2000/09/xmldsig#DSAKeyValue</value>
-    public const string DsaKeyValue = SysSecCvt.DsaKeyValue;
     /// <summary>A URI that represents the emailaddress SOAP data type.</summary>
     /// <value>http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress</value>
-    public const string Email = SysSecCvt.Email;
     /// <summary>A URI that represents the fqbn XML data type.</summary>
-    /// <value>http://www.w3.org/2001/XMLSchema#fqbn</value>
+    /// <value>xs:fqbn</value>
     public const string Fqbn = SysSecCvt.Fqbn;
     /// <summary>A URI that represents the hexBinary XML data type.</summary>
-    /// <value>http://www.w3.org/2001/XMLSchema#hexBinary</value>
-    public const string HexBinary = SysSecCvt.HexBinary;
+    /// <value>xs:hexBinary</value>
+    public const string HexBinary = SysSecCvt.Hexbinary;
     /// <summary>A URI that represents the integer XML data type.</summary>
-    /// <value>http://www.w3.org/2001/XMLSchema#integer</value>
+    /// <value>xs:integer</value>
     public const string Integer = SysSecCvt.Integer;
     /// <summary>A URI that represents the integer32 XML data type.</summary>
-    /// <value>http://www.w3.org/2001/XMLSchema#integer32</value>
+    /// <value>xs:integer32</value>
     public const string Integer32 = SysSecCvt.Integer32;
     /// <summary>A URI that represents the integer64 XML data type.</summary>
-    /// <value>http://www.w3.org/2001/XMLSchema#integer64</value>
+    /// <value>xs:integer64</value>
     public const string Integer64 = SysSecCvt.Integer64;
     /// <summary>A URI that represents the KeyInfo XML Signature data type.</summary>
     /// <value>http://www.w3.org/2000/09/xmldsig#KeyInfo</value>
-    public const string KeyInfo = SysSecCvt.KeyInfo;
+    public const string KeyInfo = SysSecCvt.KeyInfo;//"http://www.w3.org/2000/09/xmldsig#KeyInfo";
     /// <summary>A URI that represents the rfc822Name XACML 1.0 data type.</summary>
     /// <value>urn:oasis:names:tc:xacml:1.0:data-type:rfc822Name</value>
-    public const string Rfc822Name = SysSecCvt.Rfc822Name;
+    public const string Rfc822Name = SysSecCvt.Rfc822name;
     /// <summary>A URI that represents the rsa SOAP data type.</summary>
     /// <value><http://schemas.xmlsoap.org/ws/2005/05/identity/claims/rsa/value>
     public const string Rsa = SysSecCvt.Rsa;
     /// <summary>A URI that represents the RSAKeyValue XML Signature data type.</summary>
     /// <value>http://www.w3.org/2000/09/xmldsig#RSAKeyValue</value>
-    public const string RsaKeyValue = SysSecCvt.RsaKeyValue;
+    public const string RsaKeyValue = SysSecCvt.Rsakeyvalue;
     /// <summary>A URI that represents the sid XML data type.</summary>
-    /// <value>http://www.w3.org/2001/XMLSchema#sid</value>
+    /// <value>xs:sid</value>
     public const string Sid = SysSecCvt.Sid;
     /// <summary>A URI that represents the string XML data type.</summary>
-    /// <value>http://www.w3.org/2001/XMLSchema#string</value>
+    /// <value>xs:string</value>
     public const string String = SysSecCvt.String;
     /// <summary>A URI that represents the time XML data type.</summary>
-    /// <value>http://www.w3.org/2001/XMLSchema#time</value>
+    /// <value>xs:time</value>
     public const string Time = SysSecCvt.Time;
     /// <summary>A URI that represents the uinteger32 XML data type.</summary>
-    /// <value>http://www.w3.org/2001/XMLSchema#uinteger32</value>
-    public const string UInteger32 = SysSecCvt.UInteger32;
+    /// <value>xs:uinteger32</value>
+    public const string UInteger32 = SysSecCvt.Uinteger32;
     /// <summary>A URI that represents the uinteger64 XML data type.</summary>
-    /// <value>http://www.w3.org/2001/XMLSchema#uinteger64</value>
-    public const string UInteger64 = SysSecCvt.UInteger64;
+    /// <value>xs:uinteger64</value>
+    public const string UInteger64 = SysSecCvt.Uinteger64;
     /// <summary>A URI that represents the UPN SOAP data type.</summary>
     /// <value>http://schemas.xmlsoap.org/claims/UPN</value>
-    public const string UpnName = SysSecCvt.UpnName;
+    public const string UpnName = SysSecCvt.Upnname;
     /// <summary>A URI that represents the x500Name XACML 1.0 data type.</summary>
     /// <value>urn:oasis:names:tc:xacml:1.0:data-type:x500Name</value>
-    public const string X500Name = SysSecCvt.X500Name;
+    public const string X500Name = SysSecCvt.X500name;
     /// <summary>A URI that represents the yearMonthDuration XQuery data type.</summary>
     /// <value>http://www.w3.org/TR/2002/WD-xquery-operators-20020816#yearMonthDuration</value>
-    public const string YearMonthDuration = SysSecCvt.YearMonthDuration;
+    public const string YearMonthDuration = SysSecCvt.Yearmonthduration;
 
     /// <summary>A URI that represents an unknown claim value type</summary>
     /// <value><inheritdoc cref="BaseUri" path="/value" />:<inheritdoc cref="NS.Unknown" path="/value" /></value>
@@ -142,7 +142,7 @@ public static partial class ClaimValueTypeUris
 // /// <summary>
 // /// A URI that represents the boolean XML data type.
 // /// </summary>
-// /// <value>http://www.w3.org/2001/XMLSchema#boolean</value>
+// /// <value>xs:boolean</value>
 // public static readonly ClaimValueType BooleanClaimValueType = new(SysSecVt.Boolean, "A URI that represents the boolean XML data type.", v => v.RuleFor(c => c.Value).Must(v => bool.TryParse(v, out var result)));
 // /// <summary>
 // /// A URI that represents the emailaddress SOAP data type.
@@ -152,47 +152,47 @@ public static partial class ClaimValueTypeUris
 // /// <summary>
 // /// A URI that represents the string XML data type.
 // /// </summary>
-// /// <value>http://www.w3.org/2001/XMLSchema#string</value>
+// /// <value>xs:string</value>
 // public static readonly ClaimValueType StringClaimValueType = new(SysSecVt.String, "A URI that represents the string XML data type.", v => v.RuleFor(c => c.Value));
 // /// <summary>
-// /// A URI that represents the sid XML data type.  http://www.w3.org/2001/XMLSchema#sid
+// /// A URI that represents the sid XML data type.  xs:sid
 // /// </summary>
-// /// <value>http://www.w3.org/2001/XMLSchema#sid</value>
+// /// <value>xs:sid</value>
 // public static readonly ClaimValueType SidClaimValueType = new(SysSecVt.Sid, "A URI that represents the sid XML data type.", v => v.RuleFor(c => c.Value));
 // /// <summary>
-// /// A URI that represents the date XML data type.  http://www.w3.org/2001/XMLSchema#date
+// /// A URI that represents the date XML data type.  xs:date
 // /// </summary>
-// /// <value>http://www.w3.org/2001/XMLSchema#date</value>
+// /// <value>xs:date</value>
 // public static readonly ClaimValueType DateClaimValueType = new(SysSecVt.Date, "A URI that represents the date XML data type.", v => v.RuleFor(c => c.Value).Must(v => System.DateTime.TryParse(v, out var result)));
 // /// <summary>
-// /// A URI that represents the date XML data type.  http://www.w3.org/2001/XMLSchema#dateTime
+// /// A URI that represents the date XML data type.  xs:dateTime
 // /// </summary>
-// /// <value>http://www.w3.org/2001/XMLSchema#dateTime</value>
+// /// <value>xs:dateTime</value>
 // public static readonly ClaimValueType DateTimeClaimValueType = new(SysSecVt.DateTime, "A URI that represents the date XML data type.", v => v.RuleFor(c => c.Value).Must(v => System.DateTime.TryParse(v, out var result)));
 // /// <summary>
-// /// A URI that represents the integer32 XML data type.  http://www.w3.org/2001/XMLSchema#integer32
+// /// A URI that represents the integer32 XML data type.  xs:integer32
 // /// </summary>
-// /// <value>http://www.w3.org/2001/XMLSchema#integer32</value>
+// /// <value>xs:integer32</value>
 // public static readonly ClaimValueType Integer64ClaimValueType = new(SysSecVt.Integer64, "A URI that represents the integer64 XML data type.", v => v.RuleFor(c => c.Value).Must(v => long.TryParse(v, out var result)));
 // /// <summary>
-// /// A URI that represents the integer32 XML data type.  http://www.w3.org/2001/XMLSchema#integer32"
+// /// A URI that represents the integer32 XML data type.  xs:integer32"
 // /// </summary>
-// /// <value>http://www.w3.org/2001/XMLSchema#integer32</value>
+// /// <value>xs:integer32</value>
 // public static readonly ClaimValueType Integer32ClaimValueType = new(SysSecVt.Integer32, "A URI that represents the integer32 XML data type.", v => v.RuleFor(c => c.Value).Must(v => int.TryParse(v, out var result)));
 // /// <summary>
-// /// A URI that represents the unsigned integer64 XML data type.  http://www.w3.org/2001/XMLSchema#uinteger64
+// /// A URI that represents the unsigned integer64 XML data type.  xs:uinteger64
 // /// </summary>
-// // <value>http://www.w3.org/2001/XMLSchema#uinteger64</value>
+// // <value>xs:uinteger64</value>
 // public static readonly ClaimValueType UnsignedInteger64ClaimValueType = new(SysSecVt.UInteger64, "A URI that represents the integer64 XML data type.", v => v.RuleFor(c => c.Value).Must(v => long.TryParse(v, out var result)));
 // /// <summary>
-// /// A URI that represents the unsigned integer32 XML data type.  http://www.w3.org/2001/XMLSchema#uinteger32"
+// /// A URI that represents the unsigned integer32 XML data type.  xs:uinteger32"
 // /// </summary>
-// /// <value>http://www.w3.org/2001/XMLSchema#uinteger32</value>
+// /// <value>xs:uinteger32</value>
 // public static readonly ClaimValueType UnsignedInteger32ClaimValueType = new(SysSecVt.UInteger32, "A URI that represents the integer32 XML data type.", v => v.RuleFor(c => c.Value).Must(v => int.TryParse(v, out var result)));
 // /// <summary>
-// /// A URI that represents the base64Binary XML data type.  http://www.w3.org/2001/XMLSchema#base64Binary
+// /// A URI that represents the base64Binary XML data type.  xs:base64Binary
 // /// </summary>
-// // <value>http://www.w3.org/2001/XMLSchema#base64Binary</value>
+// // <value>xs:base64Binary</value>
 // public static readonly ClaimValueType Base64BinaryClaimValueType = new(SysSecVt.Base64Binary, "A URI that represents the base64Binary XML data type.", v => v.RuleFor(c => c.Value).Must(c => true));
 
 // /// <summary>
diff --git a/src/Claims/Dgmjr.Identity.Claims.sln b/src/Claims/Dgmjr.Identity.Claims.sln
index 36146a5..3659faa 100644
--- a/src/Claims/Dgmjr.Identity.Claims.sln
+++ b/src/Claims/Dgmjr.Identity.Claims.sln
@@ -1,4 +1,54 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B283EBC2-E01F-412D-9339-FD56EF114549}" 
+	ProjectSection(SolutionItems) = preProject
+		..\..\..\..\Packages\Versions.props = ..\..\..\..\Packages\Versions.props
+		..\..\..\..\Packages\Versions.Local.json = ..\..\..\..\Packages\Versions.Local.json
+		..\..\..\..\Packages\Versions.Local.props = ..\..\..\..\Packages\Versions.Local.props
+		..\..\..\..\Packages\Packages.pkgs = ..\..\..\..\Packages\Packages.pkgs
+		..\..\..\..\Packages\Packages\AnyOf.pkgs = ..\..\..\..\Packages\Packages\AnyOf.pkgs
+		..\..\..\..\Packages\Packages\APIVersioning.pkgs = ..\..\..\..\Packages\Packages\APIVersioning.pkgs
+		..\..\..\..\Packages\Packages\AutoMapper.pkgs = ..\..\..\..\Packages\Packages\AutoMapper.pkgs
+		..\..\..\..\Packages\Packages\Azure.pkgs = ..\..\..\..\Packages\Packages\Azure.pkgs
+		..\..\..\..\Packages\Packages\AzureFunctions.pkgs = ..\..\..\..\Packages\Packages\AzureFunctions.pkgs
+		..\..\..\..\Packages\Packages\DDD.pkgs = ..\..\..\..\Packages\Packages\DDD.pkgs
+		..\..\..\..\Packages\Packages\EFCore.pkgs = ..\..\..\..\Packages\Packages\EFCore.pkgs
+		..\..\..\..\Packages\Packages\GlobalBuild.pkgs = ..\..\..\..\Packages\Packages\GlobalBuild.pkgs
+		..\..\..\..\Packages\Packages\GlobalCodeGenerators.pkgs = ..\..\..\..\Packages\Packages\GlobalCodeGenerators.pkgs
+		..\..\..\..\Packages\Packages\Images.pkgs = ..\..\..\..\Packages\Packages\Images.pkgs
+		..\..\..\..\Packages\Packages\McMaster.CommandLineUtils.pkgs = ..\..\..\..\Packages\Packages\McMaster.CommandLineUtils.pkgs
+		..\..\..\..\Packages\Packages\MediatR.pkgs = ..\..\..\..\Packages\Packages\MediatR.pkgs
+		..\..\..\..\Packages\Packages\Microsoft.AspNetCore.pkgs = ..\..\..\..\Packages\Packages\Microsoft.AspNetCore.pkgs
+		..\..\..\..\Packages\Packages\Microsoft.Extensions.pkgs = ..\..\..\..\Packages\Packages\Microsoft.Extensions.pkgs
+		..\..\..\..\Packages\Packages\Microsoft.Identity.pkgs = ..\..\..\..\Packages\Packages\Microsoft.Identity.pkgs
+		..\..\..\..\Packages\Packages\Microsoft.VisualStudio.Shell.Interop.pkgs = ..\..\..\..\Packages\Packages\Microsoft.VisualStudio.Shell.Interop.pkgs
+		..\..\..\..\Packages\Packages\Miscellany.pkgs = ..\..\..\..\Packages\Packages\Miscellany.pkgs
+		..\..\..\..\Packages\Packages\MSBuild.pkgs = ..\..\..\..\Packages\Packages\MSBuild.pkgs
+		..\..\..\..\Packages\Packages\MSBuildProjectCreator.pkgs = ..\..\..\..\Packages\Packages\MSBuildProjectCreator.pkgs
+		..\..\..\..\Packages\Packages\MSBuildSdks.pkgs = ..\..\..\..\Packages\Packages\MSBuildSdks.pkgs
+		..\..\..\..\Packages\Packages\Newtonsoft.Json.pkgs = ..\..\..\..\Packages\Packages\Newtonsoft.Json.pkgs
+		..\..\..\..\Packages\Packages\NuGet.pkgs = ..\..\..\..\Packages\Packages\NuGet.pkgs
+		..\..\..\..\Packages\Packages\Powershell.pkgs = ..\..\..\..\Packages\Packages\Powershell.pkgs
+		..\..\..\..\Packages\Packages\Roslyn.pkgs = ..\..\..\..\Packages\Packages\Roslyn.pkgs
+		..\..\..\..\Packages\Packages\Serilog.pkgs = ..\..\..\..\Packages\Packages\Serilog.pkgs
+		..\..\..\..\Packages\Packages\SlnGen.pkgs = ..\..\..\..\Packages\Packages\SlnGen.pkgs
+		..\..\..\..\Packages\Packages\Swashbuckle.pkgs = ..\..\..\..\Packages\Packages\Swashbuckle.pkgs
+		..\..\..\..\Packages\Packages\System.pkgs = ..\..\..\..\Packages\Packages\System.pkgs
+		..\..\..\..\Packages\Packages\Telegram.pkgs = ..\..\..\..\Packages\Packages\Telegram.pkgs
+		..\..\..\..\Packages\Packages\Testing.EfCore.pkgs = ..\..\..\..\Packages\Packages\Testing.EfCore.pkgs
+		..\..\..\..\Packages\Packages\Testing.pkgs = ..\..\..\..\Packages\Packages\Testing.pkgs
+		..\..\..\..\Packages\Packages\Validation.pkgs = ..\..\..\..\Packages\Packages\Validation.pkgs
+		..\..\..\..\Packages\Packages\XmlDocMd.pkgs = ..\..\..\..\Packages\Packages\XmlDocMd.pkgs
+		..\..\..\..\Packages\Versions\AspNetCoreIdentity.props = ..\..\..\..\Packages\Versions\AspNetCoreIdentity.props
+		..\..\..\..\Packages\Versions\AutoMapper.props = ..\..\..\..\Packages\Versions\AutoMapper.props
+		..\..\..\..\Packages\Versions\CoreIntegratedLibs.props = ..\..\..\..\Packages\Versions\CoreIntegratedLibs.props
+		..\..\..\..\Packages\Versions\EFCore.props = ..\..\..\..\Packages\Versions\EFCore.props
+		..\..\..\..\Packages\Versions\JsonPatch.props = ..\..\..\..\Packages\Versions\JsonPatch.props
+		..\..\..\..\Packages\Versions\MediatR.props = ..\..\..\..\Packages\Versions\MediatR.props
+		..\..\..\..\Packages\Versions\Microsoft.Extensions.Logging.props = ..\..\..\..\Packages\Versions\Microsoft.Extensions.Logging.props
+		..\..\..\..\Packages\Versions\MSBuild.props = ..\..\..\..\Packages\Versions\MSBuild.props
+		..\..\..\..\Packages\Versions\PowerShell.props = ..\..\..\..\Packages\Versions\PowerShell.props
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 	EndGlobalSection