From 36421bc00111af9b976ed799148d9048923e756a Mon Sep 17 00:00:00 2001
From: Geoff McElhanon <geoffrey@mcelhanon.com>
Date: Thu, 22 Aug 2024 06:12:04 -0500
Subject: [PATCH] [ODS-5419] Add Discriminator to edfi.Descriptor (#1122)

---
 .../Descriptors/DescriptorDetailsProvider.cs  |   97 +-
 .../Configuration/NHibernateConfigurator.cs   |   32 -
 ...xtensionNHibernateConfigurationProvider.cs |   62 +-
 ...xtensionNHibernateConfigurationProvider.cs |    5 -
 .../Models/Domain/EntityExtensions.cs         |    4 -
 ...kedChangesIdentifierProjectionsProvider.cs |    4 +-
 .../DescriptorDetailsProviderTests.cs         |   12 +-
 ...xtensionNHibernateConfigurationProvider.cs |    2 -
 ...tityOrmMappings.generated.hbm.approved.xml | 1137 ++++++++++-----
 ...pingsForQueries.generated.hbm.approved.xml | 1139 ++++++++++-----
 ...tityOrmMappings.generated.hbm.approved.xml | 1137 ++++++++++-----
 ...pingsForQueries.generated.hbm.approved.xml | 1139 ++++++++++-----
 ...s_EntitiesForQueries.generated.approved.cs |    6 +
 ..._Resources_Resources.generated.approved.cs |   27 +-
 ...tityOrmMappings.generated.hbm.approved.xml | 1257 ++++++++++------
 ...pingsForQueries.generated.hbm.approved.xml | 1259 +++++++++++------
 ...tityOrmMappings.generated.hbm.approved.xml | 1257 ++++++++++------
 ...pingsForQueries.generated.hbm.approved.xml | 1259 +++++++++++------
 ...s_EntitiesForQueries.generated.approved.cs |    6 +
 ..._Resources_Resources.generated.approved.cs |   27 +-
 .../Generators/EntityOrmMappings.cs           |    1 -
 .../Models/Templates/OrmMapping.cs            |    2 -
 .../Mustache/EntityOrmMappings.mustache       |   10 -
 23 files changed, 6523 insertions(+), 3358 deletions(-)

diff --git a/Application/EdFi.Ods.Common/Descriptors/DescriptorDetailsProvider.cs b/Application/EdFi.Ods.Common/Descriptors/DescriptorDetailsProvider.cs
index 0e20041e5e..ce7e13832c 100644
--- a/Application/EdFi.Ods.Common/Descriptors/DescriptorDetailsProvider.cs
+++ b/Application/EdFi.Ods.Common/Descriptors/DescriptorDetailsProvider.cs
@@ -7,7 +7,10 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
+using Dapper;
 using EdFi.Ods.Common.Context;
+using EdFi.Ods.Common.Database.Querying;
+using EdFi.Ods.Common.Database.Querying.Dialects;
 using EdFi.Ods.Common.Exceptions;
 using EdFi.Ods.Common.Infrastructure.Configuration;
 using EdFi.Ods.Common.Models;
@@ -25,26 +28,29 @@ namespace EdFi.Ods.Common.Descriptors;
 public class DescriptorDetailsProvider : IDescriptorDetailsProvider
 {
     private readonly IContextStorage _contextStorage;
+    private readonly Dialect _dialect;
     private readonly ISessionFactory _sessionFactory;
     
-    private readonly Lazy<Dictionary<string, string>> _descriptorTypeNameByEntityName;
+    private readonly Lazy<Dictionary<string, string>> _discriminatorByDescriptorName;
 
     private readonly ILog _logger = LogManager.GetLogger(typeof(DescriptorDetailsProvider));
     
     public DescriptorDetailsProvider(
         ISessionFactory sessionFactory,
         IDomainModelProvider domainModelProvider,
-        IContextStorage contextStorage)
+        IContextStorage contextStorage,
+        Dialect dialect)
     {
         _contextStorage = contextStorage;
+        _dialect = dialect;
         _sessionFactory = sessionFactory;
         
-        _descriptorTypeNameByEntityName = new Lazy<Dictionary<string, string>>(
+        _discriminatorByDescriptorName = new Lazy<Dictionary<string, string>>(
             () => domainModelProvider.GetDomainModel()
                 .Entities.Where(e => e.IsDescriptorEntity)
                 .ToDictionary(
                     e => e.Name, 
-                    e => e.EntityTypeFullName(e.SchemaProperCaseName())));
+                    e => e.FullName.ToString()));
     }
 
     /// <inheritdoc cref="IDescriptorDetailsProvider.GetAllDescriptorDetails" />
@@ -56,33 +62,23 @@ public IList<DescriptorDetails> GetAllDescriptorDetails()
 
             using (var session = _sessionFactory.OpenSession())
             {
-                var queries = GetQueries(session).ToList();
+                var qb = GetDescriptorQueryBuilder();
+                var template = qb.BuildTemplate();
 
-                var results = queries
-                    .SelectMany(x => x.detailQuery
-                        .Select(d =>
+                var records = session.Connection.Query<DescriptorRecord>(template.RawSql);
+
+                var results = records.Select(
+                        r => new DescriptorDetails()
                         {
-                            // Assign the descriptor name to the details
-                            d.DescriptorName = x.descriptorName;
-                            return d;
+                            DescriptorId = r.DescriptorId,
+                            DescriptorName = r.Discriminator?.Substring(r.Discriminator.IndexOf('.') + 1),
+                            CodeValue = r.CodeValue,
+                            Namespace = r.Namespace
                         })
-                        .ToList())
                     .ToList();
 
                 return results;
             }
-
-            IEnumerable<(string descriptorName, IEnumerable<DescriptorDetails> detailQuery)> GetQueries(ISession session)
-            {
-                foreach (string descriptorName in _descriptorTypeNameByEntityName.Value.Keys)
-                {
-                    var query = 
-                        GetDescriptorCriteria(descriptorName, session)
-                        .Future<DescriptorDetails>();
-
-                    yield return (descriptorName, query);
-                }
-            }
         }
         catch (Exception ex)
         {
@@ -96,45 +92,52 @@ public IList<DescriptorDetails> GetAllDescriptorDetails()
         }
     }
 
+    private QueryBuilder GetDescriptorQueryBuilder()
+    {
+        var qb = new QueryBuilder(_dialect)
+            .From("edfi.Descriptor")
+            .Select("DescriptorId", "CodeValue", "Namespace", "Discriminator");
+
+        return qb;
+    }
+
     /// <inheritdoc cref="IDescriptorDetailsProvider.GetDescriptorDetails(string,int)" />
     public DescriptorDetails GetDescriptorDetails(string descriptorName, int descriptorId)
     {
         using var session = _sessionFactory.OpenSession();
-        
-        return GetDescriptorCriteria(descriptorName, session, descriptorId).UniqueResult<DescriptorDetails>();
+
+        var qb = GetFilteredDescriptorQueryBuilder(descriptorName, descriptorId);
+        var template = qb.BuildTemplate();
+
+        return session.Connection.QuerySingleOrDefault<DescriptorDetails>(template.RawSql, template.Parameters);
     }
 
     /// <inheritdoc cref="IDescriptorDetailsProvider.GetDescriptorDetails(string,string)" />
     public DescriptorDetails GetDescriptorDetails(string descriptorName, string uri)
     {
         using var session = _sessionFactory.OpenSession();
-        
-        return GetDescriptorCriteria(descriptorName, session, uri: uri).UniqueResult<DescriptorDetails>();
+
+        var qb = GetFilteredDescriptorQueryBuilder(descriptorName, uri: uri);
+        var template = qb.BuildTemplate();
+
+        return session.Connection.QuerySingleOrDefault<DescriptorDetails>(template.RawSql, template.Parameters);
     }
 
-    private ICriteria GetDescriptorCriteria(
+    private QueryBuilder GetFilteredDescriptorQueryBuilder(
         string descriptorName,
-        ISession session,
         int? descriptorId = null,
         string uri = null)
     {
-        if (!_descriptorTypeNameByEntityName.Value.TryGetValue(descriptorName, out string descriptorTypeName))
+        if (!_discriminatorByDescriptorName.Value.TryGetValue(descriptorName, out string discriminator))
         {
             throw new ArgumentException($"Descriptor '{descriptorName}' is not a known descriptor entity name.");
         }
 
-        var descriptorIdColumnName = descriptorName + "Id";
-
-        var criteria = session.CreateCriteria(descriptorTypeName)
-            .SetProjection(
-                Projections.ProjectionList()
-                    .Add(Projections.Property(descriptorIdColumnName), "DescriptorId")
-                    .Add(Projections.Property("Namespace"), "Namespace")
-                    .Add(Projections.Property("CodeValue"), "CodeValue"));
+        var qb = GetDescriptorQueryBuilder().Where("Discriminator", discriminator);
 
         if (descriptorId.HasValue)
         {
-            criteria.Add(Restrictions.Eq(descriptorIdColumnName, descriptorId.Value));
+            qb.Where("DescriptorId", descriptorId.Value);
         }
 
         if (uri != null)
@@ -146,12 +149,18 @@ private ICriteria GetDescriptorCriteria(
                 throw new ValidationException($"{descriptorName} value '{uri}' is not a valid value for use as a descriptor (a '#' is expected to delineate the namespace and code value portions).");
             }
 
-            criteria.Add(Restrictions.Eq("Namespace", uri.Substring(0, pos)));
-            criteria.Add(Restrictions.Eq("CodeValue", uri.Substring(pos + 1)));
+            qb.Where("Namespace", uri.Substring(0, pos));
+            qb.Where("CodeValue", uri.Substring(pos + 1));
         }
 
-        criteria.SetResultTransformer(Transformers.AliasToBean<DescriptorDetails>());
+        return qb;
+    }
 
-        return criteria;
+    private class DescriptorRecord
+    {
+        public int DescriptorId { get; set; }
+        public string Discriminator { get; set; }
+        public string Namespace { get; set; }
+        public string CodeValue { get; set; }
     }
 }
diff --git a/Application/EdFi.Ods.Common/Infrastructure/Configuration/NHibernateConfigurator.cs b/Application/EdFi.Ods.Common/Infrastructure/Configuration/NHibernateConfigurator.cs
index 6cddc20826..d7991053d5 100644
--- a/Application/EdFi.Ods.Common/Infrastructure/Configuration/NHibernateConfigurator.cs
+++ b/Application/EdFi.Ods.Common/Infrastructure/Configuration/NHibernateConfigurator.cs
@@ -33,7 +33,6 @@ public class NHibernateConfigurator : INHibernateConfigurator
         private readonly IDictionary<string, HbmBag[]> _entityExtensionHbmBagsByEntityName;
         private readonly IExtensionNHibernateConfigurationProvider[] _extensionConfigurationProviders;
         private readonly IDictionary<string, HbmSubclass[]> _extensionDerivedEntityByEntityName;
-        private readonly IDictionary<string, HbmJoinedSubclass[]> _extensionDescriptorByEntityName;
         private readonly IOrmMappingFileDataProvider _ormMappingFileDataProvider;
         private readonly Func<IEntityAuthorizer> _entityAuthorizerResolver;
         private readonly IAuthorizationContextProvider _authorizationContextProvider;
@@ -77,14 +76,6 @@ public NHibernateConfigurator(IEnumerable<IExtensionNHibernateConfigurationProvi
                     x => x.SelectMany(y => y.Value)
                         .ToArray());
 
-            _extensionDescriptorByEntityName = _extensionConfigurationProviders
-                .SelectMany(x => x.NonDiscriminatorBasedHbmJoinedSubclassesByEntityName)
-                .GroupBy(x => x.Key)
-                .ToDictionary(
-                    x => x.Key,
-                    x => x.SelectMany(y => y.Value)
-                        .ToArray());
-
             _extensionDerivedEntityByEntityName = _extensionConfigurationProviders
                 .SelectMany(x => x.DiscriminatorBasedHbmSubclassesByEntityName)
                 .GroupBy(x => x.Key)
@@ -172,8 +163,6 @@ private void Configuration_BeforeBindMapping(object sender, BindMappingEventArgs
                 MapJoinedSubclassesToCoreEntity(
                     classMappingByEntityName, joinedSubclassMappingByEntityName, subclassJoinMappingByEntityName);
 
-                MapDescriptorToCoreDescriptorEntity(classMappingByEntityName);
-
                 MapDerivedEntityToCoreEntity(classMappingByEntityName);
             }
 
@@ -198,27 +187,6 @@ void MapDerivedEntityToCoreEntity(Dictionary<string, HbmClass> classMappingByEnt
                 }
             }
 
-            void MapDescriptorToCoreDescriptorEntity(Dictionary<string, HbmClass> classMappingByEntityName)
-            {
-                // foreach entity name, look in core mapping file (e.mapping) for core entity mapping and if found
-                // concat new extension HbmJoinedSubclass to current set of Ed-Fi entity HbmJoinedSubclasses.
-                foreach (string entityName in _extensionDescriptorByEntityName.Keys)
-                {
-                    if (!classMappingByEntityName.TryGetValue(entityName, out HbmClass classMapping))
-                    {
-                        throw new MappingException(
-                            $"The subclass extension to entity '{entityName}' could not be applied because the class mapping could not be found.");
-                    }
-
-                    var hbmJoinedSubclasses = _extensionDescriptorByEntityName[entityName]
-                        .Select(x => (object) x)
-                        .ToArray();
-
-                    classMapping.Items1 = (classMapping.Items1 ?? Array.Empty<object>()).Concat(hbmJoinedSubclasses)
-                        .ToArray();
-                }
-            }
-
             void MapJoinedSubclassesToCoreEntity(Dictionary<string, HbmClass> classMappingByEntityName,
                 Dictionary<string, HbmJoinedSubclass> joinedSubclassMappingByEntityName,
                 Dictionary<string, HbmJoin> subclassJoinMappingByEntityName)
diff --git a/Application/EdFi.Ods.Common/Infrastructure/Extensibility/ExtensionNHibernateConfigurationProvider.cs b/Application/EdFi.Ods.Common/Infrastructure/Extensibility/ExtensionNHibernateConfigurationProvider.cs
index a6d1e23bac..3f964c5101 100644
--- a/Application/EdFi.Ods.Common/Infrastructure/Extensibility/ExtensionNHibernateConfigurationProvider.cs
+++ b/Application/EdFi.Ods.Common/Infrastructure/Extensibility/ExtensionNHibernateConfigurationProvider.cs
@@ -7,7 +7,6 @@
 using System.Linq;
 using EdFi.Common;
 using EdFi.Common.Configuration;
-using EdFi.Ods.Common.Configuration;
 using EdFi.Ods.Common.Constants;
 using EdFi.Ods.Common.Conventions;
 using EdFi.Ods.Common.Dtos;
@@ -76,14 +75,6 @@ public IDictionary<string, HbmBag[]> AggregateExtensionHbmBagsByEntityName
             get => CreateAggregateExtensionHbmBagsByEntityName();
         }
 
-        /// <summary>
-        /// Returns a dictionary keyed by Ed-Fi standard base entity name, containing the derived entity discriminators as HbmJoinedSubclasses.
-        /// </summary>
-        public IDictionary<string, HbmJoinedSubclass[]> NonDiscriminatorBasedHbmJoinedSubclassesByEntityName
-        {
-            get => CreateNonDiscriminatorBasedHbmJoinedSubclassesByEntityName();
-        }
-
         /// <summary>
         /// Returns a dictionary keyed by Ed-Fi standard base entity name, containing the derived entity as HbmSubclass. (Discriminator is required)
         /// </summary>
@@ -148,63 +139,14 @@ private Dictionary<string, HbmBag[]> CreateAggregateExtensionHbmBagsByEntityName
                 .ToDictionary(x => x.Key, x => x.ToArray());
         }
 
-        private Dictionary<string, HbmJoinedSubclass[]> CreateNonDiscriminatorBasedHbmJoinedSubclassesByEntityName()
-        {
-            return Enumerable.Select(
-                    _domainModel.Entities
-                        .Where(e => e.IsDerived && e.IsExtensionEntity && e.Schema.Equals(PhysicalName) && e.IsDescriptorEntity), e => new
-                    {
-                        EntityName = !e.BaseEntity.IsAbstract
-                            ? $"{e.BaseEntity.Name}Base"
-                            : e.BaseEntity.Name,
-                        HbmJoinedSubclass = CreateHbmJoinSubclass(e)
-                    })
-                .GroupBy(x => x.EntityName, x => x.HbmJoinedSubclass)
-                .ToDictionary(x => x.Key, x => x.ToArray());
-
-            HbmJoinedSubclass CreateHbmJoinSubclass(Entity entity)
-            {
-                var properties = Enumerable.ToArray<object>(
-                        entity.Properties
-                            .OrderBy(p => p.PropertyName)
-                            .Select(p => CreateHbmProperty(p, entity)));
-
-                var references = Enumerable.ToArray<object>(entity.NavigableOneToOnes.Select(CreateHbmBag));
-
-                return new HbmJoinedSubclass
-                {
-                    table = entity.TableName(_databaseEngine),
-                    schema = PhysicalName,
-                    name = GetExtensionEntityAssemblyQualifiedName(entity),
-                    key = CreateHbmKey(entity.Properties.Where(p => p.IsIdentifying).OrderBy(p => p.PropertyName)),
-                    Items = properties.Concat(references).ToArray(),
-                    lazy = false
-                };
-
-                HbmBag CreateHbmBag(AssociationView association)
-                {
-                    return new
-                        HbmBag
-                        {
-                            name = $"{association.Name}",
-                            cascade = "all-delete-orphan",
-                            inverse = true,
-                            lazy = HbmCollectionLazy.False,
-                            key = CreateHbmKey(
-                                association.OtherEntity.Properties.Where(p => p.IsIdentifying).OrderBy(p => p.PropertyName)),
-                            Item = new HbmOneToMany {@class = GetExtensionEntityAssemblyQualifiedName(association.OtherEntity)}
-                        };
-                }
-            }
-        }
-
         private Dictionary<string, HbmSubclass[]> CreateDiscriminatorBasedHbmSubclassesByEntityName()
         {
             return Enumerable.Select(
                     _domainModel.Entities
                         .Where(
                             e => e.IsDerived && e.IsExtensionEntity && e.Schema.Equals(PhysicalName) &&
-                                 !e.BaseEntity.Schema.Equals(PhysicalName) && !e.IsDescriptorEntity), e => new
+                                 !e.BaseEntity.Schema.Equals(PhysicalName)), 
+                    e => new
                     {
                         EntityName = !e.BaseEntity.IsAbstract
                             ? $"{e.BaseEntity.Name}Base"
diff --git a/Application/EdFi.Ods.Common/Infrastructure/Extensibility/IExtensionNHibernateConfigurationProvider.cs b/Application/EdFi.Ods.Common/Infrastructure/Extensibility/IExtensionNHibernateConfigurationProvider.cs
index 8e6631fe9d..b2869a5c4c 100644
--- a/Application/EdFi.Ods.Common/Infrastructure/Extensibility/IExtensionNHibernateConfigurationProvider.cs
+++ b/Application/EdFi.Ods.Common/Infrastructure/Extensibility/IExtensionNHibernateConfigurationProvider.cs
@@ -23,11 +23,6 @@ public interface IExtensionNHibernateConfigurationProvider
         /// </summary>
         IDictionary<string, HbmBag[]> AggregateExtensionHbmBagsByEntityName { get; }
 
-        /// <summary>
-        /// Extensions that are derived from a class without a discriminator (e.g. a descriptor).
-        /// </summary>
-        IDictionary<string, HbmJoinedSubclass[]> NonDiscriminatorBasedHbmJoinedSubclassesByEntityName { get; }
-
         /// <summary>
         /// Extensions that are derived from either a class using a discriminator.
         /// </summary>
diff --git a/Application/EdFi.Ods.Common/Models/Domain/EntityExtensions.cs b/Application/EdFi.Ods.Common/Models/Domain/EntityExtensions.cs
index c8f81817c5..57824defaa 100644
--- a/Application/EdFi.Ods.Common/Models/Domain/EntityExtensions.cs
+++ b/Application/EdFi.Ods.Common/Models/Domain/EntityExtensions.cs
@@ -188,10 +188,6 @@ public static bool HasDiscriminator(this Entity entity)
             if (entity.IsDerived)
                 return false;
 
-            // Ed-Fi descriptors cannot be derived
-            if (entity.IsDescriptorBaseEntity())
-                return false;
-
             // SchoolYearType is also not derivable
             if (entity.FullName.Equals(new FullName(EdFiConventions.PhysicalSchemaName, "SchoolYearType")))
                 return false;
diff --git a/Application/EdFi.Ods.Features/ChangeQueries/Repositories/TrackedChangesIdentifierProjectionsProvider.cs b/Application/EdFi.Ods.Features/ChangeQueries/Repositories/TrackedChangesIdentifierProjectionsProvider.cs
index 68b5a0434c..1e0ec93e5a 100644
--- a/Application/EdFi.Ods.Features/ChangeQueries/Repositories/TrackedChangesIdentifierProjectionsProvider.cs
+++ b/Application/EdFi.Ods.Features/ChangeQueries/Repositories/TrackedChangesIdentifierProjectionsProvider.cs
@@ -129,7 +129,7 @@ IEnumerable<SelectColumn> GetSelectColumns(ResourceProperty resourceProperty)
                     yield break;
                 }
              
-                if (IsDerivedFromEntityWithDiscriminator(entityProperty.Entity))
+                if (entityProperty.Entity.IsDerived && !entityProperty.Entity.IsDescriptorEntity)
                 {
                     yield return new SelectColumn
                     {
@@ -171,8 +171,6 @@ IEnumerable<SelectColumn> GetSelectColumns(ResourceProperty resourceProperty)
                     JsonPropertyName = resourceProperty.JsonPropertyName,
                 };
             }
-            
-            bool IsDerivedFromEntityWithDiscriminator(Entity entity) => entity.BaseEntity?.HasDiscriminator() == true;
         }
     }
 }
diff --git a/Application/EdFi.Ods.Repositories.NHibernate.Tests/DescriptorDetailsProviderTests.cs b/Application/EdFi.Ods.Repositories.NHibernate.Tests/DescriptorDetailsProviderTests.cs
index c9031d520e..4b3e368bb3 100644
--- a/Application/EdFi.Ods.Repositories.NHibernate.Tests/DescriptorDetailsProviderTests.cs
+++ b/Application/EdFi.Ods.Repositories.NHibernate.Tests/DescriptorDetailsProviderTests.cs
@@ -10,6 +10,7 @@
 using System.Linq;
 using EdFi.Ods.Api.Providers;
 using EdFi.Ods.Common.Context;
+using EdFi.Ods.Common.Database.Querying.Dialects;
 using EdFi.Ods.Common.Descriptors;
 using EdFi.Ods.Common.Models;
 using EdFi.Ods.Common.Models.Definitions;
@@ -85,6 +86,14 @@ public void SetUp()
                 session.Save(AssessmentPeriodTestDescriptor1);
             }
 
+            using (var session = SessionFactory.OpenSession())
+            {
+                CountryTestDescriptor1 = session.Load<CountryDescriptor>(CountryTestDescriptor1.DescriptorId);
+                CountryTestDescriptor2 = session.Load<CountryDescriptor>(CountryTestDescriptor2.DescriptorId);
+                CountryTestDescriptor3 = session.Load<CountryDescriptor>(CountryTestDescriptor3.DescriptorId);
+                AssessmentPeriodTestDescriptor1 = session.Load<AssessmentPeriodDescriptor>(AssessmentPeriodTestDescriptor1.DescriptorId);
+            }
+
             var domainModelBuilder = new DomainModelBuilder();
 
             domainModelBuilder.AddSchema(new SchemaDefinition("Ed-Fi", "edfi"));
@@ -145,7 +154,8 @@ public void SetUp()
             DescriptorDetailsProvider = new DescriptorDetailsProvider(
                 SessionFactory, 
                 domainModelProvider,
-                new HashtableContextStorage());
+                new HashtableContextStorage(),
+                new SqlServerDialect());
 
             AssociationDefinition CreateDescriptorInheritanceAssociation(string descriptorName)
             {
diff --git a/Application/EdFi.Ods.Tests.TestExtension/NHibernate/ExtensionNHibernateConfigurationProvider.cs b/Application/EdFi.Ods.Tests.TestExtension/NHibernate/ExtensionNHibernateConfigurationProvider.cs
index 5db3194981..4e3f95b458 100644
--- a/Application/EdFi.Ods.Tests.TestExtension/NHibernate/ExtensionNHibernateConfigurationProvider.cs
+++ b/Application/EdFi.Ods.Tests.TestExtension/NHibernate/ExtensionNHibernateConfigurationProvider.cs
@@ -106,8 +106,6 @@ public IDictionary<string, HbmBag[]> AggregateExtensionHbmBagsByEntityName
             }
         }
 
-        public IDictionary<string, HbmJoinedSubclass[]> NonDiscriminatorBasedHbmJoinedSubclassesByEntityName => new Dictionary<string, HbmJoinedSubclass[]>();
-
         public IDictionary<string, HbmSubclass[]> DiscriminatorBasedHbmSubclassesByEntityName => new Dictionary<string, HbmSubclass[]>();
     }
 }
diff --git a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/4.0.0/DataStandard_400_ApprovalTests.Verify.Standard_Std_4.0.0_EntityOrmMappings_MsSql_EntityOrmMappings.generated.hbm.approved.xml b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/4.0.0/DataStandard_400_ApprovalTests.Verify.Standard_Std_4.0.0_EntityOrmMappings_MsSql_EntityOrmMappings.generated.hbm.approved.xml
index 83cd7964d5..a7636ce453 100644
--- a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/4.0.0/DataStandard_400_ApprovalTests.Verify.Standard_Std_4.0.0_EntityOrmMappings_MsSql_EntityOrmMappings.generated.hbm.approved.xml
+++ b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/4.0.0/DataStandard_400_ApprovalTests.Verify.Standard_Std_4.0.0_EntityOrmMappings_MsSql_EntityOrmMappings.generated.hbm.approved.xml
@@ -2557,12 +2557,13 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.DescriptorAggregate.EdFi.Descriptor" table="Descriptor" lazy="false" abstract="true">
+  <class name="EdFi.Ods.Entities.NHibernate.DescriptorAggregate.EdFi.Descriptor" table="Descriptor" lazy="false" abstract="true" discriminator-value="NULL">
     <id name="DescriptorId" column="DescriptorId" type="int">
       <generator class="identity" />
     </id>
 
     <!-- Discriminator -->
+    <discriminator column="Discriminator" type="string" />
 
     <!-- Optimistic locking for aggregate root -->
     <version name="LastModifiedDate" column="LastModifiedDate" type="UtcDateTime" />
@@ -2587,7 +2588,8 @@
 
     <!-- Collections -->
     <!-- Derived classes -->
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.AbsenceEventCategoryDescriptorAggregate.EdFi.AbsenceEventCategoryDescriptor" table="AbsenceEventCategoryDescriptor" lazy="false">
+    <subclass name="EdFi.Ods.Entities.NHibernate.AbsenceEventCategoryDescriptorAggregate.EdFi.AbsenceEventCategoryDescriptor" lazy="false" discriminator-value="edfi.AbsenceEventCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AbsenceEventCategoryDescriptor" >
           <key>
             <column name="AbsenceEventCategoryDescriptorId" />
           </key>
@@ -2600,8 +2602,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.AcademicHonorCategoryDescriptorAggregate.EdFi.AcademicHonorCategoryDescriptor" table="AcademicHonorCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.AcademicHonorCategoryDescriptorAggregate.EdFi.AcademicHonorCategoryDescriptor" lazy="false" discriminator-value="edfi.AcademicHonorCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AcademicHonorCategoryDescriptor" >
           <key>
             <column name="AcademicHonorCategoryDescriptorId" />
           </key>
@@ -2614,8 +2618,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.AcademicSubjectDescriptorAggregate.EdFi.AcademicSubjectDescriptor" table="AcademicSubjectDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.AcademicSubjectDescriptorAggregate.EdFi.AcademicSubjectDescriptor" lazy="false" discriminator-value="edfi.AcademicSubjectDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AcademicSubjectDescriptor" >
           <key>
             <column name="AcademicSubjectDescriptorId" />
           </key>
@@ -2628,8 +2634,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.AccommodationDescriptorAggregate.EdFi.AccommodationDescriptor" table="AccommodationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.AccommodationDescriptorAggregate.EdFi.AccommodationDescriptor" lazy="false" discriminator-value="edfi.AccommodationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AccommodationDescriptor" >
           <key>
             <column name="AccommodationDescriptorId" />
           </key>
@@ -2642,8 +2650,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.AccountTypeDescriptorAggregate.EdFi.AccountTypeDescriptor" table="AccountTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.AccountTypeDescriptorAggregate.EdFi.AccountTypeDescriptor" lazy="false" discriminator-value="edfi.AccountTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AccountTypeDescriptor" >
           <key>
             <column name="AccountTypeDescriptorId" />
           </key>
@@ -2656,8 +2666,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.AchievementCategoryDescriptorAggregate.EdFi.AchievementCategoryDescriptor" table="AchievementCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.AchievementCategoryDescriptorAggregate.EdFi.AchievementCategoryDescriptor" lazy="false" discriminator-value="edfi.AchievementCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AchievementCategoryDescriptor" >
           <key>
             <column name="AchievementCategoryDescriptorId" />
           </key>
@@ -2670,8 +2682,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.AdditionalCreditTypeDescriptorAggregate.EdFi.AdditionalCreditTypeDescriptor" table="AdditionalCreditTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.AdditionalCreditTypeDescriptorAggregate.EdFi.AdditionalCreditTypeDescriptor" lazy="false" discriminator-value="edfi.AdditionalCreditTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AdditionalCreditTypeDescriptor" >
           <key>
             <column name="AdditionalCreditTypeDescriptorId" />
           </key>
@@ -2684,8 +2698,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.AddressTypeDescriptorAggregate.EdFi.AddressTypeDescriptor" table="AddressTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.AddressTypeDescriptorAggregate.EdFi.AddressTypeDescriptor" lazy="false" discriminator-value="edfi.AddressTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AddressTypeDescriptor" >
           <key>
             <column name="AddressTypeDescriptorId" />
           </key>
@@ -2698,8 +2714,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.AdministrationEnvironmentDescriptorAggregate.EdFi.AdministrationEnvironmentDescriptor" table="AdministrationEnvironmentDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.AdministrationEnvironmentDescriptorAggregate.EdFi.AdministrationEnvironmentDescriptor" lazy="false" discriminator-value="edfi.AdministrationEnvironmentDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AdministrationEnvironmentDescriptor" >
           <key>
             <column name="AdministrationEnvironmentDescriptorId" />
           </key>
@@ -2712,8 +2730,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.AdministrativeFundingControlDescriptorAggregate.EdFi.AdministrativeFundingControlDescriptor" table="AdministrativeFundingControlDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.AdministrativeFundingControlDescriptorAggregate.EdFi.AdministrativeFundingControlDescriptor" lazy="false" discriminator-value="edfi.AdministrativeFundingControlDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AdministrativeFundingControlDescriptor" >
           <key>
             <column name="AdministrativeFundingControlDescriptorId" />
           </key>
@@ -2726,8 +2746,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.AncestryEthnicOriginDescriptorAggregate.EdFi.AncestryEthnicOriginDescriptor" table="AncestryEthnicOriginDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.AncestryEthnicOriginDescriptorAggregate.EdFi.AncestryEthnicOriginDescriptor" lazy="false" discriminator-value="edfi.AncestryEthnicOriginDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AncestryEthnicOriginDescriptor" >
           <key>
             <column name="AncestryEthnicOriginDescriptorId" />
           </key>
@@ -2740,8 +2762,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.AssessmentCategoryDescriptorAggregate.EdFi.AssessmentCategoryDescriptor" table="AssessmentCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.AssessmentCategoryDescriptorAggregate.EdFi.AssessmentCategoryDescriptor" lazy="false" discriminator-value="edfi.AssessmentCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AssessmentCategoryDescriptor" >
           <key>
             <column name="AssessmentCategoryDescriptorId" />
           </key>
@@ -2754,8 +2778,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.AssessmentIdentificationSystemDescriptorAggregate.EdFi.AssessmentIdentificationSystemDescriptor" table="AssessmentIdentificationSystemDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.AssessmentIdentificationSystemDescriptorAggregate.EdFi.AssessmentIdentificationSystemDescriptor" lazy="false" discriminator-value="edfi.AssessmentIdentificationSystemDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AssessmentIdentificationSystemDescriptor" >
           <key>
             <column name="AssessmentIdentificationSystemDescriptorId" />
           </key>
@@ -2768,8 +2794,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.AssessmentItemCategoryDescriptorAggregate.EdFi.AssessmentItemCategoryDescriptor" table="AssessmentItemCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.AssessmentItemCategoryDescriptorAggregate.EdFi.AssessmentItemCategoryDescriptor" lazy="false" discriminator-value="edfi.AssessmentItemCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AssessmentItemCategoryDescriptor" >
           <key>
             <column name="AssessmentItemCategoryDescriptorId" />
           </key>
@@ -2782,8 +2810,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.AssessmentItemResultDescriptorAggregate.EdFi.AssessmentItemResultDescriptor" table="AssessmentItemResultDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.AssessmentItemResultDescriptorAggregate.EdFi.AssessmentItemResultDescriptor" lazy="false" discriminator-value="edfi.AssessmentItemResultDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AssessmentItemResultDescriptor" >
           <key>
             <column name="AssessmentItemResultDescriptorId" />
           </key>
@@ -2796,8 +2826,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.AssessmentPeriodDescriptorAggregate.EdFi.AssessmentPeriodDescriptor" table="AssessmentPeriodDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.AssessmentPeriodDescriptorAggregate.EdFi.AssessmentPeriodDescriptor" lazy="false" discriminator-value="edfi.AssessmentPeriodDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AssessmentPeriodDescriptor" >
           <key>
             <column name="AssessmentPeriodDescriptorId" />
           </key>
@@ -2810,8 +2842,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.AssessmentReportingMethodDescriptorAggregate.EdFi.AssessmentReportingMethodDescriptor" table="AssessmentReportingMethodDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.AssessmentReportingMethodDescriptorAggregate.EdFi.AssessmentReportingMethodDescriptor" lazy="false" discriminator-value="edfi.AssessmentReportingMethodDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AssessmentReportingMethodDescriptor" >
           <key>
             <column name="AssessmentReportingMethodDescriptorId" />
           </key>
@@ -2824,8 +2858,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.AssignmentLateStatusDescriptorAggregate.EdFi.AssignmentLateStatusDescriptor" table="AssignmentLateStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.AssignmentLateStatusDescriptorAggregate.EdFi.AssignmentLateStatusDescriptor" lazy="false" discriminator-value="edfi.AssignmentLateStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AssignmentLateStatusDescriptor" >
           <key>
             <column name="AssignmentLateStatusDescriptorId" />
           </key>
@@ -2838,8 +2874,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.AttemptStatusDescriptorAggregate.EdFi.AttemptStatusDescriptor" table="AttemptStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.AttemptStatusDescriptorAggregate.EdFi.AttemptStatusDescriptor" lazy="false" discriminator-value="edfi.AttemptStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AttemptStatusDescriptor" >
           <key>
             <column name="AttemptStatusDescriptorId" />
           </key>
@@ -2852,8 +2890,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.AttendanceEventCategoryDescriptorAggregate.EdFi.AttendanceEventCategoryDescriptor" table="AttendanceEventCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.AttendanceEventCategoryDescriptorAggregate.EdFi.AttendanceEventCategoryDescriptor" lazy="false" discriminator-value="edfi.AttendanceEventCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AttendanceEventCategoryDescriptor" >
           <key>
             <column name="AttendanceEventCategoryDescriptorId" />
           </key>
@@ -2866,8 +2906,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.BarrierToInternetAccessInResidenceDescriptorAggregate.EdFi.BarrierToInternetAccessInResidenceDescriptor" table="BarrierToInternetAccessInResidenceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.BarrierToInternetAccessInResidenceDescriptorAggregate.EdFi.BarrierToInternetAccessInResidenceDescriptor" lazy="false" discriminator-value="edfi.BarrierToInternetAccessInResidenceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="BarrierToInternetAccessInResidenceDescriptor" >
           <key>
             <column name="BarrierToInternetAccessInResidenceDescriptorId" />
           </key>
@@ -2880,8 +2922,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.BehaviorDescriptorAggregate.EdFi.BehaviorDescriptor" table="BehaviorDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.BehaviorDescriptorAggregate.EdFi.BehaviorDescriptor" lazy="false" discriminator-value="edfi.BehaviorDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="BehaviorDescriptor" >
           <key>
             <column name="BehaviorDescriptorId" />
           </key>
@@ -2894,8 +2938,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CalendarEventDescriptorAggregate.EdFi.CalendarEventDescriptor" table="CalendarEventDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CalendarEventDescriptorAggregate.EdFi.CalendarEventDescriptor" lazy="false" discriminator-value="edfi.CalendarEventDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CalendarEventDescriptor" >
           <key>
             <column name="CalendarEventDescriptorId" />
           </key>
@@ -2908,8 +2954,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CalendarTypeDescriptorAggregate.EdFi.CalendarTypeDescriptor" table="CalendarTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CalendarTypeDescriptorAggregate.EdFi.CalendarTypeDescriptor" lazy="false" discriminator-value="edfi.CalendarTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CalendarTypeDescriptor" >
           <key>
             <column name="CalendarTypeDescriptorId" />
           </key>
@@ -2922,8 +2970,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CareerPathwayDescriptorAggregate.EdFi.CareerPathwayDescriptor" table="CareerPathwayDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CareerPathwayDescriptorAggregate.EdFi.CareerPathwayDescriptor" lazy="false" discriminator-value="edfi.CareerPathwayDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CareerPathwayDescriptor" >
           <key>
             <column name="CareerPathwayDescriptorId" />
           </key>
@@ -2936,8 +2986,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CharterApprovalAgencyTypeDescriptorAggregate.EdFi.CharterApprovalAgencyTypeDescriptor" table="CharterApprovalAgencyTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CharterApprovalAgencyTypeDescriptorAggregate.EdFi.CharterApprovalAgencyTypeDescriptor" lazy="false" discriminator-value="edfi.CharterApprovalAgencyTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CharterApprovalAgencyTypeDescriptor" >
           <key>
             <column name="CharterApprovalAgencyTypeDescriptorId" />
           </key>
@@ -2950,8 +3002,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CharterStatusDescriptorAggregate.EdFi.CharterStatusDescriptor" table="CharterStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CharterStatusDescriptorAggregate.EdFi.CharterStatusDescriptor" lazy="false" discriminator-value="edfi.CharterStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CharterStatusDescriptor" >
           <key>
             <column name="CharterStatusDescriptorId" />
           </key>
@@ -2964,8 +3018,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CitizenshipStatusDescriptorAggregate.EdFi.CitizenshipStatusDescriptor" table="CitizenshipStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CitizenshipStatusDescriptorAggregate.EdFi.CitizenshipStatusDescriptor" lazy="false" discriminator-value="edfi.CitizenshipStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CitizenshipStatusDescriptor" >
           <key>
             <column name="CitizenshipStatusDescriptorId" />
           </key>
@@ -2978,8 +3034,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ClassroomPositionDescriptorAggregate.EdFi.ClassroomPositionDescriptor" table="ClassroomPositionDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ClassroomPositionDescriptorAggregate.EdFi.ClassroomPositionDescriptor" lazy="false" discriminator-value="edfi.ClassroomPositionDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ClassroomPositionDescriptor" >
           <key>
             <column name="ClassroomPositionDescriptorId" />
           </key>
@@ -2992,8 +3050,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CohortScopeDescriptorAggregate.EdFi.CohortScopeDescriptor" table="CohortScopeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CohortScopeDescriptorAggregate.EdFi.CohortScopeDescriptor" lazy="false" discriminator-value="edfi.CohortScopeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CohortScopeDescriptor" >
           <key>
             <column name="CohortScopeDescriptorId" />
           </key>
@@ -3006,8 +3066,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CohortTypeDescriptorAggregate.EdFi.CohortTypeDescriptor" table="CohortTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CohortTypeDescriptorAggregate.EdFi.CohortTypeDescriptor" lazy="false" discriminator-value="edfi.CohortTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CohortTypeDescriptor" >
           <key>
             <column name="CohortTypeDescriptorId" />
           </key>
@@ -3020,8 +3082,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CohortYearTypeDescriptorAggregate.EdFi.CohortYearTypeDescriptor" table="CohortYearTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CohortYearTypeDescriptorAggregate.EdFi.CohortYearTypeDescriptor" lazy="false" discriminator-value="edfi.CohortYearTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CohortYearTypeDescriptor" >
           <key>
             <column name="CohortYearTypeDescriptorId" />
           </key>
@@ -3034,8 +3098,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CompetencyLevelDescriptorAggregate.EdFi.CompetencyLevelDescriptor" table="CompetencyLevelDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CompetencyLevelDescriptorAggregate.EdFi.CompetencyLevelDescriptor" lazy="false" discriminator-value="edfi.CompetencyLevelDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CompetencyLevelDescriptor" >
           <key>
             <column name="CompetencyLevelDescriptorId" />
           </key>
@@ -3048,8 +3114,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ContactTypeDescriptorAggregate.EdFi.ContactTypeDescriptor" table="ContactTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ContactTypeDescriptorAggregate.EdFi.ContactTypeDescriptor" lazy="false" discriminator-value="edfi.ContactTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ContactTypeDescriptor" >
           <key>
             <column name="ContactTypeDescriptorId" />
           </key>
@@ -3062,8 +3130,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ContentClassDescriptorAggregate.EdFi.ContentClassDescriptor" table="ContentClassDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ContentClassDescriptorAggregate.EdFi.ContentClassDescriptor" lazy="false" discriminator-value="edfi.ContentClassDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ContentClassDescriptor" >
           <key>
             <column name="ContentClassDescriptorId" />
           </key>
@@ -3076,8 +3146,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ContinuationOfServicesReasonDescriptorAggregate.EdFi.ContinuationOfServicesReasonDescriptor" table="ContinuationOfServicesReasonDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ContinuationOfServicesReasonDescriptorAggregate.EdFi.ContinuationOfServicesReasonDescriptor" lazy="false" discriminator-value="edfi.ContinuationOfServicesReasonDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ContinuationOfServicesReasonDescriptor" >
           <key>
             <column name="ContinuationOfServicesReasonDescriptorId" />
           </key>
@@ -3090,8 +3162,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CostRateDescriptorAggregate.EdFi.CostRateDescriptor" table="CostRateDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CostRateDescriptorAggregate.EdFi.CostRateDescriptor" lazy="false" discriminator-value="edfi.CostRateDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CostRateDescriptor" >
           <key>
             <column name="CostRateDescriptorId" />
           </key>
@@ -3104,8 +3178,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CountryDescriptorAggregate.EdFi.CountryDescriptor" table="CountryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CountryDescriptorAggregate.EdFi.CountryDescriptor" lazy="false" discriminator-value="edfi.CountryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CountryDescriptor" >
           <key>
             <column name="CountryDescriptorId" />
           </key>
@@ -3118,8 +3194,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CourseAttemptResultDescriptorAggregate.EdFi.CourseAttemptResultDescriptor" table="CourseAttemptResultDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CourseAttemptResultDescriptorAggregate.EdFi.CourseAttemptResultDescriptor" lazy="false" discriminator-value="edfi.CourseAttemptResultDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CourseAttemptResultDescriptor" >
           <key>
             <column name="CourseAttemptResultDescriptorId" />
           </key>
@@ -3132,8 +3210,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CourseDefinedByDescriptorAggregate.EdFi.CourseDefinedByDescriptor" table="CourseDefinedByDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CourseDefinedByDescriptorAggregate.EdFi.CourseDefinedByDescriptor" lazy="false" discriminator-value="edfi.CourseDefinedByDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CourseDefinedByDescriptor" >
           <key>
             <column name="CourseDefinedByDescriptorId" />
           </key>
@@ -3146,8 +3226,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CourseGPAApplicabilityDescriptorAggregate.EdFi.CourseGPAApplicabilityDescriptor" table="CourseGPAApplicabilityDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CourseGPAApplicabilityDescriptorAggregate.EdFi.CourseGPAApplicabilityDescriptor" lazy="false" discriminator-value="edfi.CourseGPAApplicabilityDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CourseGPAApplicabilityDescriptor" >
           <key>
             <column name="CourseGPAApplicabilityDescriptorId" />
           </key>
@@ -3160,8 +3242,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CourseIdentificationSystemDescriptorAggregate.EdFi.CourseIdentificationSystemDescriptor" table="CourseIdentificationSystemDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CourseIdentificationSystemDescriptorAggregate.EdFi.CourseIdentificationSystemDescriptor" lazy="false" discriminator-value="edfi.CourseIdentificationSystemDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CourseIdentificationSystemDescriptor" >
           <key>
             <column name="CourseIdentificationSystemDescriptorId" />
           </key>
@@ -3174,8 +3258,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CourseLevelCharacteristicDescriptorAggregate.EdFi.CourseLevelCharacteristicDescriptor" table="CourseLevelCharacteristicDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CourseLevelCharacteristicDescriptorAggregate.EdFi.CourseLevelCharacteristicDescriptor" lazy="false" discriminator-value="edfi.CourseLevelCharacteristicDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CourseLevelCharacteristicDescriptor" >
           <key>
             <column name="CourseLevelCharacteristicDescriptorId" />
           </key>
@@ -3188,8 +3274,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CourseRepeatCodeDescriptorAggregate.EdFi.CourseRepeatCodeDescriptor" table="CourseRepeatCodeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CourseRepeatCodeDescriptorAggregate.EdFi.CourseRepeatCodeDescriptor" lazy="false" discriminator-value="edfi.CourseRepeatCodeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CourseRepeatCodeDescriptor" >
           <key>
             <column name="CourseRepeatCodeDescriptorId" />
           </key>
@@ -3202,8 +3290,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CredentialFieldDescriptorAggregate.EdFi.CredentialFieldDescriptor" table="CredentialFieldDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CredentialFieldDescriptorAggregate.EdFi.CredentialFieldDescriptor" lazy="false" discriminator-value="edfi.CredentialFieldDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CredentialFieldDescriptor" >
           <key>
             <column name="CredentialFieldDescriptorId" />
           </key>
@@ -3216,8 +3306,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CredentialTypeDescriptorAggregate.EdFi.CredentialTypeDescriptor" table="CredentialTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CredentialTypeDescriptorAggregate.EdFi.CredentialTypeDescriptor" lazy="false" discriminator-value="edfi.CredentialTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CredentialTypeDescriptor" >
           <key>
             <column name="CredentialTypeDescriptorId" />
           </key>
@@ -3230,8 +3322,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CreditCategoryDescriptorAggregate.EdFi.CreditCategoryDescriptor" table="CreditCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CreditCategoryDescriptorAggregate.EdFi.CreditCategoryDescriptor" lazy="false" discriminator-value="edfi.CreditCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CreditCategoryDescriptor" >
           <key>
             <column name="CreditCategoryDescriptorId" />
           </key>
@@ -3244,8 +3338,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CreditTypeDescriptorAggregate.EdFi.CreditTypeDescriptor" table="CreditTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CreditTypeDescriptorAggregate.EdFi.CreditTypeDescriptor" lazy="false" discriminator-value="edfi.CreditTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CreditTypeDescriptor" >
           <key>
             <column name="CreditTypeDescriptorId" />
           </key>
@@ -3258,8 +3354,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CTEProgramServiceDescriptorAggregate.EdFi.CTEProgramServiceDescriptor" table="CTEProgramServiceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CTEProgramServiceDescriptorAggregate.EdFi.CTEProgramServiceDescriptor" lazy="false" discriminator-value="edfi.CTEProgramServiceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CTEProgramServiceDescriptor" >
           <key>
             <column name="CTEProgramServiceDescriptorId" />
           </key>
@@ -3272,8 +3370,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CurriculumUsedDescriptorAggregate.EdFi.CurriculumUsedDescriptor" table="CurriculumUsedDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CurriculumUsedDescriptorAggregate.EdFi.CurriculumUsedDescriptor" lazy="false" discriminator-value="edfi.CurriculumUsedDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CurriculumUsedDescriptor" >
           <key>
             <column name="CurriculumUsedDescriptorId" />
           </key>
@@ -3286,8 +3386,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.DeliveryMethodDescriptorAggregate.EdFi.DeliveryMethodDescriptor" table="DeliveryMethodDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.DeliveryMethodDescriptorAggregate.EdFi.DeliveryMethodDescriptor" lazy="false" discriminator-value="edfi.DeliveryMethodDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="DeliveryMethodDescriptor" >
           <key>
             <column name="DeliveryMethodDescriptorId" />
           </key>
@@ -3300,8 +3402,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.DiagnosisDescriptorAggregate.EdFi.DiagnosisDescriptor" table="DiagnosisDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.DiagnosisDescriptorAggregate.EdFi.DiagnosisDescriptor" lazy="false" discriminator-value="edfi.DiagnosisDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="DiagnosisDescriptor" >
           <key>
             <column name="DiagnosisDescriptorId" />
           </key>
@@ -3314,8 +3418,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.DiplomaLevelDescriptorAggregate.EdFi.DiplomaLevelDescriptor" table="DiplomaLevelDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.DiplomaLevelDescriptorAggregate.EdFi.DiplomaLevelDescriptor" lazy="false" discriminator-value="edfi.DiplomaLevelDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="DiplomaLevelDescriptor" >
           <key>
             <column name="DiplomaLevelDescriptorId" />
           </key>
@@ -3328,8 +3434,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.DiplomaTypeDescriptorAggregate.EdFi.DiplomaTypeDescriptor" table="DiplomaTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.DiplomaTypeDescriptorAggregate.EdFi.DiplomaTypeDescriptor" lazy="false" discriminator-value="edfi.DiplomaTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="DiplomaTypeDescriptor" >
           <key>
             <column name="DiplomaTypeDescriptorId" />
           </key>
@@ -3342,8 +3450,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.DisabilityDescriptorAggregate.EdFi.DisabilityDescriptor" table="DisabilityDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.DisabilityDescriptorAggregate.EdFi.DisabilityDescriptor" lazy="false" discriminator-value="edfi.DisabilityDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="DisabilityDescriptor" >
           <key>
             <column name="DisabilityDescriptorId" />
           </key>
@@ -3356,8 +3466,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.DisabilityDesignationDescriptorAggregate.EdFi.DisabilityDesignationDescriptor" table="DisabilityDesignationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.DisabilityDesignationDescriptorAggregate.EdFi.DisabilityDesignationDescriptor" lazy="false" discriminator-value="edfi.DisabilityDesignationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="DisabilityDesignationDescriptor" >
           <key>
             <column name="DisabilityDesignationDescriptorId" />
           </key>
@@ -3370,8 +3482,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.DisabilityDeterminationSourceTypeDescriptorAggregate.EdFi.DisabilityDeterminationSourceTypeDescriptor" table="DisabilityDeterminationSourceTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.DisabilityDeterminationSourceTypeDescriptorAggregate.EdFi.DisabilityDeterminationSourceTypeDescriptor" lazy="false" discriminator-value="edfi.DisabilityDeterminationSourceTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="DisabilityDeterminationSourceTypeDescriptor" >
           <key>
             <column name="DisabilityDeterminationSourceTypeDescriptorId" />
           </key>
@@ -3384,8 +3498,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.DisciplineActionLengthDifferenceReasonDescriptorAggregate.EdFi.DisciplineActionLengthDifferenceReasonDescriptor" table="DisciplineActionLengthDifferenceReasonDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.DisciplineActionLengthDifferenceReasonDescriptorAggregate.EdFi.DisciplineActionLengthDifferenceReasonDescriptor" lazy="false" discriminator-value="edfi.DisciplineActionLengthDifferenceReasonDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="DisciplineActionLengthDifferenceReasonDescriptor" >
           <key>
             <column name="DisciplineActionLengthDifferenceReasonDescriptorId" />
           </key>
@@ -3398,8 +3514,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.DisciplineDescriptorAggregate.EdFi.DisciplineDescriptor" table="DisciplineDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.DisciplineDescriptorAggregate.EdFi.DisciplineDescriptor" lazy="false" discriminator-value="edfi.DisciplineDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="DisciplineDescriptor" >
           <key>
             <column name="DisciplineDescriptorId" />
           </key>
@@ -3412,8 +3530,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.DisciplineIncidentParticipationCodeDescriptorAggregate.EdFi.DisciplineIncidentParticipationCodeDescriptor" table="DisciplineIncidentParticipationCodeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.DisciplineIncidentParticipationCodeDescriptorAggregate.EdFi.DisciplineIncidentParticipationCodeDescriptor" lazy="false" discriminator-value="edfi.DisciplineIncidentParticipationCodeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="DisciplineIncidentParticipationCodeDescriptor" >
           <key>
             <column name="DisciplineIncidentParticipationCodeDescriptorId" />
           </key>
@@ -3426,8 +3546,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.EducationalEnvironmentDescriptorAggregate.EdFi.EducationalEnvironmentDescriptor" table="EducationalEnvironmentDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.EducationalEnvironmentDescriptorAggregate.EdFi.EducationalEnvironmentDescriptor" lazy="false" discriminator-value="edfi.EducationalEnvironmentDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="EducationalEnvironmentDescriptor" >
           <key>
             <column name="EducationalEnvironmentDescriptorId" />
           </key>
@@ -3440,8 +3562,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.EducationOrganizationAssociationTypeDescriptorAggregate.EdFi.EducationOrganizationAssociationTypeDescriptor" table="EducationOrganizationAssociationTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.EducationOrganizationAssociationTypeDescriptorAggregate.EdFi.EducationOrganizationAssociationTypeDescriptor" lazy="false" discriminator-value="edfi.EducationOrganizationAssociationTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="EducationOrganizationAssociationTypeDescriptor" >
           <key>
             <column name="EducationOrganizationAssociationTypeDescriptorId" />
           </key>
@@ -3454,8 +3578,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.EducationOrganizationCategoryDescriptorAggregate.EdFi.EducationOrganizationCategoryDescriptor" table="EducationOrganizationCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.EducationOrganizationCategoryDescriptorAggregate.EdFi.EducationOrganizationCategoryDescriptor" lazy="false" discriminator-value="edfi.EducationOrganizationCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="EducationOrganizationCategoryDescriptor" >
           <key>
             <column name="EducationOrganizationCategoryDescriptorId" />
           </key>
@@ -3468,8 +3594,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.EducationOrganizationIdentificationSystemDescriptorAggregate.EdFi.EducationOrganizationIdentificationSystemDescriptor" table="EducationOrganizationIdentificationSystemDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.EducationOrganizationIdentificationSystemDescriptorAggregate.EdFi.EducationOrganizationIdentificationSystemDescriptor" lazy="false" discriminator-value="edfi.EducationOrganizationIdentificationSystemDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="EducationOrganizationIdentificationSystemDescriptor" >
           <key>
             <column name="EducationOrganizationIdentificationSystemDescriptorId" />
           </key>
@@ -3482,8 +3610,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.EducationPlanDescriptorAggregate.EdFi.EducationPlanDescriptor" table="EducationPlanDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.EducationPlanDescriptorAggregate.EdFi.EducationPlanDescriptor" lazy="false" discriminator-value="edfi.EducationPlanDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="EducationPlanDescriptor" >
           <key>
             <column name="EducationPlanDescriptorId" />
           </key>
@@ -3496,8 +3626,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ElectronicMailTypeDescriptorAggregate.EdFi.ElectronicMailTypeDescriptor" table="ElectronicMailTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ElectronicMailTypeDescriptorAggregate.EdFi.ElectronicMailTypeDescriptor" lazy="false" discriminator-value="edfi.ElectronicMailTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ElectronicMailTypeDescriptor" >
           <key>
             <column name="ElectronicMailTypeDescriptorId" />
           </key>
@@ -3510,8 +3642,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.EmploymentStatusDescriptorAggregate.EdFi.EmploymentStatusDescriptor" table="EmploymentStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.EmploymentStatusDescriptorAggregate.EdFi.EmploymentStatusDescriptor" lazy="false" discriminator-value="edfi.EmploymentStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="EmploymentStatusDescriptor" >
           <key>
             <column name="EmploymentStatusDescriptorId" />
           </key>
@@ -3524,8 +3658,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.EntryGradeLevelReasonDescriptorAggregate.EdFi.EntryGradeLevelReasonDescriptor" table="EntryGradeLevelReasonDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.EntryGradeLevelReasonDescriptorAggregate.EdFi.EntryGradeLevelReasonDescriptor" lazy="false" discriminator-value="edfi.EntryGradeLevelReasonDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="EntryGradeLevelReasonDescriptor" >
           <key>
             <column name="EntryGradeLevelReasonDescriptorId" />
           </key>
@@ -3538,8 +3674,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.EntryTypeDescriptorAggregate.EdFi.EntryTypeDescriptor" table="EntryTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.EntryTypeDescriptorAggregate.EdFi.EntryTypeDescriptor" lazy="false" discriminator-value="edfi.EntryTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="EntryTypeDescriptor" >
           <key>
             <column name="EntryTypeDescriptorId" />
           </key>
@@ -3552,8 +3690,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.EventCircumstanceDescriptorAggregate.EdFi.EventCircumstanceDescriptor" table="EventCircumstanceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.EventCircumstanceDescriptorAggregate.EdFi.EventCircumstanceDescriptor" lazy="false" discriminator-value="edfi.EventCircumstanceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="EventCircumstanceDescriptor" >
           <key>
             <column name="EventCircumstanceDescriptorId" />
           </key>
@@ -3566,8 +3706,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ExitWithdrawTypeDescriptorAggregate.EdFi.ExitWithdrawTypeDescriptor" table="ExitWithdrawTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ExitWithdrawTypeDescriptorAggregate.EdFi.ExitWithdrawTypeDescriptor" lazy="false" discriminator-value="edfi.ExitWithdrawTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ExitWithdrawTypeDescriptor" >
           <key>
             <column name="ExitWithdrawTypeDescriptorId" />
           </key>
@@ -3580,8 +3722,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.FinancialCollectionDescriptorAggregate.EdFi.FinancialCollectionDescriptor" table="FinancialCollectionDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.FinancialCollectionDescriptorAggregate.EdFi.FinancialCollectionDescriptor" lazy="false" discriminator-value="edfi.FinancialCollectionDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="FinancialCollectionDescriptor" >
           <key>
             <column name="FinancialCollectionDescriptorId" />
           </key>
@@ -3594,8 +3738,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.GradebookEntryTypeDescriptorAggregate.EdFi.GradebookEntryTypeDescriptor" table="GradebookEntryTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.GradebookEntryTypeDescriptorAggregate.EdFi.GradebookEntryTypeDescriptor" lazy="false" discriminator-value="edfi.GradebookEntryTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="GradebookEntryTypeDescriptor" >
           <key>
             <column name="GradebookEntryTypeDescriptorId" />
           </key>
@@ -3608,8 +3754,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.GradeLevelDescriptorAggregate.EdFi.GradeLevelDescriptor" table="GradeLevelDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.GradeLevelDescriptorAggregate.EdFi.GradeLevelDescriptor" lazy="false" discriminator-value="edfi.GradeLevelDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="GradeLevelDescriptor" >
           <key>
             <column name="GradeLevelDescriptorId" />
           </key>
@@ -3622,8 +3770,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.GradePointAverageTypeDescriptorAggregate.EdFi.GradePointAverageTypeDescriptor" table="GradePointAverageTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.GradePointAverageTypeDescriptorAggregate.EdFi.GradePointAverageTypeDescriptor" lazy="false" discriminator-value="edfi.GradePointAverageTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="GradePointAverageTypeDescriptor" >
           <key>
             <column name="GradePointAverageTypeDescriptorId" />
           </key>
@@ -3636,8 +3786,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.GradeTypeDescriptorAggregate.EdFi.GradeTypeDescriptor" table="GradeTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.GradeTypeDescriptorAggregate.EdFi.GradeTypeDescriptor" lazy="false" discriminator-value="edfi.GradeTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="GradeTypeDescriptor" >
           <key>
             <column name="GradeTypeDescriptorId" />
           </key>
@@ -3650,8 +3802,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.GradingPeriodDescriptorAggregate.EdFi.GradingPeriodDescriptor" table="GradingPeriodDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.GradingPeriodDescriptorAggregate.EdFi.GradingPeriodDescriptor" lazy="false" discriminator-value="edfi.GradingPeriodDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="GradingPeriodDescriptor" >
           <key>
             <column name="GradingPeriodDescriptorId" />
           </key>
@@ -3664,8 +3818,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.GraduationPlanTypeDescriptorAggregate.EdFi.GraduationPlanTypeDescriptor" table="GraduationPlanTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.GraduationPlanTypeDescriptorAggregate.EdFi.GraduationPlanTypeDescriptor" lazy="false" discriminator-value="edfi.GraduationPlanTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="GraduationPlanTypeDescriptor" >
           <key>
             <column name="GraduationPlanTypeDescriptorId" />
           </key>
@@ -3678,8 +3834,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.GunFreeSchoolsActReportingStatusDescriptorAggregate.EdFi.GunFreeSchoolsActReportingStatusDescriptor" table="GunFreeSchoolsActReportingStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.GunFreeSchoolsActReportingStatusDescriptorAggregate.EdFi.GunFreeSchoolsActReportingStatusDescriptor" lazy="false" discriminator-value="edfi.GunFreeSchoolsActReportingStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="GunFreeSchoolsActReportingStatusDescriptor" >
           <key>
             <column name="GunFreeSchoolsActReportingStatusDescriptorId" />
           </key>
@@ -3692,8 +3850,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.HomelessPrimaryNighttimeResidenceDescriptorAggregate.EdFi.HomelessPrimaryNighttimeResidenceDescriptor" table="HomelessPrimaryNighttimeResidenceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.HomelessPrimaryNighttimeResidenceDescriptorAggregate.EdFi.HomelessPrimaryNighttimeResidenceDescriptor" lazy="false" discriminator-value="edfi.HomelessPrimaryNighttimeResidenceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="HomelessPrimaryNighttimeResidenceDescriptor" >
           <key>
             <column name="HomelessPrimaryNighttimeResidenceDescriptorId" />
           </key>
@@ -3706,8 +3866,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.HomelessProgramServiceDescriptorAggregate.EdFi.HomelessProgramServiceDescriptor" table="HomelessProgramServiceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.HomelessProgramServiceDescriptorAggregate.EdFi.HomelessProgramServiceDescriptor" lazy="false" discriminator-value="edfi.HomelessProgramServiceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="HomelessProgramServiceDescriptor" >
           <key>
             <column name="HomelessProgramServiceDescriptorId" />
           </key>
@@ -3720,8 +3882,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.IdentificationDocumentUseDescriptorAggregate.EdFi.IdentificationDocumentUseDescriptor" table="IdentificationDocumentUseDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.IdentificationDocumentUseDescriptorAggregate.EdFi.IdentificationDocumentUseDescriptor" lazy="false" discriminator-value="edfi.IdentificationDocumentUseDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="IdentificationDocumentUseDescriptor" >
           <key>
             <column name="IdentificationDocumentUseDescriptorId" />
           </key>
@@ -3734,8 +3898,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.IncidentLocationDescriptorAggregate.EdFi.IncidentLocationDescriptor" table="IncidentLocationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.IncidentLocationDescriptorAggregate.EdFi.IncidentLocationDescriptor" lazy="false" discriminator-value="edfi.IncidentLocationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="IncidentLocationDescriptor" >
           <key>
             <column name="IncidentLocationDescriptorId" />
           </key>
@@ -3748,8 +3914,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.IndicatorDescriptorAggregate.EdFi.IndicatorDescriptor" table="IndicatorDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.IndicatorDescriptorAggregate.EdFi.IndicatorDescriptor" lazy="false" discriminator-value="edfi.IndicatorDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="IndicatorDescriptor" >
           <key>
             <column name="IndicatorDescriptorId" />
           </key>
@@ -3762,8 +3930,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.IndicatorGroupDescriptorAggregate.EdFi.IndicatorGroupDescriptor" table="IndicatorGroupDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.IndicatorGroupDescriptorAggregate.EdFi.IndicatorGroupDescriptor" lazy="false" discriminator-value="edfi.IndicatorGroupDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="IndicatorGroupDescriptor" >
           <key>
             <column name="IndicatorGroupDescriptorId" />
           </key>
@@ -3776,8 +3946,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.IndicatorLevelDescriptorAggregate.EdFi.IndicatorLevelDescriptor" table="IndicatorLevelDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.IndicatorLevelDescriptorAggregate.EdFi.IndicatorLevelDescriptor" lazy="false" discriminator-value="edfi.IndicatorLevelDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="IndicatorLevelDescriptor" >
           <key>
             <column name="IndicatorLevelDescriptorId" />
           </key>
@@ -3790,8 +3962,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.InstitutionTelephoneNumberTypeDescriptorAggregate.EdFi.InstitutionTelephoneNumberTypeDescriptor" table="InstitutionTelephoneNumberTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.InstitutionTelephoneNumberTypeDescriptorAggregate.EdFi.InstitutionTelephoneNumberTypeDescriptor" lazy="false" discriminator-value="edfi.InstitutionTelephoneNumberTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="InstitutionTelephoneNumberTypeDescriptor" >
           <key>
             <column name="InstitutionTelephoneNumberTypeDescriptorId" />
           </key>
@@ -3804,8 +3978,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.InteractivityStyleDescriptorAggregate.EdFi.InteractivityStyleDescriptor" table="InteractivityStyleDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.InteractivityStyleDescriptorAggregate.EdFi.InteractivityStyleDescriptor" lazy="false" discriminator-value="edfi.InteractivityStyleDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="InteractivityStyleDescriptor" >
           <key>
             <column name="InteractivityStyleDescriptorId" />
           </key>
@@ -3818,8 +3994,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.InternetAccessDescriptorAggregate.EdFi.InternetAccessDescriptor" table="InternetAccessDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.InternetAccessDescriptorAggregate.EdFi.InternetAccessDescriptor" lazy="false" discriminator-value="edfi.InternetAccessDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="InternetAccessDescriptor" >
           <key>
             <column name="InternetAccessDescriptorId" />
           </key>
@@ -3832,8 +4010,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.InternetAccessTypeInResidenceDescriptorAggregate.EdFi.InternetAccessTypeInResidenceDescriptor" table="InternetAccessTypeInResidenceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.InternetAccessTypeInResidenceDescriptorAggregate.EdFi.InternetAccessTypeInResidenceDescriptor" lazy="false" discriminator-value="edfi.InternetAccessTypeInResidenceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="InternetAccessTypeInResidenceDescriptor" >
           <key>
             <column name="InternetAccessTypeInResidenceDescriptorId" />
           </key>
@@ -3846,8 +4026,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.InternetPerformanceInResidenceDescriptorAggregate.EdFi.InternetPerformanceInResidenceDescriptor" table="InternetPerformanceInResidenceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.InternetPerformanceInResidenceDescriptorAggregate.EdFi.InternetPerformanceInResidenceDescriptor" lazy="false" discriminator-value="edfi.InternetPerformanceInResidenceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="InternetPerformanceInResidenceDescriptor" >
           <key>
             <column name="InternetPerformanceInResidenceDescriptorId" />
           </key>
@@ -3860,8 +4042,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.InterventionClassDescriptorAggregate.EdFi.InterventionClassDescriptor" table="InterventionClassDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.InterventionClassDescriptorAggregate.EdFi.InterventionClassDescriptor" lazy="false" discriminator-value="edfi.InterventionClassDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="InterventionClassDescriptor" >
           <key>
             <column name="InterventionClassDescriptorId" />
           </key>
@@ -3874,8 +4058,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.InterventionEffectivenessRatingDescriptorAggregate.EdFi.InterventionEffectivenessRatingDescriptor" table="InterventionEffectivenessRatingDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.InterventionEffectivenessRatingDescriptorAggregate.EdFi.InterventionEffectivenessRatingDescriptor" lazy="false" discriminator-value="edfi.InterventionEffectivenessRatingDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="InterventionEffectivenessRatingDescriptor" >
           <key>
             <column name="InterventionEffectivenessRatingDescriptorId" />
           </key>
@@ -3888,8 +4074,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.LanguageDescriptorAggregate.EdFi.LanguageDescriptor" table="LanguageDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.LanguageDescriptorAggregate.EdFi.LanguageDescriptor" lazy="false" discriminator-value="edfi.LanguageDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LanguageDescriptor" >
           <key>
             <column name="LanguageDescriptorId" />
           </key>
@@ -3902,8 +4090,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.LanguageInstructionProgramServiceDescriptorAggregate.EdFi.LanguageInstructionProgramServiceDescriptor" table="LanguageInstructionProgramServiceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.LanguageInstructionProgramServiceDescriptorAggregate.EdFi.LanguageInstructionProgramServiceDescriptor" lazy="false" discriminator-value="edfi.LanguageInstructionProgramServiceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LanguageInstructionProgramServiceDescriptor" >
           <key>
             <column name="LanguageInstructionProgramServiceDescriptorId" />
           </key>
@@ -3916,8 +4106,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.LanguageUseDescriptorAggregate.EdFi.LanguageUseDescriptor" table="LanguageUseDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.LanguageUseDescriptorAggregate.EdFi.LanguageUseDescriptor" lazy="false" discriminator-value="edfi.LanguageUseDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LanguageUseDescriptor" >
           <key>
             <column name="LanguageUseDescriptorId" />
           </key>
@@ -3930,8 +4122,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.LearningStandardCategoryDescriptorAggregate.EdFi.LearningStandardCategoryDescriptor" table="LearningStandardCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.LearningStandardCategoryDescriptorAggregate.EdFi.LearningStandardCategoryDescriptor" lazy="false" discriminator-value="edfi.LearningStandardCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LearningStandardCategoryDescriptor" >
           <key>
             <column name="LearningStandardCategoryDescriptorId" />
           </key>
@@ -3944,8 +4138,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.LearningStandardEquivalenceStrengthDescriptorAggregate.EdFi.LearningStandardEquivalenceStrengthDescriptor" table="LearningStandardEquivalenceStrengthDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.LearningStandardEquivalenceStrengthDescriptorAggregate.EdFi.LearningStandardEquivalenceStrengthDescriptor" lazy="false" discriminator-value="edfi.LearningStandardEquivalenceStrengthDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LearningStandardEquivalenceStrengthDescriptor" >
           <key>
             <column name="LearningStandardEquivalenceStrengthDescriptorId" />
           </key>
@@ -3958,8 +4154,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.LearningStandardScopeDescriptorAggregate.EdFi.LearningStandardScopeDescriptor" table="LearningStandardScopeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.LearningStandardScopeDescriptorAggregate.EdFi.LearningStandardScopeDescriptor" lazy="false" discriminator-value="edfi.LearningStandardScopeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LearningStandardScopeDescriptor" >
           <key>
             <column name="LearningStandardScopeDescriptorId" />
           </key>
@@ -3972,8 +4170,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.LevelOfEducationDescriptorAggregate.EdFi.LevelOfEducationDescriptor" table="LevelOfEducationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.LevelOfEducationDescriptorAggregate.EdFi.LevelOfEducationDescriptor" lazy="false" discriminator-value="edfi.LevelOfEducationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LevelOfEducationDescriptor" >
           <key>
             <column name="LevelOfEducationDescriptorId" />
           </key>
@@ -3986,8 +4186,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.LicenseStatusDescriptorAggregate.EdFi.LicenseStatusDescriptor" table="LicenseStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.LicenseStatusDescriptorAggregate.EdFi.LicenseStatusDescriptor" lazy="false" discriminator-value="edfi.LicenseStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LicenseStatusDescriptor" >
           <key>
             <column name="LicenseStatusDescriptorId" />
           </key>
@@ -4000,8 +4202,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.LicenseTypeDescriptorAggregate.EdFi.LicenseTypeDescriptor" table="LicenseTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.LicenseTypeDescriptorAggregate.EdFi.LicenseTypeDescriptor" lazy="false" discriminator-value="edfi.LicenseTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LicenseTypeDescriptor" >
           <key>
             <column name="LicenseTypeDescriptorId" />
           </key>
@@ -4014,8 +4218,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.LimitedEnglishProficiencyDescriptorAggregate.EdFi.LimitedEnglishProficiencyDescriptor" table="LimitedEnglishProficiencyDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.LimitedEnglishProficiencyDescriptorAggregate.EdFi.LimitedEnglishProficiencyDescriptor" lazy="false" discriminator-value="edfi.LimitedEnglishProficiencyDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LimitedEnglishProficiencyDescriptor" >
           <key>
             <column name="LimitedEnglishProficiencyDescriptorId" />
           </key>
@@ -4028,8 +4234,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.LocaleDescriptorAggregate.EdFi.LocaleDescriptor" table="LocaleDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.LocaleDescriptorAggregate.EdFi.LocaleDescriptor" lazy="false" discriminator-value="edfi.LocaleDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LocaleDescriptor" >
           <key>
             <column name="LocaleDescriptorId" />
           </key>
@@ -4042,8 +4250,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.LocalEducationAgencyCategoryDescriptorAggregate.EdFi.LocalEducationAgencyCategoryDescriptor" table="LocalEducationAgencyCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.LocalEducationAgencyCategoryDescriptorAggregate.EdFi.LocalEducationAgencyCategoryDescriptor" lazy="false" discriminator-value="edfi.LocalEducationAgencyCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LocalEducationAgencyCategoryDescriptor" >
           <key>
             <column name="LocalEducationAgencyCategoryDescriptorId" />
           </key>
@@ -4056,8 +4266,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.MagnetSpecialProgramEmphasisSchoolDescriptorAggregate.EdFi.MagnetSpecialProgramEmphasisSchoolDescriptor" table="MagnetSpecialProgramEmphasisSchoolDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.MagnetSpecialProgramEmphasisSchoolDescriptorAggregate.EdFi.MagnetSpecialProgramEmphasisSchoolDescriptor" lazy="false" discriminator-value="edfi.MagnetSpecialProgramEmphasisSchoolDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="MagnetSpecialProgramEmphasisSchoolDescriptor" >
           <key>
             <column name="MagnetSpecialProgramEmphasisSchoolDescriptorId" />
           </key>
@@ -4070,8 +4282,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.MediumOfInstructionDescriptorAggregate.EdFi.MediumOfInstructionDescriptor" table="MediumOfInstructionDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.MediumOfInstructionDescriptorAggregate.EdFi.MediumOfInstructionDescriptor" lazy="false" discriminator-value="edfi.MediumOfInstructionDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="MediumOfInstructionDescriptor" >
           <key>
             <column name="MediumOfInstructionDescriptorId" />
           </key>
@@ -4084,8 +4298,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.MethodCreditEarnedDescriptorAggregate.EdFi.MethodCreditEarnedDescriptor" table="MethodCreditEarnedDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.MethodCreditEarnedDescriptorAggregate.EdFi.MethodCreditEarnedDescriptor" lazy="false" discriminator-value="edfi.MethodCreditEarnedDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="MethodCreditEarnedDescriptor" >
           <key>
             <column name="MethodCreditEarnedDescriptorId" />
           </key>
@@ -4098,8 +4314,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.MigrantEducationProgramServiceDescriptorAggregate.EdFi.MigrantEducationProgramServiceDescriptor" table="MigrantEducationProgramServiceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.MigrantEducationProgramServiceDescriptorAggregate.EdFi.MigrantEducationProgramServiceDescriptor" lazy="false" discriminator-value="edfi.MigrantEducationProgramServiceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="MigrantEducationProgramServiceDescriptor" >
           <key>
             <column name="MigrantEducationProgramServiceDescriptorId" />
           </key>
@@ -4112,8 +4330,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ModelEntityDescriptorAggregate.EdFi.ModelEntityDescriptor" table="ModelEntityDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ModelEntityDescriptorAggregate.EdFi.ModelEntityDescriptor" lazy="false" discriminator-value="edfi.ModelEntityDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ModelEntityDescriptor" >
           <key>
             <column name="ModelEntityDescriptorId" />
           </key>
@@ -4126,8 +4346,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.MonitoredDescriptorAggregate.EdFi.MonitoredDescriptor" table="MonitoredDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.MonitoredDescriptorAggregate.EdFi.MonitoredDescriptor" lazy="false" discriminator-value="edfi.MonitoredDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="MonitoredDescriptor" >
           <key>
             <column name="MonitoredDescriptorId" />
           </key>
@@ -4140,8 +4362,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.NeglectedOrDelinquentProgramDescriptorAggregate.EdFi.NeglectedOrDelinquentProgramDescriptor" table="NeglectedOrDelinquentProgramDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.NeglectedOrDelinquentProgramDescriptorAggregate.EdFi.NeglectedOrDelinquentProgramDescriptor" lazy="false" discriminator-value="edfi.NeglectedOrDelinquentProgramDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="NeglectedOrDelinquentProgramDescriptor" >
           <key>
             <column name="NeglectedOrDelinquentProgramDescriptorId" />
           </key>
@@ -4154,8 +4378,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.NeglectedOrDelinquentProgramServiceDescriptorAggregate.EdFi.NeglectedOrDelinquentProgramServiceDescriptor" table="NeglectedOrDelinquentProgramServiceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.NeglectedOrDelinquentProgramServiceDescriptorAggregate.EdFi.NeglectedOrDelinquentProgramServiceDescriptor" lazy="false" discriminator-value="edfi.NeglectedOrDelinquentProgramServiceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="NeglectedOrDelinquentProgramServiceDescriptor" >
           <key>
             <column name="NeglectedOrDelinquentProgramServiceDescriptorId" />
           </key>
@@ -4168,8 +4394,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.NetworkPurposeDescriptorAggregate.EdFi.NetworkPurposeDescriptor" table="NetworkPurposeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.NetworkPurposeDescriptorAggregate.EdFi.NetworkPurposeDescriptor" lazy="false" discriminator-value="edfi.NetworkPurposeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="NetworkPurposeDescriptor" >
           <key>
             <column name="NetworkPurposeDescriptorId" />
           </key>
@@ -4182,8 +4410,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.OldEthnicityDescriptorAggregate.EdFi.OldEthnicityDescriptor" table="OldEthnicityDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.OldEthnicityDescriptorAggregate.EdFi.OldEthnicityDescriptor" lazy="false" discriminator-value="edfi.OldEthnicityDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="OldEthnicityDescriptor" >
           <key>
             <column name="OldEthnicityDescriptorId" />
           </key>
@@ -4196,8 +4426,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.OperationalStatusDescriptorAggregate.EdFi.OperationalStatusDescriptor" table="OperationalStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.OperationalStatusDescriptorAggregate.EdFi.OperationalStatusDescriptor" lazy="false" discriminator-value="edfi.OperationalStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="OperationalStatusDescriptor" >
           <key>
             <column name="OperationalStatusDescriptorId" />
           </key>
@@ -4210,8 +4442,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.OtherNameTypeDescriptorAggregate.EdFi.OtherNameTypeDescriptor" table="OtherNameTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.OtherNameTypeDescriptorAggregate.EdFi.OtherNameTypeDescriptor" lazy="false" discriminator-value="edfi.OtherNameTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="OtherNameTypeDescriptor" >
           <key>
             <column name="OtherNameTypeDescriptorId" />
           </key>
@@ -4224,8 +4458,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ParticipationDescriptorAggregate.EdFi.ParticipationDescriptor" table="ParticipationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ParticipationDescriptorAggregate.EdFi.ParticipationDescriptor" lazy="false" discriminator-value="edfi.ParticipationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ParticipationDescriptor" >
           <key>
             <column name="ParticipationDescriptorId" />
           </key>
@@ -4238,8 +4474,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ParticipationStatusDescriptorAggregate.EdFi.ParticipationStatusDescriptor" table="ParticipationStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ParticipationStatusDescriptorAggregate.EdFi.ParticipationStatusDescriptor" lazy="false" discriminator-value="edfi.ParticipationStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ParticipationStatusDescriptor" >
           <key>
             <column name="ParticipationStatusDescriptorId" />
           </key>
@@ -4252,8 +4490,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.PerformanceBaseConversionDescriptorAggregate.EdFi.PerformanceBaseConversionDescriptor" table="PerformanceBaseConversionDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.PerformanceBaseConversionDescriptorAggregate.EdFi.PerformanceBaseConversionDescriptor" lazy="false" discriminator-value="edfi.PerformanceBaseConversionDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PerformanceBaseConversionDescriptor" >
           <key>
             <column name="PerformanceBaseConversionDescriptorId" />
           </key>
@@ -4266,8 +4506,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.PerformanceLevelDescriptorAggregate.EdFi.PerformanceLevelDescriptor" table="PerformanceLevelDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.PerformanceLevelDescriptorAggregate.EdFi.PerformanceLevelDescriptor" lazy="false" discriminator-value="edfi.PerformanceLevelDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PerformanceLevelDescriptor" >
           <key>
             <column name="PerformanceLevelDescriptorId" />
           </key>
@@ -4280,8 +4522,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.PersonalInformationVerificationDescriptorAggregate.EdFi.PersonalInformationVerificationDescriptor" table="PersonalInformationVerificationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.PersonalInformationVerificationDescriptorAggregate.EdFi.PersonalInformationVerificationDescriptor" lazy="false" discriminator-value="edfi.PersonalInformationVerificationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PersonalInformationVerificationDescriptor" >
           <key>
             <column name="PersonalInformationVerificationDescriptorId" />
           </key>
@@ -4294,8 +4538,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.PlatformTypeDescriptorAggregate.EdFi.PlatformTypeDescriptor" table="PlatformTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.PlatformTypeDescriptorAggregate.EdFi.PlatformTypeDescriptor" lazy="false" discriminator-value="edfi.PlatformTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PlatformTypeDescriptor" >
           <key>
             <column name="PlatformTypeDescriptorId" />
           </key>
@@ -4308,8 +4554,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.PopulationServedDescriptorAggregate.EdFi.PopulationServedDescriptor" table="PopulationServedDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.PopulationServedDescriptorAggregate.EdFi.PopulationServedDescriptor" lazy="false" discriminator-value="edfi.PopulationServedDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PopulationServedDescriptor" >
           <key>
             <column name="PopulationServedDescriptorId" />
           </key>
@@ -4322,8 +4570,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.PostingResultDescriptorAggregate.EdFi.PostingResultDescriptor" table="PostingResultDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.PostingResultDescriptorAggregate.EdFi.PostingResultDescriptor" lazy="false" discriminator-value="edfi.PostingResultDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PostingResultDescriptor" >
           <key>
             <column name="PostingResultDescriptorId" />
           </key>
@@ -4336,8 +4586,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.PostSecondaryEventCategoryDescriptorAggregate.EdFi.PostSecondaryEventCategoryDescriptor" table="PostSecondaryEventCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.PostSecondaryEventCategoryDescriptorAggregate.EdFi.PostSecondaryEventCategoryDescriptor" lazy="false" discriminator-value="edfi.PostSecondaryEventCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PostSecondaryEventCategoryDescriptor" >
           <key>
             <column name="PostSecondaryEventCategoryDescriptorId" />
           </key>
@@ -4350,8 +4602,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.PostSecondaryInstitutionLevelDescriptorAggregate.EdFi.PostSecondaryInstitutionLevelDescriptor" table="PostSecondaryInstitutionLevelDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.PostSecondaryInstitutionLevelDescriptorAggregate.EdFi.PostSecondaryInstitutionLevelDescriptor" lazy="false" discriminator-value="edfi.PostSecondaryInstitutionLevelDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PostSecondaryInstitutionLevelDescriptor" >
           <key>
             <column name="PostSecondaryInstitutionLevelDescriptorId" />
           </key>
@@ -4364,8 +4618,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.PrimaryLearningDeviceAccessDescriptorAggregate.EdFi.PrimaryLearningDeviceAccessDescriptor" table="PrimaryLearningDeviceAccessDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.PrimaryLearningDeviceAccessDescriptorAggregate.EdFi.PrimaryLearningDeviceAccessDescriptor" lazy="false" discriminator-value="edfi.PrimaryLearningDeviceAccessDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PrimaryLearningDeviceAccessDescriptor" >
           <key>
             <column name="PrimaryLearningDeviceAccessDescriptorId" />
           </key>
@@ -4378,8 +4634,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.PrimaryLearningDeviceAwayFromSchoolDescriptorAggregate.EdFi.PrimaryLearningDeviceAwayFromSchoolDescriptor" table="PrimaryLearningDeviceAwayFromSchoolDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.PrimaryLearningDeviceAwayFromSchoolDescriptorAggregate.EdFi.PrimaryLearningDeviceAwayFromSchoolDescriptor" lazy="false" discriminator-value="edfi.PrimaryLearningDeviceAwayFromSchoolDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PrimaryLearningDeviceAwayFromSchoolDescriptor" >
           <key>
             <column name="PrimaryLearningDeviceAwayFromSchoolDescriptorId" />
           </key>
@@ -4392,8 +4650,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.PrimaryLearningDeviceProviderDescriptorAggregate.EdFi.PrimaryLearningDeviceProviderDescriptor" table="PrimaryLearningDeviceProviderDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.PrimaryLearningDeviceProviderDescriptorAggregate.EdFi.PrimaryLearningDeviceProviderDescriptor" lazy="false" discriminator-value="edfi.PrimaryLearningDeviceProviderDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PrimaryLearningDeviceProviderDescriptor" >
           <key>
             <column name="PrimaryLearningDeviceProviderDescriptorId" />
           </key>
@@ -4406,8 +4666,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ProficiencyDescriptorAggregate.EdFi.ProficiencyDescriptor" table="ProficiencyDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ProficiencyDescriptorAggregate.EdFi.ProficiencyDescriptor" lazy="false" discriminator-value="edfi.ProficiencyDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ProficiencyDescriptor" >
           <key>
             <column name="ProficiencyDescriptorId" />
           </key>
@@ -4420,8 +4682,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ProgramAssignmentDescriptorAggregate.EdFi.ProgramAssignmentDescriptor" table="ProgramAssignmentDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ProgramAssignmentDescriptorAggregate.EdFi.ProgramAssignmentDescriptor" lazy="false" discriminator-value="edfi.ProgramAssignmentDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ProgramAssignmentDescriptor" >
           <key>
             <column name="ProgramAssignmentDescriptorId" />
           </key>
@@ -4434,8 +4698,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ProgramCharacteristicDescriptorAggregate.EdFi.ProgramCharacteristicDescriptor" table="ProgramCharacteristicDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ProgramCharacteristicDescriptorAggregate.EdFi.ProgramCharacteristicDescriptor" lazy="false" discriminator-value="edfi.ProgramCharacteristicDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ProgramCharacteristicDescriptor" >
           <key>
             <column name="ProgramCharacteristicDescriptorId" />
           </key>
@@ -4448,8 +4714,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ProgramSponsorDescriptorAggregate.EdFi.ProgramSponsorDescriptor" table="ProgramSponsorDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ProgramSponsorDescriptorAggregate.EdFi.ProgramSponsorDescriptor" lazy="false" discriminator-value="edfi.ProgramSponsorDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ProgramSponsorDescriptor" >
           <key>
             <column name="ProgramSponsorDescriptorId" />
           </key>
@@ -4462,8 +4730,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ProgramTypeDescriptorAggregate.EdFi.ProgramTypeDescriptor" table="ProgramTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ProgramTypeDescriptorAggregate.EdFi.ProgramTypeDescriptor" lazy="false" discriminator-value="edfi.ProgramTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ProgramTypeDescriptor" >
           <key>
             <column name="ProgramTypeDescriptorId" />
           </key>
@@ -4476,8 +4746,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ProgressDescriptorAggregate.EdFi.ProgressDescriptor" table="ProgressDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ProgressDescriptorAggregate.EdFi.ProgressDescriptor" lazy="false" discriminator-value="edfi.ProgressDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ProgressDescriptor" >
           <key>
             <column name="ProgressDescriptorId" />
           </key>
@@ -4490,8 +4762,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ProgressLevelDescriptorAggregate.EdFi.ProgressLevelDescriptor" table="ProgressLevelDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ProgressLevelDescriptorAggregate.EdFi.ProgressLevelDescriptor" lazy="false" discriminator-value="edfi.ProgressLevelDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ProgressLevelDescriptor" >
           <key>
             <column name="ProgressLevelDescriptorId" />
           </key>
@@ -4504,8 +4778,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ProviderCategoryDescriptorAggregate.EdFi.ProviderCategoryDescriptor" table="ProviderCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ProviderCategoryDescriptorAggregate.EdFi.ProviderCategoryDescriptor" lazy="false" discriminator-value="edfi.ProviderCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ProviderCategoryDescriptor" >
           <key>
             <column name="ProviderCategoryDescriptorId" />
           </key>
@@ -4518,8 +4794,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ProviderProfitabilityDescriptorAggregate.EdFi.ProviderProfitabilityDescriptor" table="ProviderProfitabilityDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ProviderProfitabilityDescriptorAggregate.EdFi.ProviderProfitabilityDescriptor" lazy="false" discriminator-value="edfi.ProviderProfitabilityDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ProviderProfitabilityDescriptor" >
           <key>
             <column name="ProviderProfitabilityDescriptorId" />
           </key>
@@ -4532,8 +4810,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ProviderStatusDescriptorAggregate.EdFi.ProviderStatusDescriptor" table="ProviderStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ProviderStatusDescriptorAggregate.EdFi.ProviderStatusDescriptor" lazy="false" discriminator-value="edfi.ProviderStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ProviderStatusDescriptor" >
           <key>
             <column name="ProviderStatusDescriptorId" />
           </key>
@@ -4546,8 +4826,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.PublicationStatusDescriptorAggregate.EdFi.PublicationStatusDescriptor" table="PublicationStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.PublicationStatusDescriptorAggregate.EdFi.PublicationStatusDescriptor" lazy="false" discriminator-value="edfi.PublicationStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PublicationStatusDescriptor" >
           <key>
             <column name="PublicationStatusDescriptorId" />
           </key>
@@ -4560,8 +4842,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QuestionFormDescriptorAggregate.EdFi.QuestionFormDescriptor" table="QuestionFormDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QuestionFormDescriptorAggregate.EdFi.QuestionFormDescriptor" lazy="false" discriminator-value="edfi.QuestionFormDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="QuestionFormDescriptor" >
           <key>
             <column name="QuestionFormDescriptorId" />
           </key>
@@ -4574,8 +4858,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.RaceDescriptorAggregate.EdFi.RaceDescriptor" table="RaceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.RaceDescriptorAggregate.EdFi.RaceDescriptor" lazy="false" discriminator-value="edfi.RaceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="RaceDescriptor" >
           <key>
             <column name="RaceDescriptorId" />
           </key>
@@ -4588,8 +4874,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ReasonExitedDescriptorAggregate.EdFi.ReasonExitedDescriptor" table="ReasonExitedDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ReasonExitedDescriptorAggregate.EdFi.ReasonExitedDescriptor" lazy="false" discriminator-value="edfi.ReasonExitedDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ReasonExitedDescriptor" >
           <key>
             <column name="ReasonExitedDescriptorId" />
           </key>
@@ -4602,8 +4890,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ReasonNotTestedDescriptorAggregate.EdFi.ReasonNotTestedDescriptor" table="ReasonNotTestedDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ReasonNotTestedDescriptorAggregate.EdFi.ReasonNotTestedDescriptor" lazy="false" discriminator-value="edfi.ReasonNotTestedDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ReasonNotTestedDescriptor" >
           <key>
             <column name="ReasonNotTestedDescriptorId" />
           </key>
@@ -4616,8 +4906,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.RecognitionTypeDescriptorAggregate.EdFi.RecognitionTypeDescriptor" table="RecognitionTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.RecognitionTypeDescriptorAggregate.EdFi.RecognitionTypeDescriptor" lazy="false" discriminator-value="edfi.RecognitionTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="RecognitionTypeDescriptor" >
           <key>
             <column name="RecognitionTypeDescriptorId" />
           </key>
@@ -4630,8 +4922,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.RelationDescriptorAggregate.EdFi.RelationDescriptor" table="RelationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.RelationDescriptorAggregate.EdFi.RelationDescriptor" lazy="false" discriminator-value="edfi.RelationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="RelationDescriptor" >
           <key>
             <column name="RelationDescriptorId" />
           </key>
@@ -4644,8 +4938,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.RepeatIdentifierDescriptorAggregate.EdFi.RepeatIdentifierDescriptor" table="RepeatIdentifierDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.RepeatIdentifierDescriptorAggregate.EdFi.RepeatIdentifierDescriptor" lazy="false" discriminator-value="edfi.RepeatIdentifierDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="RepeatIdentifierDescriptor" >
           <key>
             <column name="RepeatIdentifierDescriptorId" />
           </key>
@@ -4658,8 +4954,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ReporterDescriptionDescriptorAggregate.EdFi.ReporterDescriptionDescriptor" table="ReporterDescriptionDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ReporterDescriptionDescriptorAggregate.EdFi.ReporterDescriptionDescriptor" lazy="false" discriminator-value="edfi.ReporterDescriptionDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ReporterDescriptionDescriptor" >
           <key>
             <column name="ReporterDescriptionDescriptorId" />
           </key>
@@ -4672,8 +4970,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ReportingTagDescriptorAggregate.EdFi.ReportingTagDescriptor" table="ReportingTagDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ReportingTagDescriptorAggregate.EdFi.ReportingTagDescriptor" lazy="false" discriminator-value="edfi.ReportingTagDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ReportingTagDescriptor" >
           <key>
             <column name="ReportingTagDescriptorId" />
           </key>
@@ -4686,8 +4986,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ResidencyStatusDescriptorAggregate.EdFi.ResidencyStatusDescriptor" table="ResidencyStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ResidencyStatusDescriptorAggregate.EdFi.ResidencyStatusDescriptor" lazy="false" discriminator-value="edfi.ResidencyStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ResidencyStatusDescriptor" >
           <key>
             <column name="ResidencyStatusDescriptorId" />
           </key>
@@ -4700,8 +5002,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ResponseIndicatorDescriptorAggregate.EdFi.ResponseIndicatorDescriptor" table="ResponseIndicatorDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ResponseIndicatorDescriptorAggregate.EdFi.ResponseIndicatorDescriptor" lazy="false" discriminator-value="edfi.ResponseIndicatorDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ResponseIndicatorDescriptor" >
           <key>
             <column name="ResponseIndicatorDescriptorId" />
           </key>
@@ -4714,8 +5018,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ResponsibilityDescriptorAggregate.EdFi.ResponsibilityDescriptor" table="ResponsibilityDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ResponsibilityDescriptorAggregate.EdFi.ResponsibilityDescriptor" lazy="false" discriminator-value="edfi.ResponsibilityDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ResponsibilityDescriptor" >
           <key>
             <column name="ResponsibilityDescriptorId" />
           </key>
@@ -4728,8 +5034,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.RestraintEventReasonDescriptorAggregate.EdFi.RestraintEventReasonDescriptor" table="RestraintEventReasonDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.RestraintEventReasonDescriptorAggregate.EdFi.RestraintEventReasonDescriptor" lazy="false" discriminator-value="edfi.RestraintEventReasonDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="RestraintEventReasonDescriptor" >
           <key>
             <column name="RestraintEventReasonDescriptorId" />
           </key>
@@ -4742,8 +5050,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ResultDatatypeTypeDescriptorAggregate.EdFi.ResultDatatypeTypeDescriptor" table="ResultDatatypeTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ResultDatatypeTypeDescriptorAggregate.EdFi.ResultDatatypeTypeDescriptor" lazy="false" discriminator-value="edfi.ResultDatatypeTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ResultDatatypeTypeDescriptor" >
           <key>
             <column name="ResultDatatypeTypeDescriptorId" />
           </key>
@@ -4756,8 +5066,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.RetestIndicatorDescriptorAggregate.EdFi.RetestIndicatorDescriptor" table="RetestIndicatorDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.RetestIndicatorDescriptorAggregate.EdFi.RetestIndicatorDescriptor" lazy="false" discriminator-value="edfi.RetestIndicatorDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="RetestIndicatorDescriptor" >
           <key>
             <column name="RetestIndicatorDescriptorId" />
           </key>
@@ -4770,8 +5082,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.SchoolCategoryDescriptorAggregate.EdFi.SchoolCategoryDescriptor" table="SchoolCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.SchoolCategoryDescriptorAggregate.EdFi.SchoolCategoryDescriptor" lazy="false" discriminator-value="edfi.SchoolCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SchoolCategoryDescriptor" >
           <key>
             <column name="SchoolCategoryDescriptorId" />
           </key>
@@ -4784,8 +5098,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.SchoolChoiceImplementStatusDescriptorAggregate.EdFi.SchoolChoiceImplementStatusDescriptor" table="SchoolChoiceImplementStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.SchoolChoiceImplementStatusDescriptorAggregate.EdFi.SchoolChoiceImplementStatusDescriptor" lazy="false" discriminator-value="edfi.SchoolChoiceImplementStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SchoolChoiceImplementStatusDescriptor" >
           <key>
             <column name="SchoolChoiceImplementStatusDescriptorId" />
           </key>
@@ -4798,8 +5114,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.SchoolFoodServiceProgramServiceDescriptorAggregate.EdFi.SchoolFoodServiceProgramServiceDescriptor" table="SchoolFoodServiceProgramServiceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.SchoolFoodServiceProgramServiceDescriptorAggregate.EdFi.SchoolFoodServiceProgramServiceDescriptor" lazy="false" discriminator-value="edfi.SchoolFoodServiceProgramServiceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SchoolFoodServiceProgramServiceDescriptor" >
           <key>
             <column name="SchoolFoodServiceProgramServiceDescriptorId" />
           </key>
@@ -4812,8 +5130,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.SchoolTypeDescriptorAggregate.EdFi.SchoolTypeDescriptor" table="SchoolTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.SchoolTypeDescriptorAggregate.EdFi.SchoolTypeDescriptor" lazy="false" discriminator-value="edfi.SchoolTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SchoolTypeDescriptor" >
           <key>
             <column name="SchoolTypeDescriptorId" />
           </key>
@@ -4826,8 +5146,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.SectionCharacteristicDescriptorAggregate.EdFi.SectionCharacteristicDescriptor" table="SectionCharacteristicDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.SectionCharacteristicDescriptorAggregate.EdFi.SectionCharacteristicDescriptor" lazy="false" discriminator-value="edfi.SectionCharacteristicDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SectionCharacteristicDescriptor" >
           <key>
             <column name="SectionCharacteristicDescriptorId" />
           </key>
@@ -4840,8 +5162,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.SeparationDescriptorAggregate.EdFi.SeparationDescriptor" table="SeparationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.SeparationDescriptorAggregate.EdFi.SeparationDescriptor" lazy="false" discriminator-value="edfi.SeparationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SeparationDescriptor" >
           <key>
             <column name="SeparationDescriptorId" />
           </key>
@@ -4854,8 +5178,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.SeparationReasonDescriptorAggregate.EdFi.SeparationReasonDescriptor" table="SeparationReasonDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.SeparationReasonDescriptorAggregate.EdFi.SeparationReasonDescriptor" lazy="false" discriminator-value="edfi.SeparationReasonDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SeparationReasonDescriptor" >
           <key>
             <column name="SeparationReasonDescriptorId" />
           </key>
@@ -4868,8 +5194,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ServiceDescriptorAggregate.EdFi.ServiceDescriptor" table="ServiceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ServiceDescriptorAggregate.EdFi.ServiceDescriptor" lazy="false" discriminator-value="edfi.ServiceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ServiceDescriptor" >
           <key>
             <column name="ServiceDescriptorId" />
           </key>
@@ -4882,8 +5210,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.SexDescriptorAggregate.EdFi.SexDescriptor" table="SexDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.SexDescriptorAggregate.EdFi.SexDescriptor" lazy="false" discriminator-value="edfi.SexDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SexDescriptor" >
           <key>
             <column name="SexDescriptorId" />
           </key>
@@ -4896,8 +5226,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.SourceSystemDescriptorAggregate.EdFi.SourceSystemDescriptor" table="SourceSystemDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.SourceSystemDescriptorAggregate.EdFi.SourceSystemDescriptor" lazy="false" discriminator-value="edfi.SourceSystemDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SourceSystemDescriptor" >
           <key>
             <column name="SourceSystemDescriptorId" />
           </key>
@@ -4910,8 +5242,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.SpecialEducationProgramServiceDescriptorAggregate.EdFi.SpecialEducationProgramServiceDescriptor" table="SpecialEducationProgramServiceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.SpecialEducationProgramServiceDescriptorAggregate.EdFi.SpecialEducationProgramServiceDescriptor" lazy="false" discriminator-value="edfi.SpecialEducationProgramServiceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SpecialEducationProgramServiceDescriptor" >
           <key>
             <column name="SpecialEducationProgramServiceDescriptorId" />
           </key>
@@ -4924,8 +5258,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.SpecialEducationSettingDescriptorAggregate.EdFi.SpecialEducationSettingDescriptor" table="SpecialEducationSettingDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.SpecialEducationSettingDescriptorAggregate.EdFi.SpecialEducationSettingDescriptor" lazy="false" discriminator-value="edfi.SpecialEducationSettingDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SpecialEducationSettingDescriptor" >
           <key>
             <column name="SpecialEducationSettingDescriptorId" />
           </key>
@@ -4938,8 +5274,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.StaffClassificationDescriptorAggregate.EdFi.StaffClassificationDescriptor" table="StaffClassificationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.StaffClassificationDescriptorAggregate.EdFi.StaffClassificationDescriptor" lazy="false" discriminator-value="edfi.StaffClassificationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="StaffClassificationDescriptor" >
           <key>
             <column name="StaffClassificationDescriptorId" />
           </key>
@@ -4952,8 +5290,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.StaffIdentificationSystemDescriptorAggregate.EdFi.StaffIdentificationSystemDescriptor" table="StaffIdentificationSystemDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.StaffIdentificationSystemDescriptorAggregate.EdFi.StaffIdentificationSystemDescriptor" lazy="false" discriminator-value="edfi.StaffIdentificationSystemDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="StaffIdentificationSystemDescriptor" >
           <key>
             <column name="StaffIdentificationSystemDescriptorId" />
           </key>
@@ -4966,8 +5306,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.StaffLeaveEventCategoryDescriptorAggregate.EdFi.StaffLeaveEventCategoryDescriptor" table="StaffLeaveEventCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.StaffLeaveEventCategoryDescriptorAggregate.EdFi.StaffLeaveEventCategoryDescriptor" lazy="false" discriminator-value="edfi.StaffLeaveEventCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="StaffLeaveEventCategoryDescriptor" >
           <key>
             <column name="StaffLeaveEventCategoryDescriptorId" />
           </key>
@@ -4980,8 +5322,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.StateAbbreviationDescriptorAggregate.EdFi.StateAbbreviationDescriptor" table="StateAbbreviationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.StateAbbreviationDescriptorAggregate.EdFi.StateAbbreviationDescriptor" lazy="false" discriminator-value="edfi.StateAbbreviationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="StateAbbreviationDescriptor" >
           <key>
             <column name="StateAbbreviationDescriptorId" />
           </key>
@@ -4994,8 +5338,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.StudentCharacteristicDescriptorAggregate.EdFi.StudentCharacteristicDescriptor" table="StudentCharacteristicDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.StudentCharacteristicDescriptorAggregate.EdFi.StudentCharacteristicDescriptor" lazy="false" discriminator-value="edfi.StudentCharacteristicDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="StudentCharacteristicDescriptor" >
           <key>
             <column name="StudentCharacteristicDescriptorId" />
           </key>
@@ -5008,8 +5354,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.StudentIdentificationSystemDescriptorAggregate.EdFi.StudentIdentificationSystemDescriptor" table="StudentIdentificationSystemDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.StudentIdentificationSystemDescriptorAggregate.EdFi.StudentIdentificationSystemDescriptor" lazy="false" discriminator-value="edfi.StudentIdentificationSystemDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="StudentIdentificationSystemDescriptor" >
           <key>
             <column name="StudentIdentificationSystemDescriptorId" />
           </key>
@@ -5022,8 +5370,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.StudentParticipationCodeDescriptorAggregate.EdFi.StudentParticipationCodeDescriptor" table="StudentParticipationCodeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.StudentParticipationCodeDescriptorAggregate.EdFi.StudentParticipationCodeDescriptor" lazy="false" discriminator-value="edfi.StudentParticipationCodeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="StudentParticipationCodeDescriptor" >
           <key>
             <column name="StudentParticipationCodeDescriptorId" />
           </key>
@@ -5036,8 +5386,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.SubmissionStatusDescriptorAggregate.EdFi.SubmissionStatusDescriptor" table="SubmissionStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.SubmissionStatusDescriptorAggregate.EdFi.SubmissionStatusDescriptor" lazy="false" discriminator-value="edfi.SubmissionStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SubmissionStatusDescriptor" >
           <key>
             <column name="SubmissionStatusDescriptorId" />
           </key>
@@ -5050,8 +5402,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.SurveyCategoryDescriptorAggregate.EdFi.SurveyCategoryDescriptor" table="SurveyCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.SurveyCategoryDescriptorAggregate.EdFi.SurveyCategoryDescriptor" lazy="false" discriminator-value="edfi.SurveyCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SurveyCategoryDescriptor" >
           <key>
             <column name="SurveyCategoryDescriptorId" />
           </key>
@@ -5064,8 +5418,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.SurveyLevelDescriptorAggregate.EdFi.SurveyLevelDescriptor" table="SurveyLevelDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.SurveyLevelDescriptorAggregate.EdFi.SurveyLevelDescriptor" lazy="false" discriminator-value="edfi.SurveyLevelDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SurveyLevelDescriptor" >
           <key>
             <column name="SurveyLevelDescriptorId" />
           </key>
@@ -5078,8 +5434,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.TeachingCredentialBasisDescriptorAggregate.EdFi.TeachingCredentialBasisDescriptor" table="TeachingCredentialBasisDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.TeachingCredentialBasisDescriptorAggregate.EdFi.TeachingCredentialBasisDescriptor" lazy="false" discriminator-value="edfi.TeachingCredentialBasisDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="TeachingCredentialBasisDescriptor" >
           <key>
             <column name="TeachingCredentialBasisDescriptorId" />
           </key>
@@ -5092,8 +5450,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.TeachingCredentialDescriptorAggregate.EdFi.TeachingCredentialDescriptor" table="TeachingCredentialDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.TeachingCredentialDescriptorAggregate.EdFi.TeachingCredentialDescriptor" lazy="false" discriminator-value="edfi.TeachingCredentialDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="TeachingCredentialDescriptor" >
           <key>
             <column name="TeachingCredentialDescriptorId" />
           </key>
@@ -5106,8 +5466,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.TechnicalSkillsAssessmentDescriptorAggregate.EdFi.TechnicalSkillsAssessmentDescriptor" table="TechnicalSkillsAssessmentDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.TechnicalSkillsAssessmentDescriptorAggregate.EdFi.TechnicalSkillsAssessmentDescriptor" lazy="false" discriminator-value="edfi.TechnicalSkillsAssessmentDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="TechnicalSkillsAssessmentDescriptor" >
           <key>
             <column name="TechnicalSkillsAssessmentDescriptorId" />
           </key>
@@ -5120,8 +5482,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.TelephoneNumberTypeDescriptorAggregate.EdFi.TelephoneNumberTypeDescriptor" table="TelephoneNumberTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.TelephoneNumberTypeDescriptorAggregate.EdFi.TelephoneNumberTypeDescriptor" lazy="false" discriminator-value="edfi.TelephoneNumberTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="TelephoneNumberTypeDescriptor" >
           <key>
             <column name="TelephoneNumberTypeDescriptorId" />
           </key>
@@ -5134,8 +5498,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.TermDescriptorAggregate.EdFi.TermDescriptor" table="TermDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.TermDescriptorAggregate.EdFi.TermDescriptor" lazy="false" discriminator-value="edfi.TermDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="TermDescriptor" >
           <key>
             <column name="TermDescriptorId" />
           </key>
@@ -5148,8 +5514,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.TitleIPartAParticipantDescriptorAggregate.EdFi.TitleIPartAParticipantDescriptor" table="TitleIPartAParticipantDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.TitleIPartAParticipantDescriptorAggregate.EdFi.TitleIPartAParticipantDescriptor" lazy="false" discriminator-value="edfi.TitleIPartAParticipantDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="TitleIPartAParticipantDescriptor" >
           <key>
             <column name="TitleIPartAParticipantDescriptorId" />
           </key>
@@ -5162,8 +5530,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.TitleIPartAProgramServiceDescriptorAggregate.EdFi.TitleIPartAProgramServiceDescriptor" table="TitleIPartAProgramServiceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.TitleIPartAProgramServiceDescriptorAggregate.EdFi.TitleIPartAProgramServiceDescriptor" lazy="false" discriminator-value="edfi.TitleIPartAProgramServiceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="TitleIPartAProgramServiceDescriptor" >
           <key>
             <column name="TitleIPartAProgramServiceDescriptorId" />
           </key>
@@ -5176,8 +5546,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.TitleIPartASchoolDesignationDescriptorAggregate.EdFi.TitleIPartASchoolDesignationDescriptor" table="TitleIPartASchoolDesignationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.TitleIPartASchoolDesignationDescriptorAggregate.EdFi.TitleIPartASchoolDesignationDescriptor" lazy="false" discriminator-value="edfi.TitleIPartASchoolDesignationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="TitleIPartASchoolDesignationDescriptor" >
           <key>
             <column name="TitleIPartASchoolDesignationDescriptorId" />
           </key>
@@ -5190,8 +5562,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.TribalAffiliationDescriptorAggregate.EdFi.TribalAffiliationDescriptor" table="TribalAffiliationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.TribalAffiliationDescriptorAggregate.EdFi.TribalAffiliationDescriptor" lazy="false" discriminator-value="edfi.TribalAffiliationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="TribalAffiliationDescriptor" >
           <key>
             <column name="TribalAffiliationDescriptorId" />
           </key>
@@ -5204,8 +5578,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.VisaDescriptorAggregate.EdFi.VisaDescriptor" table="VisaDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.VisaDescriptorAggregate.EdFi.VisaDescriptor" lazy="false" discriminator-value="edfi.VisaDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="VisaDescriptor" >
           <key>
             <column name="VisaDescriptorId" />
           </key>
@@ -5218,8 +5594,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.WeaponDescriptorAggregate.EdFi.WeaponDescriptor" table="WeaponDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.WeaponDescriptorAggregate.EdFi.WeaponDescriptor" lazy="false" discriminator-value="edfi.WeaponDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="WeaponDescriptor" >
           <key>
             <column name="WeaponDescriptorId" />
           </key>
@@ -5232,7 +5610,8 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
+      </join>
+    </subclass>
 </class>
 
 
diff --git a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/4.0.0/DataStandard_400_ApprovalTests.Verify.Standard_Std_4.0.0_EntityOrmMappings_MsSql_EntityOrmMappingsForQueries.generated.hbm.approved.xml b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/4.0.0/DataStandard_400_ApprovalTests.Verify.Standard_Std_4.0.0_EntityOrmMappings_MsSql_EntityOrmMappingsForQueries.generated.hbm.approved.xml
index b829c08380..0994afe5e0 100644
--- a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/4.0.0/DataStandard_400_ApprovalTests.Verify.Standard_Std_4.0.0_EntityOrmMappings_MsSql_EntityOrmMappingsForQueries.generated.hbm.approved.xml
+++ b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/4.0.0/DataStandard_400_ApprovalTests.Verify.Standard_Std_4.0.0_EntityOrmMappings_MsSql_EntityOrmMappingsForQueries.generated.hbm.approved.xml
@@ -2757,12 +2757,13 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.DescriptorAggregate.EdFi.DescriptorQ" table="Descriptor" lazy="false" abstract="true">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.DescriptorAggregate.EdFi.DescriptorQ" table="Descriptor" lazy="false" abstract="true" discriminator-value="NULL">
     <id name="DescriptorId" column="DescriptorId" type="int">
       <generator class="identity" />
     </id>
 
     <!-- Discriminator -->
+    <discriminator column="Discriminator" type="string" />
 
     <!-- Optimistic locking for aggregate root -->
     <version name="LastModifiedDate" column="LastModifiedDate" type="UtcDateTime" />
@@ -2774,6 +2775,8 @@
     <property name="Id" column="Id" type="guid" not-null="true" />
 
     <!-- Properties -->
+    <!-- Readonly property to surface the discriminator value -->
+    <property name="Discriminator" column="Discriminator" type="string" insert="false" update="false" />
     <property name="CodeValue" column="CodeValue" type="string" length="50" not-null="true" />
     <property name="Description" column="Description" type="string" length="1024" />
     <property name="EffectiveBeginDate" column="EffectiveBeginDate" type="date" />
@@ -2787,7 +2790,8 @@
 
     <!-- Collections -->
     <!-- Derived classes -->
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AbsenceEventCategoryDescriptorAggregate.EdFi.AbsenceEventCategoryDescriptorQ" table="AbsenceEventCategoryDescriptor" lazy="false">
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AbsenceEventCategoryDescriptorAggregate.EdFi.AbsenceEventCategoryDescriptorQ" lazy="false" discriminator-value="edfi.AbsenceEventCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AbsenceEventCategoryDescriptor" >
           <key>
             <column name="AbsenceEventCategoryDescriptorId" />
           </key>
@@ -2807,8 +2811,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StaffAbsenceEventAggregate.EdFi.StaffAbsenceEventQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AcademicHonorCategoryDescriptorAggregate.EdFi.AcademicHonorCategoryDescriptorQ" table="AcademicHonorCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AcademicHonorCategoryDescriptorAggregate.EdFi.AcademicHonorCategoryDescriptorQ" lazy="false" discriminator-value="edfi.AcademicHonorCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AcademicHonorCategoryDescriptor" >
           <key>
             <column name="AcademicHonorCategoryDescriptorId" />
           </key>
@@ -2828,8 +2834,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAcademicRecordAggregate.EdFi.StudentAcademicRecordAcademicHonorQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AcademicSubjectDescriptorAggregate.EdFi.AcademicSubjectDescriptorQ" table="AcademicSubjectDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AcademicSubjectDescriptorAggregate.EdFi.AcademicSubjectDescriptorQ" lazy="false" discriminator-value="edfi.AcademicSubjectDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AcademicSubjectDescriptor" >
           <key>
             <column name="AcademicSubjectDescriptorId" />
           </key>
@@ -2926,8 +2934,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StaffSchoolAssociationAggregate.EdFi.StaffSchoolAssociationAcademicSubjectQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AccommodationDescriptorAggregate.EdFi.AccommodationDescriptorQ" table="AccommodationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AccommodationDescriptorAggregate.EdFi.AccommodationDescriptorQ" lazy="false" discriminator-value="edfi.AccommodationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AccommodationDescriptor" >
           <key>
             <column name="AccommodationDescriptorId" />
           </key>
@@ -2947,8 +2957,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAssessmentAggregate.EdFi.StudentAssessmentAccommodationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AccountTypeDescriptorAggregate.EdFi.AccountTypeDescriptorQ" table="AccountTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AccountTypeDescriptorAggregate.EdFi.AccountTypeDescriptorQ" lazy="false" discriminator-value="edfi.AccountTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AccountTypeDescriptor" >
           <key>
             <column name="AccountTypeDescriptorId" />
           </key>
@@ -2968,8 +2980,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.ChartOfAccountAggregate.EdFi.ChartOfAccountQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AchievementCategoryDescriptorAggregate.EdFi.AchievementCategoryDescriptorQ" table="AchievementCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AchievementCategoryDescriptorAggregate.EdFi.AchievementCategoryDescriptorQ" lazy="false" discriminator-value="edfi.AchievementCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AchievementCategoryDescriptor" >
           <key>
             <column name="AchievementCategoryDescriptorId" />
           </key>
@@ -3010,8 +3024,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAcademicRecordAggregate.EdFi.StudentAcademicRecordRecognitionQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AdditionalCreditTypeDescriptorAggregate.EdFi.AdditionalCreditTypeDescriptorQ" table="AdditionalCreditTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AdditionalCreditTypeDescriptorAggregate.EdFi.AdditionalCreditTypeDescriptorQ" lazy="false" discriminator-value="edfi.AdditionalCreditTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AdditionalCreditTypeDescriptor" >
           <key>
             <column name="AdditionalCreditTypeDescriptorId" />
           </key>
@@ -3031,8 +3047,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.CourseTranscriptAggregate.EdFi.CourseTranscriptEarnedAdditionalCreditsQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AddressTypeDescriptorAggregate.EdFi.AddressTypeDescriptorQ" table="AddressTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AddressTypeDescriptorAggregate.EdFi.AddressTypeDescriptorQ" lazy="false" discriminator-value="edfi.AddressTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AddressTypeDescriptor" >
           <key>
             <column name="AddressTypeDescriptorId" />
           </key>
@@ -3108,8 +3126,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationInternationalAddressQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AdministrationEnvironmentDescriptorAggregate.EdFi.AdministrationEnvironmentDescriptorQ" table="AdministrationEnvironmentDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AdministrationEnvironmentDescriptorAggregate.EdFi.AdministrationEnvironmentDescriptorQ" lazy="false" discriminator-value="edfi.AdministrationEnvironmentDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AdministrationEnvironmentDescriptor" >
           <key>
             <column name="AdministrationEnvironmentDescriptorId" />
           </key>
@@ -3129,8 +3149,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAssessmentAggregate.EdFi.StudentAssessmentQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AdministrativeFundingControlDescriptorAggregate.EdFi.AdministrativeFundingControlDescriptorQ" table="AdministrativeFundingControlDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AdministrativeFundingControlDescriptorAggregate.EdFi.AdministrativeFundingControlDescriptorQ" lazy="false" discriminator-value="edfi.AdministrativeFundingControlDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AdministrativeFundingControlDescriptor" >
           <key>
             <column name="AdministrativeFundingControlDescriptorId" />
           </key>
@@ -3157,8 +3179,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.SchoolAggregate.EdFi.SchoolQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AncestryEthnicOriginDescriptorAggregate.EdFi.AncestryEthnicOriginDescriptorQ" table="AncestryEthnicOriginDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AncestryEthnicOriginDescriptorAggregate.EdFi.AncestryEthnicOriginDescriptorQ" lazy="false" discriminator-value="edfi.AncestryEthnicOriginDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AncestryEthnicOriginDescriptor" >
           <key>
             <column name="AncestryEthnicOriginDescriptorId" />
           </key>
@@ -3185,8 +3209,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationAncestryEthnicOriginQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AssessmentCategoryDescriptorAggregate.EdFi.AssessmentCategoryDescriptorQ" table="AssessmentCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AssessmentCategoryDescriptorAggregate.EdFi.AssessmentCategoryDescriptorQ" lazy="false" discriminator-value="edfi.AssessmentCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AssessmentCategoryDescriptor" >
           <key>
             <column name="AssessmentCategoryDescriptorId" />
           </key>
@@ -3206,8 +3232,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.AssessmentAggregate.EdFi.AssessmentQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AssessmentIdentificationSystemDescriptorAggregate.EdFi.AssessmentIdentificationSystemDescriptorQ" table="AssessmentIdentificationSystemDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AssessmentIdentificationSystemDescriptorAggregate.EdFi.AssessmentIdentificationSystemDescriptorQ" lazy="false" discriminator-value="edfi.AssessmentIdentificationSystemDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AssessmentIdentificationSystemDescriptor" >
           <key>
             <column name="AssessmentIdentificationSystemDescriptorId" />
           </key>
@@ -3227,8 +3255,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.AssessmentAggregate.EdFi.AssessmentIdentificationCodeQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AssessmentItemCategoryDescriptorAggregate.EdFi.AssessmentItemCategoryDescriptorQ" table="AssessmentItemCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AssessmentItemCategoryDescriptorAggregate.EdFi.AssessmentItemCategoryDescriptorQ" lazy="false" discriminator-value="edfi.AssessmentItemCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AssessmentItemCategoryDescriptor" >
           <key>
             <column name="AssessmentItemCategoryDescriptorId" />
           </key>
@@ -3248,8 +3278,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.AssessmentItemAggregate.EdFi.AssessmentItemQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AssessmentItemResultDescriptorAggregate.EdFi.AssessmentItemResultDescriptorQ" table="AssessmentItemResultDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AssessmentItemResultDescriptorAggregate.EdFi.AssessmentItemResultDescriptorQ" lazy="false" discriminator-value="edfi.AssessmentItemResultDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AssessmentItemResultDescriptor" >
           <key>
             <column name="AssessmentItemResultDescriptorId" />
           </key>
@@ -3269,8 +3301,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAssessmentAggregate.EdFi.StudentAssessmentItemQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AssessmentPeriodDescriptorAggregate.EdFi.AssessmentPeriodDescriptorQ" table="AssessmentPeriodDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AssessmentPeriodDescriptorAggregate.EdFi.AssessmentPeriodDescriptorQ" lazy="false" discriminator-value="edfi.AssessmentPeriodDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AssessmentPeriodDescriptor" >
           <key>
             <column name="AssessmentPeriodDescriptorId" />
           </key>
@@ -3297,8 +3331,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAssessmentAggregate.EdFi.StudentAssessmentPeriodQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AssessmentReportingMethodDescriptorAggregate.EdFi.AssessmentReportingMethodDescriptorQ" table="AssessmentReportingMethodDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AssessmentReportingMethodDescriptorAggregate.EdFi.AssessmentReportingMethodDescriptorQ" lazy="false" discriminator-value="edfi.AssessmentReportingMethodDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AssessmentReportingMethodDescriptor" >
           <key>
             <column name="AssessmentReportingMethodDescriptorId" />
           </key>
@@ -3388,8 +3424,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAssessmentAggregate.EdFi.StudentAssessmentStudentObjectiveAssessmentScoreResultQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AssignmentLateStatusDescriptorAggregate.EdFi.AssignmentLateStatusDescriptorQ" table="AssignmentLateStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AssignmentLateStatusDescriptorAggregate.EdFi.AssignmentLateStatusDescriptorQ" lazy="false" discriminator-value="edfi.AssignmentLateStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AssignmentLateStatusDescriptor" >
           <key>
             <column name="AssignmentLateStatusDescriptorId" />
           </key>
@@ -3409,8 +3447,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentGradebookEntryAggregate.EdFi.StudentGradebookEntryQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AttemptStatusDescriptorAggregate.EdFi.AttemptStatusDescriptorQ" table="AttemptStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AttemptStatusDescriptorAggregate.EdFi.AttemptStatusDescriptorQ" lazy="false" discriminator-value="edfi.AttemptStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AttemptStatusDescriptor" >
           <key>
             <column name="AttemptStatusDescriptorId" />
           </key>
@@ -3430,8 +3470,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSectionAssociationAggregate.EdFi.StudentSectionAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AttendanceEventCategoryDescriptorAggregate.EdFi.AttendanceEventCategoryDescriptorQ" table="AttendanceEventCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AttendanceEventCategoryDescriptorAggregate.EdFi.AttendanceEventCategoryDescriptorQ" lazy="false" discriminator-value="edfi.AttendanceEventCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AttendanceEventCategoryDescriptor" >
           <key>
             <column name="AttendanceEventCategoryDescriptorId" />
           </key>
@@ -3472,8 +3514,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSectionAttendanceEventAggregate.EdFi.StudentSectionAttendanceEventQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.BarrierToInternetAccessInResidenceDescriptorAggregate.EdFi.BarrierToInternetAccessInResidenceDescriptorQ" table="BarrierToInternetAccessInResidenceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.BarrierToInternetAccessInResidenceDescriptorAggregate.EdFi.BarrierToInternetAccessInResidenceDescriptorQ" lazy="false" discriminator-value="edfi.BarrierToInternetAccessInResidenceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="BarrierToInternetAccessInResidenceDescriptor" >
           <key>
             <column name="BarrierToInternetAccessInResidenceDescriptorId" />
           </key>
@@ -3493,8 +3537,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.BehaviorDescriptorAggregate.EdFi.BehaviorDescriptorQ" table="BehaviorDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.BehaviorDescriptorAggregate.EdFi.BehaviorDescriptorQ" lazy="false" discriminator-value="edfi.BehaviorDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="BehaviorDescriptor" >
           <key>
             <column name="BehaviorDescriptorId" />
           </key>
@@ -3528,8 +3574,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentDisciplineIncidentBehaviorAssociationAggregate.EdFi.StudentDisciplineIncidentBehaviorAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CalendarEventDescriptorAggregate.EdFi.CalendarEventDescriptorQ" table="CalendarEventDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CalendarEventDescriptorAggregate.EdFi.CalendarEventDescriptorQ" lazy="false" discriminator-value="edfi.CalendarEventDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CalendarEventDescriptor" >
           <key>
             <column name="CalendarEventDescriptorId" />
           </key>
@@ -3549,8 +3597,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.CalendarDateAggregate.EdFi.CalendarDateCalendarEventQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CalendarTypeDescriptorAggregate.EdFi.CalendarTypeDescriptorQ" table="CalendarTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CalendarTypeDescriptorAggregate.EdFi.CalendarTypeDescriptorQ" lazy="false" discriminator-value="edfi.CalendarTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CalendarTypeDescriptor" >
           <key>
             <column name="CalendarTypeDescriptorId" />
           </key>
@@ -3570,8 +3620,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.CalendarAggregate.EdFi.CalendarQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CareerPathwayDescriptorAggregate.EdFi.CareerPathwayDescriptorQ" table="CareerPathwayDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CareerPathwayDescriptorAggregate.EdFi.CareerPathwayDescriptorQ" lazy="false" discriminator-value="edfi.CareerPathwayDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CareerPathwayDescriptor" >
           <key>
             <column name="CareerPathwayDescriptorId" />
           </key>
@@ -3598,8 +3650,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentCTEProgramAssociationAggregate.EdFi.StudentCTEProgramAssociationCTEProgramQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CharterApprovalAgencyTypeDescriptorAggregate.EdFi.CharterApprovalAgencyTypeDescriptorQ" table="CharterApprovalAgencyTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CharterApprovalAgencyTypeDescriptorAggregate.EdFi.CharterApprovalAgencyTypeDescriptorQ" lazy="false" discriminator-value="edfi.CharterApprovalAgencyTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CharterApprovalAgencyTypeDescriptor" >
           <key>
             <column name="CharterApprovalAgencyTypeDescriptorId" />
           </key>
@@ -3619,8 +3673,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.SchoolAggregate.EdFi.SchoolQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CharterStatusDescriptorAggregate.EdFi.CharterStatusDescriptorQ" table="CharterStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CharterStatusDescriptorAggregate.EdFi.CharterStatusDescriptorQ" lazy="false" discriminator-value="edfi.CharterStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CharterStatusDescriptor" >
           <key>
             <column name="CharterStatusDescriptorId" />
           </key>
@@ -3647,8 +3703,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.SchoolAggregate.EdFi.SchoolQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CitizenshipStatusDescriptorAggregate.EdFi.CitizenshipStatusDescriptorQ" table="CitizenshipStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CitizenshipStatusDescriptorAggregate.EdFi.CitizenshipStatusDescriptorQ" lazy="false" discriminator-value="edfi.CitizenshipStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CitizenshipStatusDescriptor" >
           <key>
             <column name="CitizenshipStatusDescriptorId" />
           </key>
@@ -3675,8 +3733,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAggregate.EdFi.StudentQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ClassroomPositionDescriptorAggregate.EdFi.ClassroomPositionDescriptorQ" table="ClassroomPositionDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ClassroomPositionDescriptorAggregate.EdFi.ClassroomPositionDescriptorQ" lazy="false" discriminator-value="edfi.ClassroomPositionDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ClassroomPositionDescriptor" >
           <key>
             <column name="ClassroomPositionDescriptorId" />
           </key>
@@ -3696,8 +3756,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StaffSectionAssociationAggregate.EdFi.StaffSectionAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CohortScopeDescriptorAggregate.EdFi.CohortScopeDescriptorQ" table="CohortScopeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CohortScopeDescriptorAggregate.EdFi.CohortScopeDescriptorQ" lazy="false" discriminator-value="edfi.CohortScopeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CohortScopeDescriptor" >
           <key>
             <column name="CohortScopeDescriptorId" />
           </key>
@@ -3717,8 +3779,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.CohortAggregate.EdFi.CohortQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CohortTypeDescriptorAggregate.EdFi.CohortTypeDescriptorQ" table="CohortTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CohortTypeDescriptorAggregate.EdFi.CohortTypeDescriptorQ" lazy="false" discriminator-value="edfi.CohortTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CohortTypeDescriptor" >
           <key>
             <column name="CohortTypeDescriptorId" />
           </key>
@@ -3738,8 +3802,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.CohortAggregate.EdFi.CohortQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CohortYearTypeDescriptorAggregate.EdFi.CohortYearTypeDescriptorQ" table="CohortYearTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CohortYearTypeDescriptorAggregate.EdFi.CohortYearTypeDescriptorQ" lazy="false" discriminator-value="edfi.CohortYearTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CohortYearTypeDescriptor" >
           <key>
             <column name="CohortYearTypeDescriptorId" />
           </key>
@@ -3759,8 +3825,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationCohortYearQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CompetencyLevelDescriptorAggregate.EdFi.CompetencyLevelDescriptorQ" table="CompetencyLevelDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CompetencyLevelDescriptorAggregate.EdFi.CompetencyLevelDescriptorQ" lazy="false" discriminator-value="edfi.CompetencyLevelDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CompetencyLevelDescriptor" >
           <key>
             <column name="CompetencyLevelDescriptorId" />
           </key>
@@ -3801,8 +3869,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentLearningObjectiveAggregate.EdFi.StudentLearningObjectiveQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ContactTypeDescriptorAggregate.EdFi.ContactTypeDescriptorQ" table="ContactTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ContactTypeDescriptorAggregate.EdFi.ContactTypeDescriptorQ" lazy="false" discriminator-value="edfi.ContactTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ContactTypeDescriptor" >
           <key>
             <column name="ContactTypeDescriptorId" />
           </key>
@@ -3822,8 +3892,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StaffEducationOrganizationContactAssociationAggregate.EdFi.StaffEducationOrganizationContactAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ContentClassDescriptorAggregate.EdFi.ContentClassDescriptorQ" table="ContentClassDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ContentClassDescriptorAggregate.EdFi.ContentClassDescriptorQ" lazy="false" discriminator-value="edfi.ContentClassDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ContentClassDescriptor" >
           <key>
             <column name="ContentClassDescriptorId" />
           </key>
@@ -3843,8 +3915,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.EducationContentAggregate.EdFi.EducationContentQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ContinuationOfServicesReasonDescriptorAggregate.EdFi.ContinuationOfServicesReasonDescriptorQ" table="ContinuationOfServicesReasonDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ContinuationOfServicesReasonDescriptorAggregate.EdFi.ContinuationOfServicesReasonDescriptorQ" lazy="false" discriminator-value="edfi.ContinuationOfServicesReasonDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ContinuationOfServicesReasonDescriptor" >
           <key>
             <column name="ContinuationOfServicesReasonDescriptorId" />
           </key>
@@ -3864,8 +3938,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentMigrantEducationProgramAssociationAggregate.EdFi.StudentMigrantEducationProgramAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CostRateDescriptorAggregate.EdFi.CostRateDescriptorQ" table="CostRateDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CostRateDescriptorAggregate.EdFi.CostRateDescriptorQ" lazy="false" discriminator-value="edfi.CostRateDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CostRateDescriptor" >
           <key>
             <column name="CostRateDescriptorId" />
           </key>
@@ -3885,8 +3961,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.EducationContentAggregate.EdFi.EducationContentQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CountryDescriptorAggregate.EdFi.CountryDescriptorQ" table="CountryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CountryDescriptorAggregate.EdFi.CountryDescriptorQ" lazy="false" discriminator-value="edfi.CountryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CountryDescriptor" >
           <key>
             <column name="CountryDescriptorId" />
           </key>
@@ -3969,8 +4047,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAggregate.EdFi.StudentPersonalIdentificationDocumentQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CourseAttemptResultDescriptorAggregate.EdFi.CourseAttemptResultDescriptorQ" table="CourseAttemptResultDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CourseAttemptResultDescriptorAggregate.EdFi.CourseAttemptResultDescriptorQ" lazy="false" discriminator-value="edfi.CourseAttemptResultDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CourseAttemptResultDescriptor" >
           <key>
             <column name="CourseAttemptResultDescriptorId" />
           </key>
@@ -3990,8 +4070,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.CourseTranscriptAggregate.EdFi.CourseTranscriptQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CourseDefinedByDescriptorAggregate.EdFi.CourseDefinedByDescriptorQ" table="CourseDefinedByDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CourseDefinedByDescriptorAggregate.EdFi.CourseDefinedByDescriptorQ" lazy="false" discriminator-value="edfi.CourseDefinedByDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CourseDefinedByDescriptor" >
           <key>
             <column name="CourseDefinedByDescriptorId" />
           </key>
@@ -4011,8 +4093,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.CourseAggregate.EdFi.CourseQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CourseGPAApplicabilityDescriptorAggregate.EdFi.CourseGPAApplicabilityDescriptorQ" table="CourseGPAApplicabilityDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CourseGPAApplicabilityDescriptorAggregate.EdFi.CourseGPAApplicabilityDescriptorQ" lazy="false" discriminator-value="edfi.CourseGPAApplicabilityDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CourseGPAApplicabilityDescriptor" >
           <key>
             <column name="CourseGPAApplicabilityDescriptorId" />
           </key>
@@ -4032,8 +4116,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.CourseAggregate.EdFi.CourseQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CourseIdentificationSystemDescriptorAggregate.EdFi.CourseIdentificationSystemDescriptorQ" table="CourseIdentificationSystemDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CourseIdentificationSystemDescriptorAggregate.EdFi.CourseIdentificationSystemDescriptorQ" lazy="false" discriminator-value="edfi.CourseIdentificationSystemDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CourseIdentificationSystemDescriptor" >
           <key>
             <column name="CourseIdentificationSystemDescriptorId" />
           </key>
@@ -4060,8 +4146,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.CourseTranscriptAggregate.EdFi.CourseTranscriptAlternativeCourseIdentificationCodeQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CourseLevelCharacteristicDescriptorAggregate.EdFi.CourseLevelCharacteristicDescriptorQ" table="CourseLevelCharacteristicDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CourseLevelCharacteristicDescriptorAggregate.EdFi.CourseLevelCharacteristicDescriptorQ" lazy="false" discriminator-value="edfi.CourseLevelCharacteristicDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CourseLevelCharacteristicDescriptor" >
           <key>
             <column name="CourseLevelCharacteristicDescriptorId" />
           </key>
@@ -4095,8 +4183,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.SectionAggregate.EdFi.SectionCourseLevelCharacteristicQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CourseRepeatCodeDescriptorAggregate.EdFi.CourseRepeatCodeDescriptorQ" table="CourseRepeatCodeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CourseRepeatCodeDescriptorAggregate.EdFi.CourseRepeatCodeDescriptorQ" lazy="false" discriminator-value="edfi.CourseRepeatCodeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CourseRepeatCodeDescriptor" >
           <key>
             <column name="CourseRepeatCodeDescriptorId" />
           </key>
@@ -4116,8 +4206,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.CourseTranscriptAggregate.EdFi.CourseTranscriptQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CredentialFieldDescriptorAggregate.EdFi.CredentialFieldDescriptorQ" table="CredentialFieldDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CredentialFieldDescriptorAggregate.EdFi.CredentialFieldDescriptorQ" lazy="false" discriminator-value="edfi.CredentialFieldDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CredentialFieldDescriptor" >
           <key>
             <column name="CredentialFieldDescriptorId" />
           </key>
@@ -4137,8 +4229,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.CredentialAggregate.EdFi.CredentialQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CredentialTypeDescriptorAggregate.EdFi.CredentialTypeDescriptorQ" table="CredentialTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CredentialTypeDescriptorAggregate.EdFi.CredentialTypeDescriptorQ" lazy="false" discriminator-value="edfi.CredentialTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CredentialTypeDescriptor" >
           <key>
             <column name="CredentialTypeDescriptorId" />
           </key>
@@ -4158,8 +4252,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.CredentialAggregate.EdFi.CredentialQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CreditCategoryDescriptorAggregate.EdFi.CreditCategoryDescriptorQ" table="CreditCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CreditCategoryDescriptorAggregate.EdFi.CreditCategoryDescriptorQ" lazy="false" discriminator-value="edfi.CreditCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CreditCategoryDescriptor" >
           <key>
             <column name="CreditCategoryDescriptorId" />
           </key>
@@ -4186,8 +4282,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.GraduationPlanAggregate.EdFi.GraduationPlanCreditsByCreditCategoryQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CreditTypeDescriptorAggregate.EdFi.CreditTypeDescriptorQ" table="CreditTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CreditTypeDescriptorAggregate.EdFi.CreditTypeDescriptorQ" lazy="false" discriminator-value="edfi.CreditTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CreditTypeDescriptor" >
           <key>
             <column name="CreditTypeDescriptorId" />
           </key>
@@ -4291,8 +4389,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAcademicRecordAggregate.EdFi.StudentAcademicRecordQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CTEProgramServiceDescriptorAggregate.EdFi.CTEProgramServiceDescriptorQ" table="CTEProgramServiceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CTEProgramServiceDescriptorAggregate.EdFi.CTEProgramServiceDescriptorQ" lazy="false" discriminator-value="edfi.CTEProgramServiceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CTEProgramServiceDescriptor" >
           <key>
             <column name="CTEProgramServiceDescriptorId" />
           </key>
@@ -4312,8 +4412,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentCTEProgramAssociationAggregate.EdFi.StudentCTEProgramAssociationCTEProgramServiceQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CurriculumUsedDescriptorAggregate.EdFi.CurriculumUsedDescriptorQ" table="CurriculumUsedDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CurriculumUsedDescriptorAggregate.EdFi.CurriculumUsedDescriptorQ" lazy="false" discriminator-value="edfi.CurriculumUsedDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CurriculumUsedDescriptor" >
           <key>
             <column name="CurriculumUsedDescriptorId" />
           </key>
@@ -4333,8 +4435,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.CourseOfferingAggregate.EdFi.CourseOfferingCurriculumUsedQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.DeliveryMethodDescriptorAggregate.EdFi.DeliveryMethodDescriptorQ" table="DeliveryMethodDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.DeliveryMethodDescriptorAggregate.EdFi.DeliveryMethodDescriptorQ" lazy="false" discriminator-value="edfi.DeliveryMethodDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="DeliveryMethodDescriptor" >
           <key>
             <column name="DeliveryMethodDescriptorId" />
           </key>
@@ -4368,8 +4472,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.InterventionStudyAggregate.EdFi.InterventionStudyQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.DiagnosisDescriptorAggregate.EdFi.DiagnosisDescriptorQ" table="DiagnosisDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.DiagnosisDescriptorAggregate.EdFi.DiagnosisDescriptorQ" lazy="false" discriminator-value="edfi.DiagnosisDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="DiagnosisDescriptor" >
           <key>
             <column name="DiagnosisDescriptorId" />
           </key>
@@ -4410,8 +4516,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentInterventionAssociationAggregate.EdFi.StudentInterventionAssociationInterventionEffectivenessQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.DiplomaLevelDescriptorAggregate.EdFi.DiplomaLevelDescriptorQ" table="DiplomaLevelDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.DiplomaLevelDescriptorAggregate.EdFi.DiplomaLevelDescriptorQ" lazy="false" discriminator-value="edfi.DiplomaLevelDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="DiplomaLevelDescriptor" >
           <key>
             <column name="DiplomaLevelDescriptorId" />
           </key>
@@ -4431,8 +4539,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAcademicRecordAggregate.EdFi.StudentAcademicRecordDiplomaQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.DiplomaTypeDescriptorAggregate.EdFi.DiplomaTypeDescriptorQ" table="DiplomaTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.DiplomaTypeDescriptorAggregate.EdFi.DiplomaTypeDescriptorQ" lazy="false" discriminator-value="edfi.DiplomaTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="DiplomaTypeDescriptor" >
           <key>
             <column name="DiplomaTypeDescriptorId" />
           </key>
@@ -4452,8 +4562,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAcademicRecordAggregate.EdFi.StudentAcademicRecordDiplomaQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.DisabilityDescriptorAggregate.EdFi.DisabilityDescriptorQ" table="DisabilityDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.DisabilityDescriptorAggregate.EdFi.DisabilityDescriptorQ" lazy="false" discriminator-value="edfi.DisabilityDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="DisabilityDescriptor" >
           <key>
             <column name="DisabilityDescriptorId" />
           </key>
@@ -4480,8 +4592,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSpecialEducationProgramAssociationAggregate.EdFi.StudentSpecialEducationProgramAssociationDisabilityQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.DisabilityDesignationDescriptorAggregate.EdFi.DisabilityDesignationDescriptorQ" table="DisabilityDesignationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.DisabilityDesignationDescriptorAggregate.EdFi.DisabilityDesignationDescriptorQ" lazy="false" discriminator-value="edfi.DisabilityDesignationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="DisabilityDesignationDescriptor" >
           <key>
             <column name="DisabilityDesignationDescriptorId" />
           </key>
@@ -4508,8 +4622,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSpecialEducationProgramAssociationAggregate.EdFi.StudentSpecialEducationProgramAssociationDisabilityDesignationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.DisabilityDeterminationSourceTypeDescriptorAggregate.EdFi.DisabilityDeterminationSourceTypeDescriptorQ" table="DisabilityDeterminationSourceTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.DisabilityDeterminationSourceTypeDescriptorAggregate.EdFi.DisabilityDeterminationSourceTypeDescriptorQ" lazy="false" discriminator-value="edfi.DisabilityDeterminationSourceTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="DisabilityDeterminationSourceTypeDescriptor" >
           <key>
             <column name="DisabilityDeterminationSourceTypeDescriptorId" />
           </key>
@@ -4536,8 +4652,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSpecialEducationProgramAssociationAggregate.EdFi.StudentSpecialEducationProgramAssociationDisabilityQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.DisciplineActionLengthDifferenceReasonDescriptorAggregate.EdFi.DisciplineActionLengthDifferenceReasonDescriptorQ" table="DisciplineActionLengthDifferenceReasonDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.DisciplineActionLengthDifferenceReasonDescriptorAggregate.EdFi.DisciplineActionLengthDifferenceReasonDescriptorQ" lazy="false" discriminator-value="edfi.DisciplineActionLengthDifferenceReasonDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="DisciplineActionLengthDifferenceReasonDescriptor" >
           <key>
             <column name="DisciplineActionLengthDifferenceReasonDescriptorId" />
           </key>
@@ -4557,8 +4675,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.DisciplineActionAggregate.EdFi.DisciplineActionQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.DisciplineDescriptorAggregate.EdFi.DisciplineDescriptorQ" table="DisciplineDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.DisciplineDescriptorAggregate.EdFi.DisciplineDescriptorQ" lazy="false" discriminator-value="edfi.DisciplineDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="DisciplineDescriptor" >
           <key>
             <column name="DisciplineDescriptorId" />
           </key>
@@ -4578,8 +4698,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.DisciplineActionAggregate.EdFi.DisciplineActionDisciplineQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.DisciplineIncidentParticipationCodeDescriptorAggregate.EdFi.DisciplineIncidentParticipationCodeDescriptorQ" table="DisciplineIncidentParticipationCodeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.DisciplineIncidentParticipationCodeDescriptorAggregate.EdFi.DisciplineIncidentParticipationCodeDescriptorQ" lazy="false" discriminator-value="edfi.DisciplineIncidentParticipationCodeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="DisciplineIncidentParticipationCodeDescriptor" >
           <key>
             <column name="DisciplineIncidentParticipationCodeDescriptorId" />
           </key>
@@ -4620,8 +4742,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentDisciplineIncidentNonOffenderAssociationAggregate.EdFi.StudentDisciplineIncidentNonOffenderAssociationDisciplineIncidentParticipationCodeQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.EducationalEnvironmentDescriptorAggregate.EdFi.EducationalEnvironmentDescriptorQ" table="EducationalEnvironmentDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.EducationalEnvironmentDescriptorAggregate.EdFi.EducationalEnvironmentDescriptorQ" lazy="false" discriminator-value="edfi.EducationalEnvironmentDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="EducationalEnvironmentDescriptor" >
           <key>
             <column name="EducationalEnvironmentDescriptorId" />
           </key>
@@ -4676,8 +4800,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSectionAttendanceEventAggregate.EdFi.StudentSectionAttendanceEventQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.EducationOrganizationAssociationTypeDescriptorAggregate.EdFi.EducationOrganizationAssociationTypeDescriptorQ" table="EducationOrganizationAssociationTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.EducationOrganizationAssociationTypeDescriptorAggregate.EdFi.EducationOrganizationAssociationTypeDescriptorQ" lazy="false" discriminator-value="edfi.EducationOrganizationAssociationTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="EducationOrganizationAssociationTypeDescriptor" >
           <key>
             <column name="EducationOrganizationAssociationTypeDescriptorId" />
           </key>
@@ -4697,8 +4823,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAssessmentEducationOrganizationAssociationAggregate.EdFi.StudentAssessmentEducationOrganizationAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.EducationOrganizationCategoryDescriptorAggregate.EdFi.EducationOrganizationCategoryDescriptorQ" table="EducationOrganizationCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.EducationOrganizationCategoryDescriptorAggregate.EdFi.EducationOrganizationCategoryDescriptorQ" lazy="false" discriminator-value="edfi.EducationOrganizationCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="EducationOrganizationCategoryDescriptor" >
           <key>
             <column name="EducationOrganizationCategoryDescriptorId" />
           </key>
@@ -4718,8 +4846,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.EducationOrganizationAggregate.EdFi.EducationOrganizationCategoryQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.EducationOrganizationIdentificationSystemDescriptorAggregate.EdFi.EducationOrganizationIdentificationSystemDescriptorQ" table="EducationOrganizationIdentificationSystemDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.EducationOrganizationIdentificationSystemDescriptorAggregate.EdFi.EducationOrganizationIdentificationSystemDescriptorQ" lazy="false" discriminator-value="edfi.EducationOrganizationIdentificationSystemDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="EducationOrganizationIdentificationSystemDescriptor" >
           <key>
             <column name="EducationOrganizationIdentificationSystemDescriptorId" />
           </key>
@@ -4739,8 +4869,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.EducationOrganizationAggregate.EdFi.EducationOrganizationIdentificationCodeQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.EducationPlanDescriptorAggregate.EdFi.EducationPlanDescriptorQ" table="EducationPlanDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.EducationPlanDescriptorAggregate.EdFi.EducationPlanDescriptorQ" lazy="false" discriminator-value="edfi.EducationPlanDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="EducationPlanDescriptor" >
           <key>
             <column name="EducationPlanDescriptorId" />
           </key>
@@ -4760,8 +4892,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSchoolAssociationAggregate.EdFi.StudentSchoolAssociationEducationPlanQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ElectronicMailTypeDescriptorAggregate.EdFi.ElectronicMailTypeDescriptorQ" table="ElectronicMailTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ElectronicMailTypeDescriptorAggregate.EdFi.ElectronicMailTypeDescriptorQ" lazy="false" discriminator-value="edfi.ElectronicMailTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ElectronicMailTypeDescriptor" >
           <key>
             <column name="ElectronicMailTypeDescriptorId" />
           </key>
@@ -4795,8 +4929,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationElectronicMailQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.EmploymentStatusDescriptorAggregate.EdFi.EmploymentStatusDescriptorQ" table="EmploymentStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.EmploymentStatusDescriptorAggregate.EdFi.EmploymentStatusDescriptorQ" lazy="false" discriminator-value="edfi.EmploymentStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="EmploymentStatusDescriptor" >
           <key>
             <column name="EmploymentStatusDescriptorId" />
           </key>
@@ -4823,8 +4959,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StaffEducationOrganizationEmploymentAssociationAggregate.EdFi.StaffEducationOrganizationEmploymentAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.EntryGradeLevelReasonDescriptorAggregate.EdFi.EntryGradeLevelReasonDescriptorQ" table="EntryGradeLevelReasonDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.EntryGradeLevelReasonDescriptorAggregate.EdFi.EntryGradeLevelReasonDescriptorQ" lazy="false" discriminator-value="edfi.EntryGradeLevelReasonDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="EntryGradeLevelReasonDescriptor" >
           <key>
             <column name="EntryGradeLevelReasonDescriptorId" />
           </key>
@@ -4844,8 +4982,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSchoolAssociationAggregate.EdFi.StudentSchoolAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.EntryTypeDescriptorAggregate.EdFi.EntryTypeDescriptorQ" table="EntryTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.EntryTypeDescriptorAggregate.EdFi.EntryTypeDescriptorQ" lazy="false" discriminator-value="edfi.EntryTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="EntryTypeDescriptor" >
           <key>
             <column name="EntryTypeDescriptorId" />
           </key>
@@ -4865,8 +5005,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSchoolAssociationAggregate.EdFi.StudentSchoolAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.EventCircumstanceDescriptorAggregate.EdFi.EventCircumstanceDescriptorQ" table="EventCircumstanceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.EventCircumstanceDescriptorAggregate.EdFi.EventCircumstanceDescriptorQ" lazy="false" discriminator-value="edfi.EventCircumstanceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="EventCircumstanceDescriptor" >
           <key>
             <column name="EventCircumstanceDescriptorId" />
           </key>
@@ -4886,8 +5028,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAssessmentAggregate.EdFi.StudentAssessmentQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ExitWithdrawTypeDescriptorAggregate.EdFi.ExitWithdrawTypeDescriptorQ" table="ExitWithdrawTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ExitWithdrawTypeDescriptorAggregate.EdFi.ExitWithdrawTypeDescriptorQ" lazy="false" discriminator-value="edfi.ExitWithdrawTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ExitWithdrawTypeDescriptor" >
           <key>
             <column name="ExitWithdrawTypeDescriptorId" />
           </key>
@@ -4907,8 +5051,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSchoolAssociationAggregate.EdFi.StudentSchoolAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.FinancialCollectionDescriptorAggregate.EdFi.FinancialCollectionDescriptorQ" table="FinancialCollectionDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.FinancialCollectionDescriptorAggregate.EdFi.FinancialCollectionDescriptorQ" lazy="false" discriminator-value="edfi.FinancialCollectionDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="FinancialCollectionDescriptor" >
           <key>
             <column name="FinancialCollectionDescriptorId" />
           </key>
@@ -4956,8 +5102,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.LocalPayrollAggregate.EdFi.LocalPayrollQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.GradebookEntryTypeDescriptorAggregate.EdFi.GradebookEntryTypeDescriptorQ" table="GradebookEntryTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.GradebookEntryTypeDescriptorAggregate.EdFi.GradebookEntryTypeDescriptorQ" lazy="false" discriminator-value="edfi.GradebookEntryTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="GradebookEntryTypeDescriptor" >
           <key>
             <column name="GradebookEntryTypeDescriptorId" />
           </key>
@@ -4977,8 +5125,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.GradebookEntryAggregate.EdFi.GradebookEntryQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.GradeLevelDescriptorAggregate.EdFi.GradeLevelDescriptorQ" table="GradeLevelDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.GradeLevelDescriptorAggregate.EdFi.GradeLevelDescriptorQ" lazy="false" discriminator-value="edfi.GradeLevelDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="GradeLevelDescriptor" >
           <key>
             <column name="GradeLevelDescriptorId" />
           </key>
@@ -5152,8 +5302,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSchoolAssociationAggregate.EdFi.StudentSchoolAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.GradePointAverageTypeDescriptorAggregate.EdFi.GradePointAverageTypeDescriptorQ" table="GradePointAverageTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.GradePointAverageTypeDescriptorAggregate.EdFi.GradePointAverageTypeDescriptorQ" lazy="false" discriminator-value="edfi.GradePointAverageTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="GradePointAverageTypeDescriptor" >
           <key>
             <column name="GradePointAverageTypeDescriptorId" />
           </key>
@@ -5180,8 +5332,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAcademicRecordAggregate.EdFi.StudentAcademicRecordGradePointAverageQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.GradeTypeDescriptorAggregate.EdFi.GradeTypeDescriptorQ" table="GradeTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.GradeTypeDescriptorAggregate.EdFi.GradeTypeDescriptorQ" lazy="false" discriminator-value="edfi.GradeTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="GradeTypeDescriptor" >
           <key>
             <column name="GradeTypeDescriptorId" />
           </key>
@@ -5201,8 +5355,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.GradeAggregate.EdFi.GradeQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.GradingPeriodDescriptorAggregate.EdFi.GradingPeriodDescriptorQ" table="GradingPeriodDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.GradingPeriodDescriptorAggregate.EdFi.GradingPeriodDescriptorQ" lazy="false" discriminator-value="edfi.GradingPeriodDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="GradingPeriodDescriptor" >
           <key>
             <column name="GradingPeriodDescriptorId" />
           </key>
@@ -5222,8 +5378,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.GradingPeriodAggregate.EdFi.GradingPeriodQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.GraduationPlanTypeDescriptorAggregate.EdFi.GraduationPlanTypeDescriptorQ" table="GraduationPlanTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.GraduationPlanTypeDescriptorAggregate.EdFi.GraduationPlanTypeDescriptorQ" lazy="false" discriminator-value="edfi.GraduationPlanTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="GraduationPlanTypeDescriptor" >
           <key>
             <column name="GraduationPlanTypeDescriptorId" />
           </key>
@@ -5243,8 +5401,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.GraduationPlanAggregate.EdFi.GraduationPlanQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.GunFreeSchoolsActReportingStatusDescriptorAggregate.EdFi.GunFreeSchoolsActReportingStatusDescriptorQ" table="GunFreeSchoolsActReportingStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.GunFreeSchoolsActReportingStatusDescriptorAggregate.EdFi.GunFreeSchoolsActReportingStatusDescriptorQ" lazy="false" discriminator-value="edfi.GunFreeSchoolsActReportingStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="GunFreeSchoolsActReportingStatusDescriptor" >
           <key>
             <column name="GunFreeSchoolsActReportingStatusDescriptorId" />
           </key>
@@ -5264,8 +5424,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.LocalEducationAgencyAggregate.EdFi.LocalEducationAgencyAccountabilityQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.HomelessPrimaryNighttimeResidenceDescriptorAggregate.EdFi.HomelessPrimaryNighttimeResidenceDescriptorQ" table="HomelessPrimaryNighttimeResidenceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.HomelessPrimaryNighttimeResidenceDescriptorAggregate.EdFi.HomelessPrimaryNighttimeResidenceDescriptorQ" lazy="false" discriminator-value="edfi.HomelessPrimaryNighttimeResidenceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="HomelessPrimaryNighttimeResidenceDescriptor" >
           <key>
             <column name="HomelessPrimaryNighttimeResidenceDescriptorId" />
           </key>
@@ -5285,8 +5447,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentHomelessProgramAssociationAggregate.EdFi.StudentHomelessProgramAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.HomelessProgramServiceDescriptorAggregate.EdFi.HomelessProgramServiceDescriptorQ" table="HomelessProgramServiceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.HomelessProgramServiceDescriptorAggregate.EdFi.HomelessProgramServiceDescriptorQ" lazy="false" discriminator-value="edfi.HomelessProgramServiceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="HomelessProgramServiceDescriptor" >
           <key>
             <column name="HomelessProgramServiceDescriptorId" />
           </key>
@@ -5306,8 +5470,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentHomelessProgramAssociationAggregate.EdFi.StudentHomelessProgramAssociationHomelessProgramServiceQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.IdentificationDocumentUseDescriptorAggregate.EdFi.IdentificationDocumentUseDescriptorQ" table="IdentificationDocumentUseDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.IdentificationDocumentUseDescriptorAggregate.EdFi.IdentificationDocumentUseDescriptorQ" lazy="false" discriminator-value="edfi.IdentificationDocumentUseDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="IdentificationDocumentUseDescriptor" >
           <key>
             <column name="IdentificationDocumentUseDescriptorId" />
           </key>
@@ -5355,8 +5521,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAggregate.EdFi.StudentPersonalIdentificationDocumentQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.IncidentLocationDescriptorAggregate.EdFi.IncidentLocationDescriptorQ" table="IncidentLocationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.IncidentLocationDescriptorAggregate.EdFi.IncidentLocationDescriptorQ" lazy="false" discriminator-value="edfi.IncidentLocationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="IncidentLocationDescriptor" >
           <key>
             <column name="IncidentLocationDescriptorId" />
           </key>
@@ -5376,8 +5544,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.DisciplineIncidentAggregate.EdFi.DisciplineIncidentQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.IndicatorDescriptorAggregate.EdFi.IndicatorDescriptorQ" table="IndicatorDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.IndicatorDescriptorAggregate.EdFi.IndicatorDescriptorQ" lazy="false" discriminator-value="edfi.IndicatorDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="IndicatorDescriptor" >
           <key>
             <column name="IndicatorDescriptorId" />
           </key>
@@ -5397,8 +5567,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.EducationOrganizationAggregate.EdFi.EducationOrganizationIndicatorQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.IndicatorGroupDescriptorAggregate.EdFi.IndicatorGroupDescriptorQ" table="IndicatorGroupDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.IndicatorGroupDescriptorAggregate.EdFi.IndicatorGroupDescriptorQ" lazy="false" discriminator-value="edfi.IndicatorGroupDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="IndicatorGroupDescriptor" >
           <key>
             <column name="IndicatorGroupDescriptorId" />
           </key>
@@ -5418,8 +5590,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.EducationOrganizationAggregate.EdFi.EducationOrganizationIndicatorQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.IndicatorLevelDescriptorAggregate.EdFi.IndicatorLevelDescriptorQ" table="IndicatorLevelDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.IndicatorLevelDescriptorAggregate.EdFi.IndicatorLevelDescriptorQ" lazy="false" discriminator-value="edfi.IndicatorLevelDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="IndicatorLevelDescriptor" >
           <key>
             <column name="IndicatorLevelDescriptorId" />
           </key>
@@ -5439,8 +5613,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.EducationOrganizationAggregate.EdFi.EducationOrganizationIndicatorQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.InstitutionTelephoneNumberTypeDescriptorAggregate.EdFi.InstitutionTelephoneNumberTypeDescriptorQ" table="InstitutionTelephoneNumberTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.InstitutionTelephoneNumberTypeDescriptorAggregate.EdFi.InstitutionTelephoneNumberTypeDescriptorQ" lazy="false" discriminator-value="edfi.InstitutionTelephoneNumberTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="InstitutionTelephoneNumberTypeDescriptor" >
           <key>
             <column name="InstitutionTelephoneNumberTypeDescriptorId" />
           </key>
@@ -5460,8 +5636,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.EducationOrganizationAggregate.EdFi.EducationOrganizationInstitutionTelephoneQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.InteractivityStyleDescriptorAggregate.EdFi.InteractivityStyleDescriptorQ" table="InteractivityStyleDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.InteractivityStyleDescriptorAggregate.EdFi.InteractivityStyleDescriptorQ" lazy="false" discriminator-value="edfi.InteractivityStyleDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="InteractivityStyleDescriptor" >
           <key>
             <column name="InteractivityStyleDescriptorId" />
           </key>
@@ -5481,8 +5659,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.EducationContentAggregate.EdFi.EducationContentQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.InternetAccessDescriptorAggregate.EdFi.InternetAccessDescriptorQ" table="InternetAccessDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.InternetAccessDescriptorAggregate.EdFi.InternetAccessDescriptorQ" lazy="false" discriminator-value="edfi.InternetAccessDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="InternetAccessDescriptor" >
           <key>
             <column name="InternetAccessDescriptorId" />
           </key>
@@ -5502,8 +5682,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.SchoolAggregate.EdFi.SchoolQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.InternetAccessTypeInResidenceDescriptorAggregate.EdFi.InternetAccessTypeInResidenceDescriptorQ" table="InternetAccessTypeInResidenceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.InternetAccessTypeInResidenceDescriptorAggregate.EdFi.InternetAccessTypeInResidenceDescriptorQ" lazy="false" discriminator-value="edfi.InternetAccessTypeInResidenceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="InternetAccessTypeInResidenceDescriptor" >
           <key>
             <column name="InternetAccessTypeInResidenceDescriptorId" />
           </key>
@@ -5523,8 +5705,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.InternetPerformanceInResidenceDescriptorAggregate.EdFi.InternetPerformanceInResidenceDescriptorQ" table="InternetPerformanceInResidenceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.InternetPerformanceInResidenceDescriptorAggregate.EdFi.InternetPerformanceInResidenceDescriptorQ" lazy="false" discriminator-value="edfi.InternetPerformanceInResidenceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="InternetPerformanceInResidenceDescriptor" >
           <key>
             <column name="InternetPerformanceInResidenceDescriptorId" />
           </key>
@@ -5544,8 +5728,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.InterventionClassDescriptorAggregate.EdFi.InterventionClassDescriptorQ" table="InterventionClassDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.InterventionClassDescriptorAggregate.EdFi.InterventionClassDescriptorQ" lazy="false" discriminator-value="edfi.InterventionClassDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="InterventionClassDescriptor" >
           <key>
             <column name="InterventionClassDescriptorId" />
           </key>
@@ -5579,8 +5765,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.InterventionStudyAggregate.EdFi.InterventionStudyQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.InterventionEffectivenessRatingDescriptorAggregate.EdFi.InterventionEffectivenessRatingDescriptorQ" table="InterventionEffectivenessRatingDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.InterventionEffectivenessRatingDescriptorAggregate.EdFi.InterventionEffectivenessRatingDescriptorQ" lazy="false" discriminator-value="edfi.InterventionEffectivenessRatingDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="InterventionEffectivenessRatingDescriptor" >
           <key>
             <column name="InterventionEffectivenessRatingDescriptorId" />
           </key>
@@ -5607,8 +5795,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentInterventionAssociationAggregate.EdFi.StudentInterventionAssociationInterventionEffectivenessQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LanguageDescriptorAggregate.EdFi.LanguageDescriptorQ" table="LanguageDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LanguageDescriptorAggregate.EdFi.LanguageDescriptorQ" lazy="false" discriminator-value="edfi.LanguageDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LanguageDescriptor" >
           <key>
             <column name="LanguageDescriptorId" />
           </key>
@@ -5670,8 +5860,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationLanguageQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LanguageInstructionProgramServiceDescriptorAggregate.EdFi.LanguageInstructionProgramServiceDescriptorQ" table="LanguageInstructionProgramServiceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LanguageInstructionProgramServiceDescriptorAggregate.EdFi.LanguageInstructionProgramServiceDescriptorQ" lazy="false" discriminator-value="edfi.LanguageInstructionProgramServiceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LanguageInstructionProgramServiceDescriptor" >
           <key>
             <column name="LanguageInstructionProgramServiceDescriptorId" />
           </key>
@@ -5691,8 +5883,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentLanguageInstructionProgramAssociationAggregate.EdFi.StudentLanguageInstructionProgramAssociationLanguageInstructionProgramServiceQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LanguageUseDescriptorAggregate.EdFi.LanguageUseDescriptorQ" table="LanguageUseDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LanguageUseDescriptorAggregate.EdFi.LanguageUseDescriptorQ" lazy="false" discriminator-value="edfi.LanguageUseDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LanguageUseDescriptor" >
           <key>
             <column name="LanguageUseDescriptorId" />
           </key>
@@ -5726,8 +5920,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationLanguageUseQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LearningStandardCategoryDescriptorAggregate.EdFi.LearningStandardCategoryDescriptorQ" table="LearningStandardCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LearningStandardCategoryDescriptorAggregate.EdFi.LearningStandardCategoryDescriptorQ" lazy="false" discriminator-value="edfi.LearningStandardCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LearningStandardCategoryDescriptor" >
           <key>
             <column name="LearningStandardCategoryDescriptorId" />
           </key>
@@ -5747,8 +5943,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.LearningStandardAggregate.EdFi.LearningStandardQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LearningStandardEquivalenceStrengthDescriptorAggregate.EdFi.LearningStandardEquivalenceStrengthDescriptorQ" table="LearningStandardEquivalenceStrengthDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LearningStandardEquivalenceStrengthDescriptorAggregate.EdFi.LearningStandardEquivalenceStrengthDescriptorQ" lazy="false" discriminator-value="edfi.LearningStandardEquivalenceStrengthDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LearningStandardEquivalenceStrengthDescriptor" >
           <key>
             <column name="LearningStandardEquivalenceStrengthDescriptorId" />
           </key>
@@ -5768,8 +5966,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.LearningStandardEquivalenceAssociationAggregate.EdFi.LearningStandardEquivalenceAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LearningStandardScopeDescriptorAggregate.EdFi.LearningStandardScopeDescriptorQ" table="LearningStandardScopeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LearningStandardScopeDescriptorAggregate.EdFi.LearningStandardScopeDescriptorQ" lazy="false" discriminator-value="edfi.LearningStandardScopeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LearningStandardScopeDescriptor" >
           <key>
             <column name="LearningStandardScopeDescriptorId" />
           </key>
@@ -5789,8 +5989,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.LearningStandardAggregate.EdFi.LearningStandardQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LevelOfEducationDescriptorAggregate.EdFi.LevelOfEducationDescriptorQ" table="LevelOfEducationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LevelOfEducationDescriptorAggregate.EdFi.LevelOfEducationDescriptorQ" lazy="false" discriminator-value="edfi.LevelOfEducationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LevelOfEducationDescriptor" >
           <key>
             <column name="LevelOfEducationDescriptorId" />
           </key>
@@ -5817,8 +6019,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StaffAggregate.EdFi.StaffQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LicenseStatusDescriptorAggregate.EdFi.LicenseStatusDescriptorQ" table="LicenseStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LicenseStatusDescriptorAggregate.EdFi.LicenseStatusDescriptorQ" lazy="false" discriminator-value="edfi.LicenseStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LicenseStatusDescriptor" >
           <key>
             <column name="LicenseStatusDescriptorId" />
           </key>
@@ -5838,8 +6042,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.CommunityProviderLicenseAggregate.EdFi.CommunityProviderLicenseQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LicenseTypeDescriptorAggregate.EdFi.LicenseTypeDescriptorQ" table="LicenseTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LicenseTypeDescriptorAggregate.EdFi.LicenseTypeDescriptorQ" lazy="false" discriminator-value="edfi.LicenseTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LicenseTypeDescriptor" >
           <key>
             <column name="LicenseTypeDescriptorId" />
           </key>
@@ -5859,8 +6065,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.CommunityProviderLicenseAggregate.EdFi.CommunityProviderLicenseQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LimitedEnglishProficiencyDescriptorAggregate.EdFi.LimitedEnglishProficiencyDescriptorQ" table="LimitedEnglishProficiencyDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LimitedEnglishProficiencyDescriptorAggregate.EdFi.LimitedEnglishProficiencyDescriptorQ" lazy="false" discriminator-value="edfi.LimitedEnglishProficiencyDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LimitedEnglishProficiencyDescriptor" >
           <key>
             <column name="LimitedEnglishProficiencyDescriptorId" />
           </key>
@@ -5880,8 +6088,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LocaleDescriptorAggregate.EdFi.LocaleDescriptorQ" table="LocaleDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LocaleDescriptorAggregate.EdFi.LocaleDescriptorQ" lazy="false" discriminator-value="edfi.LocaleDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LocaleDescriptor" >
           <key>
             <column name="LocaleDescriptorId" />
           </key>
@@ -5929,8 +6139,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationAddressQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LocalEducationAgencyCategoryDescriptorAggregate.EdFi.LocalEducationAgencyCategoryDescriptorQ" table="LocalEducationAgencyCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LocalEducationAgencyCategoryDescriptorAggregate.EdFi.LocalEducationAgencyCategoryDescriptorQ" lazy="false" discriminator-value="edfi.LocalEducationAgencyCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LocalEducationAgencyCategoryDescriptor" >
           <key>
             <column name="LocalEducationAgencyCategoryDescriptorId" />
           </key>
@@ -5950,8 +6162,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.LocalEducationAgencyAggregate.EdFi.LocalEducationAgencyQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.MagnetSpecialProgramEmphasisSchoolDescriptorAggregate.EdFi.MagnetSpecialProgramEmphasisSchoolDescriptorQ" table="MagnetSpecialProgramEmphasisSchoolDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.MagnetSpecialProgramEmphasisSchoolDescriptorAggregate.EdFi.MagnetSpecialProgramEmphasisSchoolDescriptorQ" lazy="false" discriminator-value="edfi.MagnetSpecialProgramEmphasisSchoolDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="MagnetSpecialProgramEmphasisSchoolDescriptor" >
           <key>
             <column name="MagnetSpecialProgramEmphasisSchoolDescriptorId" />
           </key>
@@ -5971,8 +6185,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.SchoolAggregate.EdFi.SchoolQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.MediumOfInstructionDescriptorAggregate.EdFi.MediumOfInstructionDescriptorQ" table="MediumOfInstructionDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.MediumOfInstructionDescriptorAggregate.EdFi.MediumOfInstructionDescriptorQ" lazy="false" discriminator-value="edfi.MediumOfInstructionDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="MediumOfInstructionDescriptor" >
           <key>
             <column name="MediumOfInstructionDescriptorId" />
           </key>
@@ -5999,8 +6215,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.SectionAggregate.EdFi.SectionQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.MethodCreditEarnedDescriptorAggregate.EdFi.MethodCreditEarnedDescriptorQ" table="MethodCreditEarnedDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.MethodCreditEarnedDescriptorAggregate.EdFi.MethodCreditEarnedDescriptorQ" lazy="false" discriminator-value="edfi.MethodCreditEarnedDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="MethodCreditEarnedDescriptor" >
           <key>
             <column name="MethodCreditEarnedDescriptorId" />
           </key>
@@ -6027,8 +6245,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.CourseTranscriptAggregate.EdFi.CourseTranscriptPartialCourseTranscriptAwardsQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.MigrantEducationProgramServiceDescriptorAggregate.EdFi.MigrantEducationProgramServiceDescriptorQ" table="MigrantEducationProgramServiceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.MigrantEducationProgramServiceDescriptorAggregate.EdFi.MigrantEducationProgramServiceDescriptorQ" lazy="false" discriminator-value="edfi.MigrantEducationProgramServiceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="MigrantEducationProgramServiceDescriptor" >
           <key>
             <column name="MigrantEducationProgramServiceDescriptorId" />
           </key>
@@ -6048,8 +6268,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentMigrantEducationProgramAssociationAggregate.EdFi.StudentMigrantEducationProgramAssociationMigrantEducationProgramServiceQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ModelEntityDescriptorAggregate.EdFi.ModelEntityDescriptorQ" table="ModelEntityDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ModelEntityDescriptorAggregate.EdFi.ModelEntityDescriptorQ" lazy="false" discriminator-value="edfi.ModelEntityDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ModelEntityDescriptor" >
           <key>
             <column name="ModelEntityDescriptorId" />
           </key>
@@ -6069,8 +6291,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.DescriptorMappingAggregate.EdFi.DescriptorMappingModelEntityQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.MonitoredDescriptorAggregate.EdFi.MonitoredDescriptorQ" table="MonitoredDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.MonitoredDescriptorAggregate.EdFi.MonitoredDescriptorQ" lazy="false" discriminator-value="edfi.MonitoredDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="MonitoredDescriptor" >
           <key>
             <column name="MonitoredDescriptorId" />
           </key>
@@ -6090,8 +6314,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentLanguageInstructionProgramAssociationAggregate.EdFi.StudentLanguageInstructionProgramAssociationEnglishLanguageProficiencyAssessmentQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.NeglectedOrDelinquentProgramDescriptorAggregate.EdFi.NeglectedOrDelinquentProgramDescriptorQ" table="NeglectedOrDelinquentProgramDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.NeglectedOrDelinquentProgramDescriptorAggregate.EdFi.NeglectedOrDelinquentProgramDescriptorQ" lazy="false" discriminator-value="edfi.NeglectedOrDelinquentProgramDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="NeglectedOrDelinquentProgramDescriptor" >
           <key>
             <column name="NeglectedOrDelinquentProgramDescriptorId" />
           </key>
@@ -6111,8 +6337,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentNeglectedOrDelinquentProgramAssociationAggregate.EdFi.StudentNeglectedOrDelinquentProgramAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.NeglectedOrDelinquentProgramServiceDescriptorAggregate.EdFi.NeglectedOrDelinquentProgramServiceDescriptorQ" table="NeglectedOrDelinquentProgramServiceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.NeglectedOrDelinquentProgramServiceDescriptorAggregate.EdFi.NeglectedOrDelinquentProgramServiceDescriptorQ" lazy="false" discriminator-value="edfi.NeglectedOrDelinquentProgramServiceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="NeglectedOrDelinquentProgramServiceDescriptor" >
           <key>
             <column name="NeglectedOrDelinquentProgramServiceDescriptorId" />
           </key>
@@ -6132,8 +6360,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentNeglectedOrDelinquentProgramAssociationAggregate.EdFi.StudentNeglectedOrDelinquentProgramAssociationNeglectedOrDelinquentProgramServiceQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.NetworkPurposeDescriptorAggregate.EdFi.NetworkPurposeDescriptorQ" table="NetworkPurposeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.NetworkPurposeDescriptorAggregate.EdFi.NetworkPurposeDescriptorQ" lazy="false" discriminator-value="edfi.NetworkPurposeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="NetworkPurposeDescriptor" >
           <key>
             <column name="NetworkPurposeDescriptorId" />
           </key>
@@ -6153,8 +6383,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.EducationOrganizationNetworkAggregate.EdFi.EducationOrganizationNetworkQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.OldEthnicityDescriptorAggregate.EdFi.OldEthnicityDescriptorQ" table="OldEthnicityDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.OldEthnicityDescriptorAggregate.EdFi.OldEthnicityDescriptorQ" lazy="false" discriminator-value="edfi.OldEthnicityDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="OldEthnicityDescriptor" >
           <key>
             <column name="OldEthnicityDescriptorId" />
           </key>
@@ -6181,8 +6413,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.OperationalStatusDescriptorAggregate.EdFi.OperationalStatusDescriptorQ" table="OperationalStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.OperationalStatusDescriptorAggregate.EdFi.OperationalStatusDescriptorQ" lazy="false" discriminator-value="edfi.OperationalStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="OperationalStatusDescriptor" >
           <key>
             <column name="OperationalStatusDescriptorId" />
           </key>
@@ -6202,8 +6436,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.EducationOrganizationAggregate.EdFi.EducationOrganizationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.OtherNameTypeDescriptorAggregate.EdFi.OtherNameTypeDescriptorQ" table="OtherNameTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.OtherNameTypeDescriptorAggregate.EdFi.OtherNameTypeDescriptorQ" lazy="false" discriminator-value="edfi.OtherNameTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="OtherNameTypeDescriptor" >
           <key>
             <column name="OtherNameTypeDescriptorId" />
           </key>
@@ -6237,8 +6473,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAggregate.EdFi.StudentOtherNameQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ParticipationDescriptorAggregate.EdFi.ParticipationDescriptorQ" table="ParticipationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ParticipationDescriptorAggregate.EdFi.ParticipationDescriptorQ" lazy="false" discriminator-value="edfi.ParticipationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ParticipationDescriptor" >
           <key>
             <column name="ParticipationDescriptorId" />
           </key>
@@ -6258,8 +6496,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentLanguageInstructionProgramAssociationAggregate.EdFi.StudentLanguageInstructionProgramAssociationEnglishLanguageProficiencyAssessmentQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ParticipationStatusDescriptorAggregate.EdFi.ParticipationStatusDescriptorQ" table="ParticipationStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ParticipationStatusDescriptorAggregate.EdFi.ParticipationStatusDescriptorQ" lazy="false" discriminator-value="edfi.ParticipationStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ParticipationStatusDescriptor" >
           <key>
             <column name="ParticipationStatusDescriptorId" />
           </key>
@@ -6286,8 +6526,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.GeneralStudentProgramAssociationAggregate.EdFi.GeneralStudentProgramAssociationProgramParticipationStatusQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PerformanceBaseConversionDescriptorAggregate.EdFi.PerformanceBaseConversionDescriptorQ" table="PerformanceBaseConversionDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PerformanceBaseConversionDescriptorAggregate.EdFi.PerformanceBaseConversionDescriptorQ" lazy="false" discriminator-value="edfi.PerformanceBaseConversionDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PerformanceBaseConversionDescriptor" >
           <key>
             <column name="PerformanceBaseConversionDescriptorId" />
           </key>
@@ -6314,8 +6556,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.GradeAggregate.EdFi.GradeLearningStandardGradeQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PerformanceLevelDescriptorAggregate.EdFi.PerformanceLevelDescriptorQ" table="PerformanceLevelDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PerformanceLevelDescriptorAggregate.EdFi.PerformanceLevelDescriptorQ" lazy="false" discriminator-value="edfi.PerformanceLevelDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PerformanceLevelDescriptor" >
           <key>
             <column name="PerformanceLevelDescriptorId" />
           </key>
@@ -6363,8 +6607,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAssessmentAggregate.EdFi.StudentAssessmentStudentObjectiveAssessmentPerformanceLevelQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PersonalInformationVerificationDescriptorAggregate.EdFi.PersonalInformationVerificationDescriptorQ" table="PersonalInformationVerificationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PersonalInformationVerificationDescriptorAggregate.EdFi.PersonalInformationVerificationDescriptorQ" lazy="false" discriminator-value="edfi.PersonalInformationVerificationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PersonalInformationVerificationDescriptor" >
           <key>
             <column name="PersonalInformationVerificationDescriptorId" />
           </key>
@@ -6412,8 +6658,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAggregate.EdFi.StudentPersonalIdentificationDocumentQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PlatformTypeDescriptorAggregate.EdFi.PlatformTypeDescriptorQ" table="PlatformTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PlatformTypeDescriptorAggregate.EdFi.PlatformTypeDescriptorQ" lazy="false" discriminator-value="edfi.PlatformTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PlatformTypeDescriptor" >
           <key>
             <column name="PlatformTypeDescriptorId" />
           </key>
@@ -6440,8 +6688,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAssessmentAggregate.EdFi.StudentAssessmentQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PopulationServedDescriptorAggregate.EdFi.PopulationServedDescriptorQ" table="PopulationServedDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PopulationServedDescriptorAggregate.EdFi.PopulationServedDescriptorQ" lazy="false" discriminator-value="edfi.PopulationServedDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PopulationServedDescriptor" >
           <key>
             <column name="PopulationServedDescriptorId" />
           </key>
@@ -6496,8 +6746,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentInterventionAssociationAggregate.EdFi.StudentInterventionAssociationInterventionEffectivenessQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PostingResultDescriptorAggregate.EdFi.PostingResultDescriptorQ" table="PostingResultDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PostingResultDescriptorAggregate.EdFi.PostingResultDescriptorQ" lazy="false" discriminator-value="edfi.PostingResultDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PostingResultDescriptor" >
           <key>
             <column name="PostingResultDescriptorId" />
           </key>
@@ -6517,8 +6769,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.OpenStaffPositionAggregate.EdFi.OpenStaffPositionQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PostSecondaryEventCategoryDescriptorAggregate.EdFi.PostSecondaryEventCategoryDescriptorQ" table="PostSecondaryEventCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PostSecondaryEventCategoryDescriptorAggregate.EdFi.PostSecondaryEventCategoryDescriptorQ" lazy="false" discriminator-value="edfi.PostSecondaryEventCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PostSecondaryEventCategoryDescriptor" >
           <key>
             <column name="PostSecondaryEventCategoryDescriptorId" />
           </key>
@@ -6538,8 +6792,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.PostSecondaryEventAggregate.EdFi.PostSecondaryEventQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PostSecondaryInstitutionLevelDescriptorAggregate.EdFi.PostSecondaryInstitutionLevelDescriptorQ" table="PostSecondaryInstitutionLevelDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PostSecondaryInstitutionLevelDescriptorAggregate.EdFi.PostSecondaryInstitutionLevelDescriptorQ" lazy="false" discriminator-value="edfi.PostSecondaryInstitutionLevelDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PostSecondaryInstitutionLevelDescriptor" >
           <key>
             <column name="PostSecondaryInstitutionLevelDescriptorId" />
           </key>
@@ -6559,8 +6815,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.PostSecondaryInstitutionAggregate.EdFi.PostSecondaryInstitutionQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PrimaryLearningDeviceAccessDescriptorAggregate.EdFi.PrimaryLearningDeviceAccessDescriptorQ" table="PrimaryLearningDeviceAccessDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PrimaryLearningDeviceAccessDescriptorAggregate.EdFi.PrimaryLearningDeviceAccessDescriptorQ" lazy="false" discriminator-value="edfi.PrimaryLearningDeviceAccessDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PrimaryLearningDeviceAccessDescriptor" >
           <key>
             <column name="PrimaryLearningDeviceAccessDescriptorId" />
           </key>
@@ -6580,8 +6838,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PrimaryLearningDeviceAwayFromSchoolDescriptorAggregate.EdFi.PrimaryLearningDeviceAwayFromSchoolDescriptorQ" table="PrimaryLearningDeviceAwayFromSchoolDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PrimaryLearningDeviceAwayFromSchoolDescriptorAggregate.EdFi.PrimaryLearningDeviceAwayFromSchoolDescriptorQ" lazy="false" discriminator-value="edfi.PrimaryLearningDeviceAwayFromSchoolDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PrimaryLearningDeviceAwayFromSchoolDescriptor" >
           <key>
             <column name="PrimaryLearningDeviceAwayFromSchoolDescriptorId" />
           </key>
@@ -6601,8 +6861,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PrimaryLearningDeviceProviderDescriptorAggregate.EdFi.PrimaryLearningDeviceProviderDescriptorQ" table="PrimaryLearningDeviceProviderDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PrimaryLearningDeviceProviderDescriptorAggregate.EdFi.PrimaryLearningDeviceProviderDescriptorQ" lazy="false" discriminator-value="edfi.PrimaryLearningDeviceProviderDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PrimaryLearningDeviceProviderDescriptor" >
           <key>
             <column name="PrimaryLearningDeviceProviderDescriptorId" />
           </key>
@@ -6622,8 +6884,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ProficiencyDescriptorAggregate.EdFi.ProficiencyDescriptorQ" table="ProficiencyDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ProficiencyDescriptorAggregate.EdFi.ProficiencyDescriptorQ" lazy="false" discriminator-value="edfi.ProficiencyDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ProficiencyDescriptor" >
           <key>
             <column name="ProficiencyDescriptorId" />
           </key>
@@ -6643,8 +6907,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentLanguageInstructionProgramAssociationAggregate.EdFi.StudentLanguageInstructionProgramAssociationEnglishLanguageProficiencyAssessmentQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ProgramAssignmentDescriptorAggregate.EdFi.ProgramAssignmentDescriptorQ" table="ProgramAssignmentDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ProgramAssignmentDescriptorAggregate.EdFi.ProgramAssignmentDescriptorQ" lazy="false" discriminator-value="edfi.ProgramAssignmentDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ProgramAssignmentDescriptor" >
           <key>
             <column name="ProgramAssignmentDescriptorId" />
           </key>
@@ -6671,8 +6937,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StaffSchoolAssociationAggregate.EdFi.StaffSchoolAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ProgramCharacteristicDescriptorAggregate.EdFi.ProgramCharacteristicDescriptorQ" table="ProgramCharacteristicDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ProgramCharacteristicDescriptorAggregate.EdFi.ProgramCharacteristicDescriptorQ" lazy="false" discriminator-value="edfi.ProgramCharacteristicDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ProgramCharacteristicDescriptor" >
           <key>
             <column name="ProgramCharacteristicDescriptorId" />
           </key>
@@ -6699,8 +6967,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationProgramParticipationProgramCharacteristicQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ProgramSponsorDescriptorAggregate.EdFi.ProgramSponsorDescriptorQ" table="ProgramSponsorDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ProgramSponsorDescriptorAggregate.EdFi.ProgramSponsorDescriptorQ" lazy="false" discriminator-value="edfi.ProgramSponsorDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ProgramSponsorDescriptor" >
           <key>
             <column name="ProgramSponsorDescriptorId" />
           </key>
@@ -6720,8 +6990,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.ProgramAggregate.EdFi.ProgramSponsorQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ProgramTypeDescriptorAggregate.EdFi.ProgramTypeDescriptorQ" table="ProgramTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ProgramTypeDescriptorAggregate.EdFi.ProgramTypeDescriptorQ" lazy="false" discriminator-value="edfi.ProgramTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ProgramTypeDescriptor" >
           <key>
             <column name="ProgramTypeDescriptorId" />
           </key>
@@ -6748,8 +7020,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationProgramParticipationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ProgressDescriptorAggregate.EdFi.ProgressDescriptorQ" table="ProgressDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ProgressDescriptorAggregate.EdFi.ProgressDescriptorQ" lazy="false" discriminator-value="edfi.ProgressDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ProgressDescriptor" >
           <key>
             <column name="ProgressDescriptorId" />
           </key>
@@ -6769,8 +7043,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentLanguageInstructionProgramAssociationAggregate.EdFi.StudentLanguageInstructionProgramAssociationEnglishLanguageProficiencyAssessmentQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ProgressLevelDescriptorAggregate.EdFi.ProgressLevelDescriptorQ" table="ProgressLevelDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ProgressLevelDescriptorAggregate.EdFi.ProgressLevelDescriptorQ" lazy="false" discriminator-value="edfi.ProgressLevelDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ProgressLevelDescriptor" >
           <key>
             <column name="ProgressLevelDescriptorId" />
           </key>
@@ -6797,8 +7073,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentNeglectedOrDelinquentProgramAssociationAggregate.EdFi.StudentNeglectedOrDelinquentProgramAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ProviderCategoryDescriptorAggregate.EdFi.ProviderCategoryDescriptorQ" table="ProviderCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ProviderCategoryDescriptorAggregate.EdFi.ProviderCategoryDescriptorQ" lazy="false" discriminator-value="edfi.ProviderCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ProviderCategoryDescriptor" >
           <key>
             <column name="ProviderCategoryDescriptorId" />
           </key>
@@ -6818,8 +7096,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.CommunityProviderAggregate.EdFi.CommunityProviderQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ProviderProfitabilityDescriptorAggregate.EdFi.ProviderProfitabilityDescriptorQ" table="ProviderProfitabilityDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ProviderProfitabilityDescriptorAggregate.EdFi.ProviderProfitabilityDescriptorQ" lazy="false" discriminator-value="edfi.ProviderProfitabilityDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ProviderProfitabilityDescriptor" >
           <key>
             <column name="ProviderProfitabilityDescriptorId" />
           </key>
@@ -6839,8 +7119,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.CommunityProviderAggregate.EdFi.CommunityProviderQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ProviderStatusDescriptorAggregate.EdFi.ProviderStatusDescriptorQ" table="ProviderStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ProviderStatusDescriptorAggregate.EdFi.ProviderStatusDescriptorQ" lazy="false" discriminator-value="edfi.ProviderStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ProviderStatusDescriptor" >
           <key>
             <column name="ProviderStatusDescriptorId" />
           </key>
@@ -6860,8 +7142,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.CommunityProviderAggregate.EdFi.CommunityProviderQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PublicationStatusDescriptorAggregate.EdFi.PublicationStatusDescriptorQ" table="PublicationStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PublicationStatusDescriptorAggregate.EdFi.PublicationStatusDescriptorQ" lazy="false" discriminator-value="edfi.PublicationStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PublicationStatusDescriptor" >
           <key>
             <column name="PublicationStatusDescriptorId" />
           </key>
@@ -6895,8 +7179,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.LearningStandardAggregate.EdFi.LearningStandardContentStandardQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.QuestionFormDescriptorAggregate.EdFi.QuestionFormDescriptorQ" table="QuestionFormDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.QuestionFormDescriptorAggregate.EdFi.QuestionFormDescriptorQ" lazy="false" discriminator-value="edfi.QuestionFormDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="QuestionFormDescriptor" >
           <key>
             <column name="QuestionFormDescriptorId" />
           </key>
@@ -6916,8 +7202,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyQuestionAggregate.EdFi.SurveyQuestionQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.RaceDescriptorAggregate.EdFi.RaceDescriptorQ" table="RaceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.RaceDescriptorAggregate.EdFi.RaceDescriptorQ" lazy="false" discriminator-value="edfi.RaceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="RaceDescriptor" >
           <key>
             <column name="RaceDescriptorId" />
           </key>
@@ -6944,8 +7232,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationRaceQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ReasonExitedDescriptorAggregate.EdFi.ReasonExitedDescriptorQ" table="ReasonExitedDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ReasonExitedDescriptorAggregate.EdFi.ReasonExitedDescriptorQ" lazy="false" discriminator-value="edfi.ReasonExitedDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ReasonExitedDescriptor" >
           <key>
             <column name="ReasonExitedDescriptorId" />
           </key>
@@ -6965,8 +7255,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.GeneralStudentProgramAssociationAggregate.EdFi.GeneralStudentProgramAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ReasonNotTestedDescriptorAggregate.EdFi.ReasonNotTestedDescriptorQ" table="ReasonNotTestedDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ReasonNotTestedDescriptorAggregate.EdFi.ReasonNotTestedDescriptorQ" lazy="false" discriminator-value="edfi.ReasonNotTestedDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ReasonNotTestedDescriptor" >
           <key>
             <column name="ReasonNotTestedDescriptorId" />
           </key>
@@ -6986,8 +7278,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAssessmentAggregate.EdFi.StudentAssessmentQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.RecognitionTypeDescriptorAggregate.EdFi.RecognitionTypeDescriptorQ" table="RecognitionTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.RecognitionTypeDescriptorAggregate.EdFi.RecognitionTypeDescriptorQ" lazy="false" discriminator-value="edfi.RecognitionTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="RecognitionTypeDescriptor" >
           <key>
             <column name="RecognitionTypeDescriptorId" />
           </key>
@@ -7014,8 +7308,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAcademicRecordAggregate.EdFi.StudentAcademicRecordRecognitionQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.RelationDescriptorAggregate.EdFi.RelationDescriptorQ" table="RelationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.RelationDescriptorAggregate.EdFi.RelationDescriptorQ" lazy="false" discriminator-value="edfi.RelationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="RelationDescriptor" >
           <key>
             <column name="RelationDescriptorId" />
           </key>
@@ -7035,8 +7331,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentParentAssociationAggregate.EdFi.StudentParentAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.RepeatIdentifierDescriptorAggregate.EdFi.RepeatIdentifierDescriptorQ" table="RepeatIdentifierDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.RepeatIdentifierDescriptorAggregate.EdFi.RepeatIdentifierDescriptorQ" lazy="false" discriminator-value="edfi.RepeatIdentifierDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="RepeatIdentifierDescriptor" >
           <key>
             <column name="RepeatIdentifierDescriptorId" />
           </key>
@@ -7056,8 +7354,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSectionAssociationAggregate.EdFi.StudentSectionAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ReporterDescriptionDescriptorAggregate.EdFi.ReporterDescriptionDescriptorQ" table="ReporterDescriptionDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ReporterDescriptionDescriptorAggregate.EdFi.ReporterDescriptionDescriptorQ" lazy="false" discriminator-value="edfi.ReporterDescriptionDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ReporterDescriptionDescriptor" >
           <key>
             <column name="ReporterDescriptionDescriptorId" />
           </key>
@@ -7077,8 +7377,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.DisciplineIncidentAggregate.EdFi.DisciplineIncidentQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ReportingTagDescriptorAggregate.EdFi.ReportingTagDescriptorQ" table="ReportingTagDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ReportingTagDescriptorAggregate.EdFi.ReportingTagDescriptorQ" lazy="false" discriminator-value="edfi.ReportingTagDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ReportingTagDescriptor" >
           <key>
             <column name="ReportingTagDescriptorId" />
           </key>
@@ -7161,8 +7463,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.SourceDimensionAggregate.EdFi.SourceDimensionReportingTagQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ResidencyStatusDescriptorAggregate.EdFi.ResidencyStatusDescriptorQ" table="ResidencyStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ResidencyStatusDescriptorAggregate.EdFi.ResidencyStatusDescriptorQ" lazy="false" discriminator-value="edfi.ResidencyStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ResidencyStatusDescriptor" >
           <key>
             <column name="ResidencyStatusDescriptorId" />
           </key>
@@ -7182,8 +7486,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSchoolAssociationAggregate.EdFi.StudentSchoolAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ResponseIndicatorDescriptorAggregate.EdFi.ResponseIndicatorDescriptorQ" table="ResponseIndicatorDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ResponseIndicatorDescriptorAggregate.EdFi.ResponseIndicatorDescriptorQ" lazy="false" discriminator-value="edfi.ResponseIndicatorDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ResponseIndicatorDescriptor" >
           <key>
             <column name="ResponseIndicatorDescriptorId" />
           </key>
@@ -7203,8 +7509,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAssessmentAggregate.EdFi.StudentAssessmentItemQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ResponsibilityDescriptorAggregate.EdFi.ResponsibilityDescriptorQ" table="ResponsibilityDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ResponsibilityDescriptorAggregate.EdFi.ResponsibilityDescriptorQ" lazy="false" discriminator-value="edfi.ResponsibilityDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ResponsibilityDescriptor" >
           <key>
             <column name="ResponsibilityDescriptorId" />
           </key>
@@ -7224,8 +7532,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationResponsibilityAssociationAggregate.EdFi.StudentEducationOrganizationResponsibilityAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.RestraintEventReasonDescriptorAggregate.EdFi.RestraintEventReasonDescriptorQ" table="RestraintEventReasonDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.RestraintEventReasonDescriptorAggregate.EdFi.RestraintEventReasonDescriptorQ" lazy="false" discriminator-value="edfi.RestraintEventReasonDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="RestraintEventReasonDescriptor" >
           <key>
             <column name="RestraintEventReasonDescriptorId" />
           </key>
@@ -7245,8 +7555,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.RestraintEventAggregate.EdFi.RestraintEventReasonQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ResultDatatypeTypeDescriptorAggregate.EdFi.ResultDatatypeTypeDescriptorQ" table="ResultDatatypeTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ResultDatatypeTypeDescriptorAggregate.EdFi.ResultDatatypeTypeDescriptorQ" lazy="false" discriminator-value="edfi.ResultDatatypeTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ResultDatatypeTypeDescriptor" >
           <key>
             <column name="ResultDatatypeTypeDescriptorId" />
           </key>
@@ -7315,8 +7627,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAssessmentAggregate.EdFi.StudentAssessmentStudentObjectiveAssessmentScoreResultQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.RetestIndicatorDescriptorAggregate.EdFi.RetestIndicatorDescriptorQ" table="RetestIndicatorDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.RetestIndicatorDescriptorAggregate.EdFi.RetestIndicatorDescriptorQ" lazy="false" discriminator-value="edfi.RetestIndicatorDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="RetestIndicatorDescriptor" >
           <key>
             <column name="RetestIndicatorDescriptorId" />
           </key>
@@ -7336,8 +7650,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAssessmentAggregate.EdFi.StudentAssessmentQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SchoolCategoryDescriptorAggregate.EdFi.SchoolCategoryDescriptorQ" table="SchoolCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SchoolCategoryDescriptorAggregate.EdFi.SchoolCategoryDescriptorQ" lazy="false" discriminator-value="edfi.SchoolCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SchoolCategoryDescriptor" >
           <key>
             <column name="SchoolCategoryDescriptorId" />
           </key>
@@ -7357,8 +7673,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.SchoolAggregate.EdFi.SchoolCategoryQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SchoolChoiceImplementStatusDescriptorAggregate.EdFi.SchoolChoiceImplementStatusDescriptorQ" table="SchoolChoiceImplementStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SchoolChoiceImplementStatusDescriptorAggregate.EdFi.SchoolChoiceImplementStatusDescriptorQ" lazy="false" discriminator-value="edfi.SchoolChoiceImplementStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SchoolChoiceImplementStatusDescriptor" >
           <key>
             <column name="SchoolChoiceImplementStatusDescriptorId" />
           </key>
@@ -7378,8 +7696,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.LocalEducationAgencyAggregate.EdFi.LocalEducationAgencyAccountabilityQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SchoolFoodServiceProgramServiceDescriptorAggregate.EdFi.SchoolFoodServiceProgramServiceDescriptorQ" table="SchoolFoodServiceProgramServiceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SchoolFoodServiceProgramServiceDescriptorAggregate.EdFi.SchoolFoodServiceProgramServiceDescriptorQ" lazy="false" discriminator-value="edfi.SchoolFoodServiceProgramServiceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SchoolFoodServiceProgramServiceDescriptor" >
           <key>
             <column name="SchoolFoodServiceProgramServiceDescriptorId" />
           </key>
@@ -7399,8 +7719,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSchoolFoodServiceProgramAssociationAggregate.EdFi.StudentSchoolFoodServiceProgramAssociationSchoolFoodServiceProgramServiceQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SchoolTypeDescriptorAggregate.EdFi.SchoolTypeDescriptorQ" table="SchoolTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SchoolTypeDescriptorAggregate.EdFi.SchoolTypeDescriptorQ" lazy="false" discriminator-value="edfi.SchoolTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SchoolTypeDescriptor" >
           <key>
             <column name="SchoolTypeDescriptorId" />
           </key>
@@ -7420,8 +7742,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.SchoolAggregate.EdFi.SchoolQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SectionCharacteristicDescriptorAggregate.EdFi.SectionCharacteristicDescriptorQ" table="SectionCharacteristicDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SectionCharacteristicDescriptorAggregate.EdFi.SectionCharacteristicDescriptorQ" lazy="false" discriminator-value="edfi.SectionCharacteristicDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SectionCharacteristicDescriptor" >
           <key>
             <column name="SectionCharacteristicDescriptorId" />
           </key>
@@ -7441,8 +7765,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.SectionAggregate.EdFi.SectionCharacteristicQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SeparationDescriptorAggregate.EdFi.SeparationDescriptorQ" table="SeparationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SeparationDescriptorAggregate.EdFi.SeparationDescriptorQ" lazy="false" discriminator-value="edfi.SeparationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SeparationDescriptor" >
           <key>
             <column name="SeparationDescriptorId" />
           </key>
@@ -7462,8 +7788,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StaffEducationOrganizationEmploymentAssociationAggregate.EdFi.StaffEducationOrganizationEmploymentAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SeparationReasonDescriptorAggregate.EdFi.SeparationReasonDescriptorQ" table="SeparationReasonDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SeparationReasonDescriptorAggregate.EdFi.SeparationReasonDescriptorQ" lazy="false" discriminator-value="edfi.SeparationReasonDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SeparationReasonDescriptor" >
           <key>
             <column name="SeparationReasonDescriptorId" />
           </key>
@@ -7483,8 +7811,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StaffEducationOrganizationEmploymentAssociationAggregate.EdFi.StaffEducationOrganizationEmploymentAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ServiceDescriptorAggregate.EdFi.ServiceDescriptorQ" table="ServiceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ServiceDescriptorAggregate.EdFi.ServiceDescriptorQ" lazy="false" discriminator-value="edfi.ServiceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ServiceDescriptor" >
           <key>
             <column name="ServiceDescriptorId" />
           </key>
@@ -7525,8 +7855,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentTitleIPartAProgramAssociationAggregate.EdFi.StudentTitleIPartAProgramAssociationServiceQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SexDescriptorAggregate.EdFi.SexDescriptorQ" table="SexDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SexDescriptorAggregate.EdFi.SexDescriptorQ" lazy="false" discriminator-value="edfi.SexDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SexDescriptor" >
           <key>
             <column name="SexDescriptorId" />
           </key>
@@ -7595,8 +7927,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SourceSystemDescriptorAggregate.EdFi.SourceSystemDescriptorQ" table="SourceSystemDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SourceSystemDescriptorAggregate.EdFi.SourceSystemDescriptorQ" lazy="false" discriminator-value="edfi.SourceSystemDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SourceSystemDescriptor" >
           <key>
             <column name="SourceSystemDescriptorId" />
           </key>
@@ -7616,8 +7950,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.PersonAggregate.EdFi.PersonQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SpecialEducationProgramServiceDescriptorAggregate.EdFi.SpecialEducationProgramServiceDescriptorQ" table="SpecialEducationProgramServiceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SpecialEducationProgramServiceDescriptorAggregate.EdFi.SpecialEducationProgramServiceDescriptorQ" lazy="false" discriminator-value="edfi.SpecialEducationProgramServiceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SpecialEducationProgramServiceDescriptor" >
           <key>
             <column name="SpecialEducationProgramServiceDescriptorId" />
           </key>
@@ -7637,8 +7973,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSpecialEducationProgramAssociationAggregate.EdFi.StudentSpecialEducationProgramAssociationSpecialEducationProgramServiceQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SpecialEducationSettingDescriptorAggregate.EdFi.SpecialEducationSettingDescriptorQ" table="SpecialEducationSettingDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SpecialEducationSettingDescriptorAggregate.EdFi.SpecialEducationSettingDescriptorQ" lazy="false" discriminator-value="edfi.SpecialEducationSettingDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SpecialEducationSettingDescriptor" >
           <key>
             <column name="SpecialEducationSettingDescriptorId" />
           </key>
@@ -7658,8 +7996,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSpecialEducationProgramAssociationAggregate.EdFi.StudentSpecialEducationProgramAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffClassificationDescriptorAggregate.EdFi.StaffClassificationDescriptorQ" table="StaffClassificationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffClassificationDescriptorAggregate.EdFi.StaffClassificationDescriptorQ" lazy="false" discriminator-value="edfi.StaffClassificationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="StaffClassificationDescriptor" >
           <key>
             <column name="StaffClassificationDescriptorId" />
           </key>
@@ -7686,8 +8026,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StaffEducationOrganizationAssignmentAssociationAggregate.EdFi.StaffEducationOrganizationAssignmentAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffIdentificationSystemDescriptorAggregate.EdFi.StaffIdentificationSystemDescriptorQ" table="StaffIdentificationSystemDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffIdentificationSystemDescriptorAggregate.EdFi.StaffIdentificationSystemDescriptorQ" lazy="false" discriminator-value="edfi.StaffIdentificationSystemDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="StaffIdentificationSystemDescriptor" >
           <key>
             <column name="StaffIdentificationSystemDescriptorId" />
           </key>
@@ -7707,8 +8049,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StaffAggregate.EdFi.StaffIdentificationCodeQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffLeaveEventCategoryDescriptorAggregate.EdFi.StaffLeaveEventCategoryDescriptorQ" table="StaffLeaveEventCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffLeaveEventCategoryDescriptorAggregate.EdFi.StaffLeaveEventCategoryDescriptorQ" lazy="false" discriminator-value="edfi.StaffLeaveEventCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="StaffLeaveEventCategoryDescriptor" >
           <key>
             <column name="StaffLeaveEventCategoryDescriptorId" />
           </key>
@@ -7728,8 +8072,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StaffLeaveAggregate.EdFi.StaffLeaveQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.StateAbbreviationDescriptorAggregate.EdFi.StateAbbreviationDescriptorQ" table="StateAbbreviationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.StateAbbreviationDescriptorAggregate.EdFi.StateAbbreviationDescriptorQ" lazy="false" discriminator-value="edfi.StateAbbreviationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="StateAbbreviationDescriptor" >
           <key>
             <column name="StateAbbreviationDescriptorId" />
           </key>
@@ -7798,8 +8144,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationAddressQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentCharacteristicDescriptorAggregate.EdFi.StudentCharacteristicDescriptorQ" table="StudentCharacteristicDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentCharacteristicDescriptorAggregate.EdFi.StudentCharacteristicDescriptorQ" lazy="false" discriminator-value="edfi.StudentCharacteristicDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="StudentCharacteristicDescriptor" >
           <key>
             <column name="StudentCharacteristicDescriptorId" />
           </key>
@@ -7819,8 +8167,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationStudentCharacteristicQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentIdentificationSystemDescriptorAggregate.EdFi.StudentIdentificationSystemDescriptorQ" table="StudentIdentificationSystemDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentIdentificationSystemDescriptorAggregate.EdFi.StudentIdentificationSystemDescriptorQ" lazy="false" discriminator-value="edfi.StudentIdentificationSystemDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="StudentIdentificationSystemDescriptor" >
           <key>
             <column name="StudentIdentificationSystemDescriptorId" />
           </key>
@@ -7840,8 +8190,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationStudentIdentificationCodeQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentParticipationCodeDescriptorAggregate.EdFi.StudentParticipationCodeDescriptorQ" table="StudentParticipationCodeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentParticipationCodeDescriptorAggregate.EdFi.StudentParticipationCodeDescriptorQ" lazy="false" discriminator-value="edfi.StudentParticipationCodeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="StudentParticipationCodeDescriptor" >
           <key>
             <column name="StudentParticipationCodeDescriptorId" />
           </key>
@@ -7861,8 +8213,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentDisciplineIncidentAssociationAggregate.EdFi.StudentDisciplineIncidentAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SubmissionStatusDescriptorAggregate.EdFi.SubmissionStatusDescriptorQ" table="SubmissionStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SubmissionStatusDescriptorAggregate.EdFi.SubmissionStatusDescriptorQ" lazy="false" discriminator-value="edfi.SubmissionStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SubmissionStatusDescriptor" >
           <key>
             <column name="SubmissionStatusDescriptorId" />
           </key>
@@ -7882,8 +8236,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentGradebookEntryAggregate.EdFi.StudentGradebookEntryQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyCategoryDescriptorAggregate.EdFi.SurveyCategoryDescriptorQ" table="SurveyCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyCategoryDescriptorAggregate.EdFi.SurveyCategoryDescriptorQ" lazy="false" discriminator-value="edfi.SurveyCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SurveyCategoryDescriptor" >
           <key>
             <column name="SurveyCategoryDescriptorId" />
           </key>
@@ -7903,8 +8259,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyAggregate.EdFi.SurveyQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyLevelDescriptorAggregate.EdFi.SurveyLevelDescriptorQ" table="SurveyLevelDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyLevelDescriptorAggregate.EdFi.SurveyLevelDescriptorQ" lazy="false" discriminator-value="edfi.SurveyLevelDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SurveyLevelDescriptor" >
           <key>
             <column name="SurveyLevelDescriptorId" />
           </key>
@@ -7924,8 +8282,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyResponseAggregate.EdFi.SurveyResponseSurveyLevelQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.TeachingCredentialBasisDescriptorAggregate.EdFi.TeachingCredentialBasisDescriptorQ" table="TeachingCredentialBasisDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.TeachingCredentialBasisDescriptorAggregate.EdFi.TeachingCredentialBasisDescriptorQ" lazy="false" discriminator-value="edfi.TeachingCredentialBasisDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="TeachingCredentialBasisDescriptor" >
           <key>
             <column name="TeachingCredentialBasisDescriptorId" />
           </key>
@@ -7945,8 +8305,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.CredentialAggregate.EdFi.CredentialQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.TeachingCredentialDescriptorAggregate.EdFi.TeachingCredentialDescriptorQ" table="TeachingCredentialDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.TeachingCredentialDescriptorAggregate.EdFi.TeachingCredentialDescriptorQ" lazy="false" discriminator-value="edfi.TeachingCredentialDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="TeachingCredentialDescriptor" >
           <key>
             <column name="TeachingCredentialDescriptorId" />
           </key>
@@ -7966,8 +8328,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.CredentialAggregate.EdFi.CredentialQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.TechnicalSkillsAssessmentDescriptorAggregate.EdFi.TechnicalSkillsAssessmentDescriptorQ" table="TechnicalSkillsAssessmentDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.TechnicalSkillsAssessmentDescriptorAggregate.EdFi.TechnicalSkillsAssessmentDescriptorQ" lazy="false" discriminator-value="edfi.TechnicalSkillsAssessmentDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="TechnicalSkillsAssessmentDescriptor" >
           <key>
             <column name="TechnicalSkillsAssessmentDescriptorId" />
           </key>
@@ -7987,8 +8351,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentCTEProgramAssociationAggregate.EdFi.StudentCTEProgramAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.TelephoneNumberTypeDescriptorAggregate.EdFi.TelephoneNumberTypeDescriptorQ" table="TelephoneNumberTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.TelephoneNumberTypeDescriptorAggregate.EdFi.TelephoneNumberTypeDescriptorQ" lazy="false" discriminator-value="edfi.TelephoneNumberTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="TelephoneNumberTypeDescriptor" >
           <key>
             <column name="TelephoneNumberTypeDescriptorId" />
           </key>
@@ -8029,8 +8395,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationTelephoneQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.TermDescriptorAggregate.EdFi.TermDescriptorQ" table="TermDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.TermDescriptorAggregate.EdFi.TermDescriptorQ" lazy="false" discriminator-value="edfi.TermDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="TermDescriptor" >
           <key>
             <column name="TermDescriptorId" />
           </key>
@@ -8064,8 +8432,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationCohortYearQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.TitleIPartAParticipantDescriptorAggregate.EdFi.TitleIPartAParticipantDescriptorQ" table="TitleIPartAParticipantDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.TitleIPartAParticipantDescriptorAggregate.EdFi.TitleIPartAParticipantDescriptorQ" lazy="false" discriminator-value="edfi.TitleIPartAParticipantDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="TitleIPartAParticipantDescriptor" >
           <key>
             <column name="TitleIPartAParticipantDescriptorId" />
           </key>
@@ -8085,8 +8455,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentTitleIPartAProgramAssociationAggregate.EdFi.StudentTitleIPartAProgramAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.TitleIPartAProgramServiceDescriptorAggregate.EdFi.TitleIPartAProgramServiceDescriptorQ" table="TitleIPartAProgramServiceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.TitleIPartAProgramServiceDescriptorAggregate.EdFi.TitleIPartAProgramServiceDescriptorQ" lazy="false" discriminator-value="edfi.TitleIPartAProgramServiceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="TitleIPartAProgramServiceDescriptor" >
           <key>
             <column name="TitleIPartAProgramServiceDescriptorId" />
           </key>
@@ -8106,8 +8478,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentTitleIPartAProgramAssociationAggregate.EdFi.StudentTitleIPartAProgramAssociationTitleIPartAProgramServiceQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.TitleIPartASchoolDesignationDescriptorAggregate.EdFi.TitleIPartASchoolDesignationDescriptorQ" table="TitleIPartASchoolDesignationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.TitleIPartASchoolDesignationDescriptorAggregate.EdFi.TitleIPartASchoolDesignationDescriptorQ" lazy="false" discriminator-value="edfi.TitleIPartASchoolDesignationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="TitleIPartASchoolDesignationDescriptor" >
           <key>
             <column name="TitleIPartASchoolDesignationDescriptorId" />
           </key>
@@ -8127,8 +8501,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.SchoolAggregate.EdFi.SchoolQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.TribalAffiliationDescriptorAggregate.EdFi.TribalAffiliationDescriptorQ" table="TribalAffiliationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.TribalAffiliationDescriptorAggregate.EdFi.TribalAffiliationDescriptorQ" lazy="false" discriminator-value="edfi.TribalAffiliationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="TribalAffiliationDescriptor" >
           <key>
             <column name="TribalAffiliationDescriptorId" />
           </key>
@@ -8155,8 +8531,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationTribalAffiliationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.VisaDescriptorAggregate.EdFi.VisaDescriptorQ" table="VisaDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.VisaDescriptorAggregate.EdFi.VisaDescriptorQ" lazy="false" discriminator-value="edfi.VisaDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="VisaDescriptor" >
           <key>
             <column name="VisaDescriptorId" />
           </key>
@@ -8183,8 +8561,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAggregate.EdFi.StudentVisaQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.WeaponDescriptorAggregate.EdFi.WeaponDescriptorQ" table="WeaponDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.WeaponDescriptorAggregate.EdFi.WeaponDescriptorQ" lazy="false" discriminator-value="edfi.WeaponDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="WeaponDescriptor" >
           <key>
             <column name="WeaponDescriptorId" />
           </key>
@@ -8204,7 +8584,8 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.DisciplineIncidentAggregate.EdFi.DisciplineIncidentWeaponQ" />
           </set>
 
-      </joined-subclass>
+      </join>
+    </subclass>
 </class>
 
 
diff --git a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/4.0.0/DataStandard_400_ApprovalTests.Verify.Standard_Std_4.0.0_EntityOrmMappings_PgSql_EntityOrmMappings.generated.hbm.approved.xml b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/4.0.0/DataStandard_400_ApprovalTests.Verify.Standard_Std_4.0.0_EntityOrmMappings_PgSql_EntityOrmMappings.generated.hbm.approved.xml
index d8b0f10fe1..aa26a9f6ee 100644
--- a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/4.0.0/DataStandard_400_ApprovalTests.Verify.Standard_Std_4.0.0_EntityOrmMappings_PgSql_EntityOrmMappings.generated.hbm.approved.xml
+++ b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/4.0.0/DataStandard_400_ApprovalTests.Verify.Standard_Std_4.0.0_EntityOrmMappings_PgSql_EntityOrmMappings.generated.hbm.approved.xml
@@ -2557,12 +2557,13 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.DescriptorAggregate.EdFi.Descriptor" table="Descriptor" lazy="false" abstract="true">
+  <class name="EdFi.Ods.Entities.NHibernate.DescriptorAggregate.EdFi.Descriptor" table="Descriptor" lazy="false" abstract="true" discriminator-value="NULL">
     <id name="DescriptorId" column="DescriptorId" type="int">
       <generator class="identity" />
     </id>
 
     <!-- Discriminator -->
+    <discriminator column="Discriminator" type="string" />
 
     <!-- Optimistic locking for aggregate root -->
     <version name="LastModifiedDate" column="LastModifiedDate" type="UtcDateTime" />
@@ -2587,7 +2588,8 @@
 
     <!-- Collections -->
     <!-- Derived classes -->
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.AbsenceEventCategoryDescriptorAggregate.EdFi.AbsenceEventCategoryDescriptor" table="AbsenceEventCategoryDescriptor" lazy="false">
+    <subclass name="EdFi.Ods.Entities.NHibernate.AbsenceEventCategoryDescriptorAggregate.EdFi.AbsenceEventCategoryDescriptor" lazy="false" discriminator-value="edfi.AbsenceEventCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AbsenceEventCategoryDescriptor" >
           <key>
             <column name="AbsenceEventCategoryDescriptorId" />
           </key>
@@ -2600,8 +2602,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.AcademicHonorCategoryDescriptorAggregate.EdFi.AcademicHonorCategoryDescriptor" table="AcademicHonorCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.AcademicHonorCategoryDescriptorAggregate.EdFi.AcademicHonorCategoryDescriptor" lazy="false" discriminator-value="edfi.AcademicHonorCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AcademicHonorCategoryDescriptor" >
           <key>
             <column name="AcademicHonorCategoryDescriptorId" />
           </key>
@@ -2614,8 +2618,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.AcademicSubjectDescriptorAggregate.EdFi.AcademicSubjectDescriptor" table="AcademicSubjectDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.AcademicSubjectDescriptorAggregate.EdFi.AcademicSubjectDescriptor" lazy="false" discriminator-value="edfi.AcademicSubjectDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AcademicSubjectDescriptor" >
           <key>
             <column name="AcademicSubjectDescriptorId" />
           </key>
@@ -2628,8 +2634,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.AccommodationDescriptorAggregate.EdFi.AccommodationDescriptor" table="AccommodationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.AccommodationDescriptorAggregate.EdFi.AccommodationDescriptor" lazy="false" discriminator-value="edfi.AccommodationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AccommodationDescriptor" >
           <key>
             <column name="AccommodationDescriptorId" />
           </key>
@@ -2642,8 +2650,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.AccountTypeDescriptorAggregate.EdFi.AccountTypeDescriptor" table="AccountTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.AccountTypeDescriptorAggregate.EdFi.AccountTypeDescriptor" lazy="false" discriminator-value="edfi.AccountTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AccountTypeDescriptor" >
           <key>
             <column name="AccountTypeDescriptorId" />
           </key>
@@ -2656,8 +2666,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.AchievementCategoryDescriptorAggregate.EdFi.AchievementCategoryDescriptor" table="AchievementCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.AchievementCategoryDescriptorAggregate.EdFi.AchievementCategoryDescriptor" lazy="false" discriminator-value="edfi.AchievementCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AchievementCategoryDescriptor" >
           <key>
             <column name="AchievementCategoryDescriptorId" />
           </key>
@@ -2670,8 +2682,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.AdditionalCreditTypeDescriptorAggregate.EdFi.AdditionalCreditTypeDescriptor" table="AdditionalCreditTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.AdditionalCreditTypeDescriptorAggregate.EdFi.AdditionalCreditTypeDescriptor" lazy="false" discriminator-value="edfi.AdditionalCreditTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AdditionalCreditTypeDescriptor" >
           <key>
             <column name="AdditionalCreditTypeDescriptorId" />
           </key>
@@ -2684,8 +2698,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.AddressTypeDescriptorAggregate.EdFi.AddressTypeDescriptor" table="AddressTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.AddressTypeDescriptorAggregate.EdFi.AddressTypeDescriptor" lazy="false" discriminator-value="edfi.AddressTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AddressTypeDescriptor" >
           <key>
             <column name="AddressTypeDescriptorId" />
           </key>
@@ -2698,8 +2714,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.AdministrationEnvironmentDescriptorAggregate.EdFi.AdministrationEnvironmentDescriptor" table="AdministrationEnvironmentDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.AdministrationEnvironmentDescriptorAggregate.EdFi.AdministrationEnvironmentDescriptor" lazy="false" discriminator-value="edfi.AdministrationEnvironmentDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AdministrationEnvironmentDescriptor" >
           <key>
             <column name="AdministrationEnvironmentDescriptorId" />
           </key>
@@ -2712,8 +2730,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.AdministrativeFundingControlDescriptorAggregate.EdFi.AdministrativeFundingControlDescriptor" table="AdministrativeFundingControlDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.AdministrativeFundingControlDescriptorAggregate.EdFi.AdministrativeFundingControlDescriptor" lazy="false" discriminator-value="edfi.AdministrativeFundingControlDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AdministrativeFundingControlDescriptor" >
           <key>
             <column name="AdministrativeFundingControlDescriptorId" />
           </key>
@@ -2726,8 +2746,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.AncestryEthnicOriginDescriptorAggregate.EdFi.AncestryEthnicOriginDescriptor" table="AncestryEthnicOriginDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.AncestryEthnicOriginDescriptorAggregate.EdFi.AncestryEthnicOriginDescriptor" lazy="false" discriminator-value="edfi.AncestryEthnicOriginDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AncestryEthnicOriginDescriptor" >
           <key>
             <column name="AncestryEthnicOriginDescriptorId" />
           </key>
@@ -2740,8 +2762,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.AssessmentCategoryDescriptorAggregate.EdFi.AssessmentCategoryDescriptor" table="AssessmentCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.AssessmentCategoryDescriptorAggregate.EdFi.AssessmentCategoryDescriptor" lazy="false" discriminator-value="edfi.AssessmentCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AssessmentCategoryDescriptor" >
           <key>
             <column name="AssessmentCategoryDescriptorId" />
           </key>
@@ -2754,8 +2778,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.AssessmentIdentificationSystemDescriptorAggregate.EdFi.AssessmentIdentificationSystemDescriptor" table="AssessmentIdentificationSystemDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.AssessmentIdentificationSystemDescriptorAggregate.EdFi.AssessmentIdentificationSystemDescriptor" lazy="false" discriminator-value="edfi.AssessmentIdentificationSystemDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AssessmentIdentificationSystemDescriptor" >
           <key>
             <column name="AssessmentIdentificationSystemDescriptorId" />
           </key>
@@ -2768,8 +2794,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.AssessmentItemCategoryDescriptorAggregate.EdFi.AssessmentItemCategoryDescriptor" table="AssessmentItemCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.AssessmentItemCategoryDescriptorAggregate.EdFi.AssessmentItemCategoryDescriptor" lazy="false" discriminator-value="edfi.AssessmentItemCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AssessmentItemCategoryDescriptor" >
           <key>
             <column name="AssessmentItemCategoryDescriptorId" />
           </key>
@@ -2782,8 +2810,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.AssessmentItemResultDescriptorAggregate.EdFi.AssessmentItemResultDescriptor" table="AssessmentItemResultDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.AssessmentItemResultDescriptorAggregate.EdFi.AssessmentItemResultDescriptor" lazy="false" discriminator-value="edfi.AssessmentItemResultDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AssessmentItemResultDescriptor" >
           <key>
             <column name="AssessmentItemResultDescriptorId" />
           </key>
@@ -2796,8 +2826,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.AssessmentPeriodDescriptorAggregate.EdFi.AssessmentPeriodDescriptor" table="AssessmentPeriodDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.AssessmentPeriodDescriptorAggregate.EdFi.AssessmentPeriodDescriptor" lazy="false" discriminator-value="edfi.AssessmentPeriodDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AssessmentPeriodDescriptor" >
           <key>
             <column name="AssessmentPeriodDescriptorId" />
           </key>
@@ -2810,8 +2842,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.AssessmentReportingMethodDescriptorAggregate.EdFi.AssessmentReportingMethodDescriptor" table="AssessmentReportingMethodDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.AssessmentReportingMethodDescriptorAggregate.EdFi.AssessmentReportingMethodDescriptor" lazy="false" discriminator-value="edfi.AssessmentReportingMethodDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AssessmentReportingMethodDescriptor" >
           <key>
             <column name="AssessmentReportingMethodDescriptorId" />
           </key>
@@ -2824,8 +2858,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.AssignmentLateStatusDescriptorAggregate.EdFi.AssignmentLateStatusDescriptor" table="AssignmentLateStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.AssignmentLateStatusDescriptorAggregate.EdFi.AssignmentLateStatusDescriptor" lazy="false" discriminator-value="edfi.AssignmentLateStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AssignmentLateStatusDescriptor" >
           <key>
             <column name="AssignmentLateStatusDescriptorId" />
           </key>
@@ -2838,8 +2874,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.AttemptStatusDescriptorAggregate.EdFi.AttemptStatusDescriptor" table="AttemptStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.AttemptStatusDescriptorAggregate.EdFi.AttemptStatusDescriptor" lazy="false" discriminator-value="edfi.AttemptStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AttemptStatusDescriptor" >
           <key>
             <column name="AttemptStatusDescriptorId" />
           </key>
@@ -2852,8 +2890,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.AttendanceEventCategoryDescriptorAggregate.EdFi.AttendanceEventCategoryDescriptor" table="AttendanceEventCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.AttendanceEventCategoryDescriptorAggregate.EdFi.AttendanceEventCategoryDescriptor" lazy="false" discriminator-value="edfi.AttendanceEventCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AttendanceEventCategoryDescriptor" >
           <key>
             <column name="AttendanceEventCategoryDescriptorId" />
           </key>
@@ -2866,8 +2906,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.BarrierToInternetAccessInResidenceDescriptorAggregate.EdFi.BarrierToInternetAccessInResidenceDescriptor" table="BarrierToInternetAccessInResidenceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.BarrierToInternetAccessInResidenceDescriptorAggregate.EdFi.BarrierToInternetAccessInResidenceDescriptor" lazy="false" discriminator-value="edfi.BarrierToInternetAccessInResidenceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="BarrierToInternetAccessInResidenceDescriptor" >
           <key>
             <column name="BarrierToInternetAccessInResidenceDescriptorId" />
           </key>
@@ -2880,8 +2922,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.BehaviorDescriptorAggregate.EdFi.BehaviorDescriptor" table="BehaviorDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.BehaviorDescriptorAggregate.EdFi.BehaviorDescriptor" lazy="false" discriminator-value="edfi.BehaviorDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="BehaviorDescriptor" >
           <key>
             <column name="BehaviorDescriptorId" />
           </key>
@@ -2894,8 +2938,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CalendarEventDescriptorAggregate.EdFi.CalendarEventDescriptor" table="CalendarEventDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CalendarEventDescriptorAggregate.EdFi.CalendarEventDescriptor" lazy="false" discriminator-value="edfi.CalendarEventDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CalendarEventDescriptor" >
           <key>
             <column name="CalendarEventDescriptorId" />
           </key>
@@ -2908,8 +2954,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CalendarTypeDescriptorAggregate.EdFi.CalendarTypeDescriptor" table="CalendarTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CalendarTypeDescriptorAggregate.EdFi.CalendarTypeDescriptor" lazy="false" discriminator-value="edfi.CalendarTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CalendarTypeDescriptor" >
           <key>
             <column name="CalendarTypeDescriptorId" />
           </key>
@@ -2922,8 +2970,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CareerPathwayDescriptorAggregate.EdFi.CareerPathwayDescriptor" table="CareerPathwayDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CareerPathwayDescriptorAggregate.EdFi.CareerPathwayDescriptor" lazy="false" discriminator-value="edfi.CareerPathwayDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CareerPathwayDescriptor" >
           <key>
             <column name="CareerPathwayDescriptorId" />
           </key>
@@ -2936,8 +2986,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CharterApprovalAgencyTypeDescriptorAggregate.EdFi.CharterApprovalAgencyTypeDescriptor" table="CharterApprovalAgencyTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CharterApprovalAgencyTypeDescriptorAggregate.EdFi.CharterApprovalAgencyTypeDescriptor" lazy="false" discriminator-value="edfi.CharterApprovalAgencyTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CharterApprovalAgencyTypeDescriptor" >
           <key>
             <column name="CharterApprovalAgencyTypeDescriptorId" />
           </key>
@@ -2950,8 +3002,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CharterStatusDescriptorAggregate.EdFi.CharterStatusDescriptor" table="CharterStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CharterStatusDescriptorAggregate.EdFi.CharterStatusDescriptor" lazy="false" discriminator-value="edfi.CharterStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CharterStatusDescriptor" >
           <key>
             <column name="CharterStatusDescriptorId" />
           </key>
@@ -2964,8 +3018,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CitizenshipStatusDescriptorAggregate.EdFi.CitizenshipStatusDescriptor" table="CitizenshipStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CitizenshipStatusDescriptorAggregate.EdFi.CitizenshipStatusDescriptor" lazy="false" discriminator-value="edfi.CitizenshipStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CitizenshipStatusDescriptor" >
           <key>
             <column name="CitizenshipStatusDescriptorId" />
           </key>
@@ -2978,8 +3034,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ClassroomPositionDescriptorAggregate.EdFi.ClassroomPositionDescriptor" table="ClassroomPositionDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ClassroomPositionDescriptorAggregate.EdFi.ClassroomPositionDescriptor" lazy="false" discriminator-value="edfi.ClassroomPositionDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ClassroomPositionDescriptor" >
           <key>
             <column name="ClassroomPositionDescriptorId" />
           </key>
@@ -2992,8 +3050,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CohortScopeDescriptorAggregate.EdFi.CohortScopeDescriptor" table="CohortScopeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CohortScopeDescriptorAggregate.EdFi.CohortScopeDescriptor" lazy="false" discriminator-value="edfi.CohortScopeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CohortScopeDescriptor" >
           <key>
             <column name="CohortScopeDescriptorId" />
           </key>
@@ -3006,8 +3066,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CohortTypeDescriptorAggregate.EdFi.CohortTypeDescriptor" table="CohortTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CohortTypeDescriptorAggregate.EdFi.CohortTypeDescriptor" lazy="false" discriminator-value="edfi.CohortTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CohortTypeDescriptor" >
           <key>
             <column name="CohortTypeDescriptorId" />
           </key>
@@ -3020,8 +3082,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CohortYearTypeDescriptorAggregate.EdFi.CohortYearTypeDescriptor" table="CohortYearTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CohortYearTypeDescriptorAggregate.EdFi.CohortYearTypeDescriptor" lazy="false" discriminator-value="edfi.CohortYearTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CohortYearTypeDescriptor" >
           <key>
             <column name="CohortYearTypeDescriptorId" />
           </key>
@@ -3034,8 +3098,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CompetencyLevelDescriptorAggregate.EdFi.CompetencyLevelDescriptor" table="CompetencyLevelDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CompetencyLevelDescriptorAggregate.EdFi.CompetencyLevelDescriptor" lazy="false" discriminator-value="edfi.CompetencyLevelDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CompetencyLevelDescriptor" >
           <key>
             <column name="CompetencyLevelDescriptorId" />
           </key>
@@ -3048,8 +3114,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ContactTypeDescriptorAggregate.EdFi.ContactTypeDescriptor" table="ContactTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ContactTypeDescriptorAggregate.EdFi.ContactTypeDescriptor" lazy="false" discriminator-value="edfi.ContactTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ContactTypeDescriptor" >
           <key>
             <column name="ContactTypeDescriptorId" />
           </key>
@@ -3062,8 +3130,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ContentClassDescriptorAggregate.EdFi.ContentClassDescriptor" table="ContentClassDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ContentClassDescriptorAggregate.EdFi.ContentClassDescriptor" lazy="false" discriminator-value="edfi.ContentClassDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ContentClassDescriptor" >
           <key>
             <column name="ContentClassDescriptorId" />
           </key>
@@ -3076,8 +3146,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ContinuationOfServicesReasonDescriptorAggregate.EdFi.ContinuationOfServicesReasonDescriptor" table="ContinuationOfServicesReasonDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ContinuationOfServicesReasonDescriptorAggregate.EdFi.ContinuationOfServicesReasonDescriptor" lazy="false" discriminator-value="edfi.ContinuationOfServicesReasonDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ContinuationOfServicesReasonDescriptor" >
           <key>
             <column name="ContinuationOfServicesReasonDescriptorId" />
           </key>
@@ -3090,8 +3162,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CostRateDescriptorAggregate.EdFi.CostRateDescriptor" table="CostRateDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CostRateDescriptorAggregate.EdFi.CostRateDescriptor" lazy="false" discriminator-value="edfi.CostRateDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CostRateDescriptor" >
           <key>
             <column name="CostRateDescriptorId" />
           </key>
@@ -3104,8 +3178,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CountryDescriptorAggregate.EdFi.CountryDescriptor" table="CountryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CountryDescriptorAggregate.EdFi.CountryDescriptor" lazy="false" discriminator-value="edfi.CountryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CountryDescriptor" >
           <key>
             <column name="CountryDescriptorId" />
           </key>
@@ -3118,8 +3194,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CourseAttemptResultDescriptorAggregate.EdFi.CourseAttemptResultDescriptor" table="CourseAttemptResultDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CourseAttemptResultDescriptorAggregate.EdFi.CourseAttemptResultDescriptor" lazy="false" discriminator-value="edfi.CourseAttemptResultDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CourseAttemptResultDescriptor" >
           <key>
             <column name="CourseAttemptResultDescriptorId" />
           </key>
@@ -3132,8 +3210,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CourseDefinedByDescriptorAggregate.EdFi.CourseDefinedByDescriptor" table="CourseDefinedByDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CourseDefinedByDescriptorAggregate.EdFi.CourseDefinedByDescriptor" lazy="false" discriminator-value="edfi.CourseDefinedByDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CourseDefinedByDescriptor" >
           <key>
             <column name="CourseDefinedByDescriptorId" />
           </key>
@@ -3146,8 +3226,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CourseGPAApplicabilityDescriptorAggregate.EdFi.CourseGPAApplicabilityDescriptor" table="CourseGPAApplicabilityDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CourseGPAApplicabilityDescriptorAggregate.EdFi.CourseGPAApplicabilityDescriptor" lazy="false" discriminator-value="edfi.CourseGPAApplicabilityDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CourseGPAApplicabilityDescriptor" >
           <key>
             <column name="CourseGPAApplicabilityDescriptorId" />
           </key>
@@ -3160,8 +3242,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CourseIdentificationSystemDescriptorAggregate.EdFi.CourseIdentificationSystemDescriptor" table="CourseIdentificationSystemDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CourseIdentificationSystemDescriptorAggregate.EdFi.CourseIdentificationSystemDescriptor" lazy="false" discriminator-value="edfi.CourseIdentificationSystemDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CourseIdentificationSystemDescriptor" >
           <key>
             <column name="CourseIdentificationSystemDescriptorId" />
           </key>
@@ -3174,8 +3258,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CourseLevelCharacteristicDescriptorAggregate.EdFi.CourseLevelCharacteristicDescriptor" table="CourseLevelCharacteristicDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CourseLevelCharacteristicDescriptorAggregate.EdFi.CourseLevelCharacteristicDescriptor" lazy="false" discriminator-value="edfi.CourseLevelCharacteristicDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CourseLevelCharacteristicDescriptor" >
           <key>
             <column name="CourseLevelCharacteristicDescriptorId" />
           </key>
@@ -3188,8 +3274,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CourseRepeatCodeDescriptorAggregate.EdFi.CourseRepeatCodeDescriptor" table="CourseRepeatCodeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CourseRepeatCodeDescriptorAggregate.EdFi.CourseRepeatCodeDescriptor" lazy="false" discriminator-value="edfi.CourseRepeatCodeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CourseRepeatCodeDescriptor" >
           <key>
             <column name="CourseRepeatCodeDescriptorId" />
           </key>
@@ -3202,8 +3290,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CredentialFieldDescriptorAggregate.EdFi.CredentialFieldDescriptor" table="CredentialFieldDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CredentialFieldDescriptorAggregate.EdFi.CredentialFieldDescriptor" lazy="false" discriminator-value="edfi.CredentialFieldDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CredentialFieldDescriptor" >
           <key>
             <column name="CredentialFieldDescriptorId" />
           </key>
@@ -3216,8 +3306,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CredentialTypeDescriptorAggregate.EdFi.CredentialTypeDescriptor" table="CredentialTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CredentialTypeDescriptorAggregate.EdFi.CredentialTypeDescriptor" lazy="false" discriminator-value="edfi.CredentialTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CredentialTypeDescriptor" >
           <key>
             <column name="CredentialTypeDescriptorId" />
           </key>
@@ -3230,8 +3322,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CreditCategoryDescriptorAggregate.EdFi.CreditCategoryDescriptor" table="CreditCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CreditCategoryDescriptorAggregate.EdFi.CreditCategoryDescriptor" lazy="false" discriminator-value="edfi.CreditCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CreditCategoryDescriptor" >
           <key>
             <column name="CreditCategoryDescriptorId" />
           </key>
@@ -3244,8 +3338,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CreditTypeDescriptorAggregate.EdFi.CreditTypeDescriptor" table="CreditTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CreditTypeDescriptorAggregate.EdFi.CreditTypeDescriptor" lazy="false" discriminator-value="edfi.CreditTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CreditTypeDescriptor" >
           <key>
             <column name="CreditTypeDescriptorId" />
           </key>
@@ -3258,8 +3354,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CTEProgramServiceDescriptorAggregate.EdFi.CTEProgramServiceDescriptor" table="CTEProgramServiceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CTEProgramServiceDescriptorAggregate.EdFi.CTEProgramServiceDescriptor" lazy="false" discriminator-value="edfi.CTEProgramServiceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CTEProgramServiceDescriptor" >
           <key>
             <column name="CTEProgramServiceDescriptorId" />
           </key>
@@ -3272,8 +3370,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CurriculumUsedDescriptorAggregate.EdFi.CurriculumUsedDescriptor" table="CurriculumUsedDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CurriculumUsedDescriptorAggregate.EdFi.CurriculumUsedDescriptor" lazy="false" discriminator-value="edfi.CurriculumUsedDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CurriculumUsedDescriptor" >
           <key>
             <column name="CurriculumUsedDescriptorId" />
           </key>
@@ -3286,8 +3386,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.DeliveryMethodDescriptorAggregate.EdFi.DeliveryMethodDescriptor" table="DeliveryMethodDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.DeliveryMethodDescriptorAggregate.EdFi.DeliveryMethodDescriptor" lazy="false" discriminator-value="edfi.DeliveryMethodDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="DeliveryMethodDescriptor" >
           <key>
             <column name="DeliveryMethodDescriptorId" />
           </key>
@@ -3300,8 +3402,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.DiagnosisDescriptorAggregate.EdFi.DiagnosisDescriptor" table="DiagnosisDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.DiagnosisDescriptorAggregate.EdFi.DiagnosisDescriptor" lazy="false" discriminator-value="edfi.DiagnosisDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="DiagnosisDescriptor" >
           <key>
             <column name="DiagnosisDescriptorId" />
           </key>
@@ -3314,8 +3418,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.DiplomaLevelDescriptorAggregate.EdFi.DiplomaLevelDescriptor" table="DiplomaLevelDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.DiplomaLevelDescriptorAggregate.EdFi.DiplomaLevelDescriptor" lazy="false" discriminator-value="edfi.DiplomaLevelDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="DiplomaLevelDescriptor" >
           <key>
             <column name="DiplomaLevelDescriptorId" />
           </key>
@@ -3328,8 +3434,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.DiplomaTypeDescriptorAggregate.EdFi.DiplomaTypeDescriptor" table="DiplomaTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.DiplomaTypeDescriptorAggregate.EdFi.DiplomaTypeDescriptor" lazy="false" discriminator-value="edfi.DiplomaTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="DiplomaTypeDescriptor" >
           <key>
             <column name="DiplomaTypeDescriptorId" />
           </key>
@@ -3342,8 +3450,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.DisabilityDescriptorAggregate.EdFi.DisabilityDescriptor" table="DisabilityDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.DisabilityDescriptorAggregate.EdFi.DisabilityDescriptor" lazy="false" discriminator-value="edfi.DisabilityDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="DisabilityDescriptor" >
           <key>
             <column name="DisabilityDescriptorId" />
           </key>
@@ -3356,8 +3466,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.DisabilityDesignationDescriptorAggregate.EdFi.DisabilityDesignationDescriptor" table="DisabilityDesignationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.DisabilityDesignationDescriptorAggregate.EdFi.DisabilityDesignationDescriptor" lazy="false" discriminator-value="edfi.DisabilityDesignationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="DisabilityDesignationDescriptor" >
           <key>
             <column name="DisabilityDesignationDescriptorId" />
           </key>
@@ -3370,8 +3482,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.DisabilityDeterminationSourceTypeDescriptorAggregate.EdFi.DisabilityDeterminationSourceTypeDescriptor" table="DisabilityDeterminationSourceTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.DisabilityDeterminationSourceTypeDescriptorAggregate.EdFi.DisabilityDeterminationSourceTypeDescriptor" lazy="false" discriminator-value="edfi.DisabilityDeterminationSourceTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="DisabilityDeterminationSourceTypeDescriptor" >
           <key>
             <column name="DisabilityDeterminationSourceTypeDescriptorId" />
           </key>
@@ -3384,8 +3498,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.DisciplineActionLengthDifferenceReasonDescriptorAggregate.EdFi.DisciplineActionLengthDifferenceReasonDescriptor" table="DisciplineActionLengthDifferenceReasonDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.DisciplineActionLengthDifferenceReasonDescriptorAggregate.EdFi.DisciplineActionLengthDifferenceReasonDescriptor" lazy="false" discriminator-value="edfi.DisciplineActionLengthDifferenceReasonDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="DisciplineActionLengthDifferenceReasonDescriptor" >
           <key>
             <column name="DisciplineActionLengthDifferenceReasonDescriptorId" />
           </key>
@@ -3398,8 +3514,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.DisciplineDescriptorAggregate.EdFi.DisciplineDescriptor" table="DisciplineDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.DisciplineDescriptorAggregate.EdFi.DisciplineDescriptor" lazy="false" discriminator-value="edfi.DisciplineDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="DisciplineDescriptor" >
           <key>
             <column name="DisciplineDescriptorId" />
           </key>
@@ -3412,8 +3530,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.DisciplineIncidentParticipationCodeDescriptorAggregate.EdFi.DisciplineIncidentParticipationCodeDescriptor" table="DisciplineIncidentParticipationCodeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.DisciplineIncidentParticipationCodeDescriptorAggregate.EdFi.DisciplineIncidentParticipationCodeDescriptor" lazy="false" discriminator-value="edfi.DisciplineIncidentParticipationCodeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="DisciplineIncidentParticipationCodeDescriptor" >
           <key>
             <column name="DisciplineIncidentParticipationCodeDescriptorId" />
           </key>
@@ -3426,8 +3546,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.EducationalEnvironmentDescriptorAggregate.EdFi.EducationalEnvironmentDescriptor" table="EducationalEnvironmentDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.EducationalEnvironmentDescriptorAggregate.EdFi.EducationalEnvironmentDescriptor" lazy="false" discriminator-value="edfi.EducationalEnvironmentDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="EducationalEnvironmentDescriptor" >
           <key>
             <column name="EducationalEnvironmentDescriptorId" />
           </key>
@@ -3440,8 +3562,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.EducationOrganizationAssociationTypeDescriptorAggregate.EdFi.EducationOrganizationAssociationTypeDescriptor" table="EducationOrganizationAssociationTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.EducationOrganizationAssociationTypeDescriptorAggregate.EdFi.EducationOrganizationAssociationTypeDescriptor" lazy="false" discriminator-value="edfi.EducationOrganizationAssociationTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="EducationOrganizationAssociationTypeDescriptor" >
           <key>
             <column name="EducationOrganizationAssociationTypeDescriptorId" />
           </key>
@@ -3454,8 +3578,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.EducationOrganizationCategoryDescriptorAggregate.EdFi.EducationOrganizationCategoryDescriptor" table="EducationOrganizationCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.EducationOrganizationCategoryDescriptorAggregate.EdFi.EducationOrganizationCategoryDescriptor" lazy="false" discriminator-value="edfi.EducationOrganizationCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="EducationOrganizationCategoryDescriptor" >
           <key>
             <column name="EducationOrganizationCategoryDescriptorId" />
           </key>
@@ -3468,8 +3594,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.EducationOrganizationIdentificationSystemDescriptorAggregate.EdFi.EducationOrganizationIdentificationSystemDescriptor" table="EducationOrganizationIdentificationSystemDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.EducationOrganizationIdentificationSystemDescriptorAggregate.EdFi.EducationOrganizationIdentificationSystemDescriptor" lazy="false" discriminator-value="edfi.EducationOrganizationIdentificationSystemDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="EducationOrganizationIdentificationSystemDescriptor" >
           <key>
             <column name="EducationOrganizationIdentificationSystemDescriptorId" />
           </key>
@@ -3482,8 +3610,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.EducationPlanDescriptorAggregate.EdFi.EducationPlanDescriptor" table="EducationPlanDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.EducationPlanDescriptorAggregate.EdFi.EducationPlanDescriptor" lazy="false" discriminator-value="edfi.EducationPlanDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="EducationPlanDescriptor" >
           <key>
             <column name="EducationPlanDescriptorId" />
           </key>
@@ -3496,8 +3626,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ElectronicMailTypeDescriptorAggregate.EdFi.ElectronicMailTypeDescriptor" table="ElectronicMailTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ElectronicMailTypeDescriptorAggregate.EdFi.ElectronicMailTypeDescriptor" lazy="false" discriminator-value="edfi.ElectronicMailTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ElectronicMailTypeDescriptor" >
           <key>
             <column name="ElectronicMailTypeDescriptorId" />
           </key>
@@ -3510,8 +3642,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.EmploymentStatusDescriptorAggregate.EdFi.EmploymentStatusDescriptor" table="EmploymentStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.EmploymentStatusDescriptorAggregate.EdFi.EmploymentStatusDescriptor" lazy="false" discriminator-value="edfi.EmploymentStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="EmploymentStatusDescriptor" >
           <key>
             <column name="EmploymentStatusDescriptorId" />
           </key>
@@ -3524,8 +3658,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.EntryGradeLevelReasonDescriptorAggregate.EdFi.EntryGradeLevelReasonDescriptor" table="EntryGradeLevelReasonDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.EntryGradeLevelReasonDescriptorAggregate.EdFi.EntryGradeLevelReasonDescriptor" lazy="false" discriminator-value="edfi.EntryGradeLevelReasonDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="EntryGradeLevelReasonDescriptor" >
           <key>
             <column name="EntryGradeLevelReasonDescriptorId" />
           </key>
@@ -3538,8 +3674,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.EntryTypeDescriptorAggregate.EdFi.EntryTypeDescriptor" table="EntryTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.EntryTypeDescriptorAggregate.EdFi.EntryTypeDescriptor" lazy="false" discriminator-value="edfi.EntryTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="EntryTypeDescriptor" >
           <key>
             <column name="EntryTypeDescriptorId" />
           </key>
@@ -3552,8 +3690,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.EventCircumstanceDescriptorAggregate.EdFi.EventCircumstanceDescriptor" table="EventCircumstanceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.EventCircumstanceDescriptorAggregate.EdFi.EventCircumstanceDescriptor" lazy="false" discriminator-value="edfi.EventCircumstanceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="EventCircumstanceDescriptor" >
           <key>
             <column name="EventCircumstanceDescriptorId" />
           </key>
@@ -3566,8 +3706,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ExitWithdrawTypeDescriptorAggregate.EdFi.ExitWithdrawTypeDescriptor" table="ExitWithdrawTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ExitWithdrawTypeDescriptorAggregate.EdFi.ExitWithdrawTypeDescriptor" lazy="false" discriminator-value="edfi.ExitWithdrawTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ExitWithdrawTypeDescriptor" >
           <key>
             <column name="ExitWithdrawTypeDescriptorId" />
           </key>
@@ -3580,8 +3722,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.FinancialCollectionDescriptorAggregate.EdFi.FinancialCollectionDescriptor" table="FinancialCollectionDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.FinancialCollectionDescriptorAggregate.EdFi.FinancialCollectionDescriptor" lazy="false" discriminator-value="edfi.FinancialCollectionDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="FinancialCollectionDescriptor" >
           <key>
             <column name="FinancialCollectionDescriptorId" />
           </key>
@@ -3594,8 +3738,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.GradebookEntryTypeDescriptorAggregate.EdFi.GradebookEntryTypeDescriptor" table="GradebookEntryTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.GradebookEntryTypeDescriptorAggregate.EdFi.GradebookEntryTypeDescriptor" lazy="false" discriminator-value="edfi.GradebookEntryTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="GradebookEntryTypeDescriptor" >
           <key>
             <column name="GradebookEntryTypeDescriptorId" />
           </key>
@@ -3608,8 +3754,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.GradeLevelDescriptorAggregate.EdFi.GradeLevelDescriptor" table="GradeLevelDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.GradeLevelDescriptorAggregate.EdFi.GradeLevelDescriptor" lazy="false" discriminator-value="edfi.GradeLevelDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="GradeLevelDescriptor" >
           <key>
             <column name="GradeLevelDescriptorId" />
           </key>
@@ -3622,8 +3770,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.GradePointAverageTypeDescriptorAggregate.EdFi.GradePointAverageTypeDescriptor" table="GradePointAverageTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.GradePointAverageTypeDescriptorAggregate.EdFi.GradePointAverageTypeDescriptor" lazy="false" discriminator-value="edfi.GradePointAverageTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="GradePointAverageTypeDescriptor" >
           <key>
             <column name="GradePointAverageTypeDescriptorId" />
           </key>
@@ -3636,8 +3786,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.GradeTypeDescriptorAggregate.EdFi.GradeTypeDescriptor" table="GradeTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.GradeTypeDescriptorAggregate.EdFi.GradeTypeDescriptor" lazy="false" discriminator-value="edfi.GradeTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="GradeTypeDescriptor" >
           <key>
             <column name="GradeTypeDescriptorId" />
           </key>
@@ -3650,8 +3802,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.GradingPeriodDescriptorAggregate.EdFi.GradingPeriodDescriptor" table="GradingPeriodDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.GradingPeriodDescriptorAggregate.EdFi.GradingPeriodDescriptor" lazy="false" discriminator-value="edfi.GradingPeriodDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="GradingPeriodDescriptor" >
           <key>
             <column name="GradingPeriodDescriptorId" />
           </key>
@@ -3664,8 +3818,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.GraduationPlanTypeDescriptorAggregate.EdFi.GraduationPlanTypeDescriptor" table="GraduationPlanTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.GraduationPlanTypeDescriptorAggregate.EdFi.GraduationPlanTypeDescriptor" lazy="false" discriminator-value="edfi.GraduationPlanTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="GraduationPlanTypeDescriptor" >
           <key>
             <column name="GraduationPlanTypeDescriptorId" />
           </key>
@@ -3678,8 +3834,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.GunFreeSchoolsActReportingStatusDescriptorAggregate.EdFi.GunFreeSchoolsActReportingStatusDescriptor" table="GunFreeSchoolsActReportingStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.GunFreeSchoolsActReportingStatusDescriptorAggregate.EdFi.GunFreeSchoolsActReportingStatusDescriptor" lazy="false" discriminator-value="edfi.GunFreeSchoolsActReportingStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="GunFreeSchoolsActReportingStatusDescriptor" >
           <key>
             <column name="GunFreeSchoolsActReportingStatusDescriptorId" />
           </key>
@@ -3692,8 +3850,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.HomelessPrimaryNighttimeResidenceDescriptorAggregate.EdFi.HomelessPrimaryNighttimeResidenceDescriptor" table="HomelessPrimaryNighttimeResidenceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.HomelessPrimaryNighttimeResidenceDescriptorAggregate.EdFi.HomelessPrimaryNighttimeResidenceDescriptor" lazy="false" discriminator-value="edfi.HomelessPrimaryNighttimeResidenceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="HomelessPrimaryNighttimeResidenceDescriptor" >
           <key>
             <column name="HomelessPrimaryNighttimeResidenceDescriptorId" />
           </key>
@@ -3706,8 +3866,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.HomelessProgramServiceDescriptorAggregate.EdFi.HomelessProgramServiceDescriptor" table="HomelessProgramServiceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.HomelessProgramServiceDescriptorAggregate.EdFi.HomelessProgramServiceDescriptor" lazy="false" discriminator-value="edfi.HomelessProgramServiceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="HomelessProgramServiceDescriptor" >
           <key>
             <column name="HomelessProgramServiceDescriptorId" />
           </key>
@@ -3720,8 +3882,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.IdentificationDocumentUseDescriptorAggregate.EdFi.IdentificationDocumentUseDescriptor" table="IdentificationDocumentUseDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.IdentificationDocumentUseDescriptorAggregate.EdFi.IdentificationDocumentUseDescriptor" lazy="false" discriminator-value="edfi.IdentificationDocumentUseDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="IdentificationDocumentUseDescriptor" >
           <key>
             <column name="IdentificationDocumentUseDescriptorId" />
           </key>
@@ -3734,8 +3898,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.IncidentLocationDescriptorAggregate.EdFi.IncidentLocationDescriptor" table="IncidentLocationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.IncidentLocationDescriptorAggregate.EdFi.IncidentLocationDescriptor" lazy="false" discriminator-value="edfi.IncidentLocationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="IncidentLocationDescriptor" >
           <key>
             <column name="IncidentLocationDescriptorId" />
           </key>
@@ -3748,8 +3914,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.IndicatorDescriptorAggregate.EdFi.IndicatorDescriptor" table="IndicatorDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.IndicatorDescriptorAggregate.EdFi.IndicatorDescriptor" lazy="false" discriminator-value="edfi.IndicatorDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="IndicatorDescriptor" >
           <key>
             <column name="IndicatorDescriptorId" />
           </key>
@@ -3762,8 +3930,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.IndicatorGroupDescriptorAggregate.EdFi.IndicatorGroupDescriptor" table="IndicatorGroupDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.IndicatorGroupDescriptorAggregate.EdFi.IndicatorGroupDescriptor" lazy="false" discriminator-value="edfi.IndicatorGroupDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="IndicatorGroupDescriptor" >
           <key>
             <column name="IndicatorGroupDescriptorId" />
           </key>
@@ -3776,8 +3946,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.IndicatorLevelDescriptorAggregate.EdFi.IndicatorLevelDescriptor" table="IndicatorLevelDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.IndicatorLevelDescriptorAggregate.EdFi.IndicatorLevelDescriptor" lazy="false" discriminator-value="edfi.IndicatorLevelDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="IndicatorLevelDescriptor" >
           <key>
             <column name="IndicatorLevelDescriptorId" />
           </key>
@@ -3790,8 +3962,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.InstitutionTelephoneNumberTypeDescriptorAggregate.EdFi.InstitutionTelephoneNumberTypeDescriptor" table="InstitutionTelephoneNumberTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.InstitutionTelephoneNumberTypeDescriptorAggregate.EdFi.InstitutionTelephoneNumberTypeDescriptor" lazy="false" discriminator-value="edfi.InstitutionTelephoneNumberTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="InstitutionTelephoneNumberTypeDescriptor" >
           <key>
             <column name="InstitutionTelephoneNumberTypeDescriptorId" />
           </key>
@@ -3804,8 +3978,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.InteractivityStyleDescriptorAggregate.EdFi.InteractivityStyleDescriptor" table="InteractivityStyleDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.InteractivityStyleDescriptorAggregate.EdFi.InteractivityStyleDescriptor" lazy="false" discriminator-value="edfi.InteractivityStyleDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="InteractivityStyleDescriptor" >
           <key>
             <column name="InteractivityStyleDescriptorId" />
           </key>
@@ -3818,8 +3994,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.InternetAccessDescriptorAggregate.EdFi.InternetAccessDescriptor" table="InternetAccessDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.InternetAccessDescriptorAggregate.EdFi.InternetAccessDescriptor" lazy="false" discriminator-value="edfi.InternetAccessDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="InternetAccessDescriptor" >
           <key>
             <column name="InternetAccessDescriptorId" />
           </key>
@@ -3832,8 +4010,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.InternetAccessTypeInResidenceDescriptorAggregate.EdFi.InternetAccessTypeInResidenceDescriptor" table="InternetAccessTypeInResidenceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.InternetAccessTypeInResidenceDescriptorAggregate.EdFi.InternetAccessTypeInResidenceDescriptor" lazy="false" discriminator-value="edfi.InternetAccessTypeInResidenceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="InternetAccessTypeInResidenceDescriptor" >
           <key>
             <column name="InternetAccessTypeInResidenceDescriptorId" />
           </key>
@@ -3846,8 +4026,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.InternetPerformanceInResidenceDescriptorAggregate.EdFi.InternetPerformanceInResidenceDescriptor" table="InternetPerformanceInResidenceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.InternetPerformanceInResidenceDescriptorAggregate.EdFi.InternetPerformanceInResidenceDescriptor" lazy="false" discriminator-value="edfi.InternetPerformanceInResidenceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="InternetPerformanceInResidenceDescriptor" >
           <key>
             <column name="InternetPerformanceInResidenceDescriptorId" />
           </key>
@@ -3860,8 +4042,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.InterventionClassDescriptorAggregate.EdFi.InterventionClassDescriptor" table="InterventionClassDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.InterventionClassDescriptorAggregate.EdFi.InterventionClassDescriptor" lazy="false" discriminator-value="edfi.InterventionClassDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="InterventionClassDescriptor" >
           <key>
             <column name="InterventionClassDescriptorId" />
           </key>
@@ -3874,8 +4058,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.InterventionEffectivenessRatingDescriptorAggregate.EdFi.InterventionEffectivenessRatingDescriptor" table="InterventionEffectivenessRatingDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.InterventionEffectivenessRatingDescriptorAggregate.EdFi.InterventionEffectivenessRatingDescriptor" lazy="false" discriminator-value="edfi.InterventionEffectivenessRatingDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="InterventionEffectivenessRatingDescriptor" >
           <key>
             <column name="InterventionEffectivenessRatingDescriptorId" />
           </key>
@@ -3888,8 +4074,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.LanguageDescriptorAggregate.EdFi.LanguageDescriptor" table="LanguageDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.LanguageDescriptorAggregate.EdFi.LanguageDescriptor" lazy="false" discriminator-value="edfi.LanguageDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LanguageDescriptor" >
           <key>
             <column name="LanguageDescriptorId" />
           </key>
@@ -3902,8 +4090,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.LanguageInstructionProgramServiceDescriptorAggregate.EdFi.LanguageInstructionProgramServiceDescriptor" table="LanguageInstructionProgramServiceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.LanguageInstructionProgramServiceDescriptorAggregate.EdFi.LanguageInstructionProgramServiceDescriptor" lazy="false" discriminator-value="edfi.LanguageInstructionProgramServiceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LanguageInstructionProgramServiceDescriptor" >
           <key>
             <column name="LanguageInstructionProgramServiceDescriptorId" />
           </key>
@@ -3916,8 +4106,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.LanguageUseDescriptorAggregate.EdFi.LanguageUseDescriptor" table="LanguageUseDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.LanguageUseDescriptorAggregate.EdFi.LanguageUseDescriptor" lazy="false" discriminator-value="edfi.LanguageUseDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LanguageUseDescriptor" >
           <key>
             <column name="LanguageUseDescriptorId" />
           </key>
@@ -3930,8 +4122,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.LearningStandardCategoryDescriptorAggregate.EdFi.LearningStandardCategoryDescriptor" table="LearningStandardCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.LearningStandardCategoryDescriptorAggregate.EdFi.LearningStandardCategoryDescriptor" lazy="false" discriminator-value="edfi.LearningStandardCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LearningStandardCategoryDescriptor" >
           <key>
             <column name="LearningStandardCategoryDescriptorId" />
           </key>
@@ -3944,8 +4138,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.LearningStandardEquivalenceStrengthDescriptorAggregate.EdFi.LearningStandardEquivalenceStrengthDescriptor" table="LearningStandardEquivalenceStrengthDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.LearningStandardEquivalenceStrengthDescriptorAggregate.EdFi.LearningStandardEquivalenceStrengthDescriptor" lazy="false" discriminator-value="edfi.LearningStandardEquivalenceStrengthDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LearningStandardEquivalenceStrengthDescriptor" >
           <key>
             <column name="LearningStandardEquivalenceStrengthDescriptorId" />
           </key>
@@ -3958,8 +4154,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.LearningStandardScopeDescriptorAggregate.EdFi.LearningStandardScopeDescriptor" table="LearningStandardScopeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.LearningStandardScopeDescriptorAggregate.EdFi.LearningStandardScopeDescriptor" lazy="false" discriminator-value="edfi.LearningStandardScopeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LearningStandardScopeDescriptor" >
           <key>
             <column name="LearningStandardScopeDescriptorId" />
           </key>
@@ -3972,8 +4170,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.LevelOfEducationDescriptorAggregate.EdFi.LevelOfEducationDescriptor" table="LevelOfEducationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.LevelOfEducationDescriptorAggregate.EdFi.LevelOfEducationDescriptor" lazy="false" discriminator-value="edfi.LevelOfEducationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LevelOfEducationDescriptor" >
           <key>
             <column name="LevelOfEducationDescriptorId" />
           </key>
@@ -3986,8 +4186,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.LicenseStatusDescriptorAggregate.EdFi.LicenseStatusDescriptor" table="LicenseStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.LicenseStatusDescriptorAggregate.EdFi.LicenseStatusDescriptor" lazy="false" discriminator-value="edfi.LicenseStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LicenseStatusDescriptor" >
           <key>
             <column name="LicenseStatusDescriptorId" />
           </key>
@@ -4000,8 +4202,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.LicenseTypeDescriptorAggregate.EdFi.LicenseTypeDescriptor" table="LicenseTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.LicenseTypeDescriptorAggregate.EdFi.LicenseTypeDescriptor" lazy="false" discriminator-value="edfi.LicenseTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LicenseTypeDescriptor" >
           <key>
             <column name="LicenseTypeDescriptorId" />
           </key>
@@ -4014,8 +4218,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.LimitedEnglishProficiencyDescriptorAggregate.EdFi.LimitedEnglishProficiencyDescriptor" table="LimitedEnglishProficiencyDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.LimitedEnglishProficiencyDescriptorAggregate.EdFi.LimitedEnglishProficiencyDescriptor" lazy="false" discriminator-value="edfi.LimitedEnglishProficiencyDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LimitedEnglishProficiencyDescriptor" >
           <key>
             <column name="LimitedEnglishProficiencyDescriptorId" />
           </key>
@@ -4028,8 +4234,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.LocaleDescriptorAggregate.EdFi.LocaleDescriptor" table="LocaleDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.LocaleDescriptorAggregate.EdFi.LocaleDescriptor" lazy="false" discriminator-value="edfi.LocaleDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LocaleDescriptor" >
           <key>
             <column name="LocaleDescriptorId" />
           </key>
@@ -4042,8 +4250,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.LocalEducationAgencyCategoryDescriptorAggregate.EdFi.LocalEducationAgencyCategoryDescriptor" table="LocalEducationAgencyCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.LocalEducationAgencyCategoryDescriptorAggregate.EdFi.LocalEducationAgencyCategoryDescriptor" lazy="false" discriminator-value="edfi.LocalEducationAgencyCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LocalEducationAgencyCategoryDescriptor" >
           <key>
             <column name="LocalEducationAgencyCategoryDescriptorId" />
           </key>
@@ -4056,8 +4266,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.MagnetSpecialProgramEmphasisSchoolDescriptorAggregate.EdFi.MagnetSpecialProgramEmphasisSchoolDescriptor" table="MagnetSpecialProgramEmphasisSchoolDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.MagnetSpecialProgramEmphasisSchoolDescriptorAggregate.EdFi.MagnetSpecialProgramEmphasisSchoolDescriptor" lazy="false" discriminator-value="edfi.MagnetSpecialProgramEmphasisSchoolDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="MagnetSpecialProgramEmphasisSchoolDescriptor" >
           <key>
             <column name="MagnetSpecialProgramEmphasisSchoolDescriptorId" />
           </key>
@@ -4070,8 +4282,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.MediumOfInstructionDescriptorAggregate.EdFi.MediumOfInstructionDescriptor" table="MediumOfInstructionDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.MediumOfInstructionDescriptorAggregate.EdFi.MediumOfInstructionDescriptor" lazy="false" discriminator-value="edfi.MediumOfInstructionDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="MediumOfInstructionDescriptor" >
           <key>
             <column name="MediumOfInstructionDescriptorId" />
           </key>
@@ -4084,8 +4298,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.MethodCreditEarnedDescriptorAggregate.EdFi.MethodCreditEarnedDescriptor" table="MethodCreditEarnedDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.MethodCreditEarnedDescriptorAggregate.EdFi.MethodCreditEarnedDescriptor" lazy="false" discriminator-value="edfi.MethodCreditEarnedDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="MethodCreditEarnedDescriptor" >
           <key>
             <column name="MethodCreditEarnedDescriptorId" />
           </key>
@@ -4098,8 +4314,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.MigrantEducationProgramServiceDescriptorAggregate.EdFi.MigrantEducationProgramServiceDescriptor" table="MigrantEducationProgramServiceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.MigrantEducationProgramServiceDescriptorAggregate.EdFi.MigrantEducationProgramServiceDescriptor" lazy="false" discriminator-value="edfi.MigrantEducationProgramServiceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="MigrantEducationProgramServiceDescriptor" >
           <key>
             <column name="MigrantEducationProgramServiceDescriptorId" />
           </key>
@@ -4112,8 +4330,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ModelEntityDescriptorAggregate.EdFi.ModelEntityDescriptor" table="ModelEntityDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ModelEntityDescriptorAggregate.EdFi.ModelEntityDescriptor" lazy="false" discriminator-value="edfi.ModelEntityDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ModelEntityDescriptor" >
           <key>
             <column name="ModelEntityDescriptorId" />
           </key>
@@ -4126,8 +4346,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.MonitoredDescriptorAggregate.EdFi.MonitoredDescriptor" table="MonitoredDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.MonitoredDescriptorAggregate.EdFi.MonitoredDescriptor" lazy="false" discriminator-value="edfi.MonitoredDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="MonitoredDescriptor" >
           <key>
             <column name="MonitoredDescriptorId" />
           </key>
@@ -4140,8 +4362,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.NeglectedOrDelinquentProgramDescriptorAggregate.EdFi.NeglectedOrDelinquentProgramDescriptor" table="NeglectedOrDelinquentProgramDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.NeglectedOrDelinquentProgramDescriptorAggregate.EdFi.NeglectedOrDelinquentProgramDescriptor" lazy="false" discriminator-value="edfi.NeglectedOrDelinquentProgramDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="NeglectedOrDelinquentProgramDescriptor" >
           <key>
             <column name="NeglectedOrDelinquentProgramDescriptorId" />
           </key>
@@ -4154,8 +4378,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.NeglectedOrDelinquentProgramServiceDescriptorAggregate.EdFi.NeglectedOrDelinquentProgramServiceDescriptor" table="NeglectedOrDelinquentProgramServiceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.NeglectedOrDelinquentProgramServiceDescriptorAggregate.EdFi.NeglectedOrDelinquentProgramServiceDescriptor" lazy="false" discriminator-value="edfi.NeglectedOrDelinquentProgramServiceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="NeglectedOrDelinquentProgramServiceDescriptor" >
           <key>
             <column name="NeglectedOrDelinquentProgramServiceDescriptorId" />
           </key>
@@ -4168,8 +4394,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.NetworkPurposeDescriptorAggregate.EdFi.NetworkPurposeDescriptor" table="NetworkPurposeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.NetworkPurposeDescriptorAggregate.EdFi.NetworkPurposeDescriptor" lazy="false" discriminator-value="edfi.NetworkPurposeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="NetworkPurposeDescriptor" >
           <key>
             <column name="NetworkPurposeDescriptorId" />
           </key>
@@ -4182,8 +4410,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.OldEthnicityDescriptorAggregate.EdFi.OldEthnicityDescriptor" table="OldEthnicityDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.OldEthnicityDescriptorAggregate.EdFi.OldEthnicityDescriptor" lazy="false" discriminator-value="edfi.OldEthnicityDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="OldEthnicityDescriptor" >
           <key>
             <column name="OldEthnicityDescriptorId" />
           </key>
@@ -4196,8 +4426,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.OperationalStatusDescriptorAggregate.EdFi.OperationalStatusDescriptor" table="OperationalStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.OperationalStatusDescriptorAggregate.EdFi.OperationalStatusDescriptor" lazy="false" discriminator-value="edfi.OperationalStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="OperationalStatusDescriptor" >
           <key>
             <column name="OperationalStatusDescriptorId" />
           </key>
@@ -4210,8 +4442,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.OtherNameTypeDescriptorAggregate.EdFi.OtherNameTypeDescriptor" table="OtherNameTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.OtherNameTypeDescriptorAggregate.EdFi.OtherNameTypeDescriptor" lazy="false" discriminator-value="edfi.OtherNameTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="OtherNameTypeDescriptor" >
           <key>
             <column name="OtherNameTypeDescriptorId" />
           </key>
@@ -4224,8 +4458,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ParticipationDescriptorAggregate.EdFi.ParticipationDescriptor" table="ParticipationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ParticipationDescriptorAggregate.EdFi.ParticipationDescriptor" lazy="false" discriminator-value="edfi.ParticipationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ParticipationDescriptor" >
           <key>
             <column name="ParticipationDescriptorId" />
           </key>
@@ -4238,8 +4474,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ParticipationStatusDescriptorAggregate.EdFi.ParticipationStatusDescriptor" table="ParticipationStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ParticipationStatusDescriptorAggregate.EdFi.ParticipationStatusDescriptor" lazy="false" discriminator-value="edfi.ParticipationStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ParticipationStatusDescriptor" >
           <key>
             <column name="ParticipationStatusDescriptorId" />
           </key>
@@ -4252,8 +4490,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.PerformanceBaseConversionDescriptorAggregate.EdFi.PerformanceBaseConversionDescriptor" table="PerformanceBaseConversionDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.PerformanceBaseConversionDescriptorAggregate.EdFi.PerformanceBaseConversionDescriptor" lazy="false" discriminator-value="edfi.PerformanceBaseConversionDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PerformanceBaseConversionDescriptor" >
           <key>
             <column name="PerformanceBaseConversionDescriptorId" />
           </key>
@@ -4266,8 +4506,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.PerformanceLevelDescriptorAggregate.EdFi.PerformanceLevelDescriptor" table="PerformanceLevelDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.PerformanceLevelDescriptorAggregate.EdFi.PerformanceLevelDescriptor" lazy="false" discriminator-value="edfi.PerformanceLevelDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PerformanceLevelDescriptor" >
           <key>
             <column name="PerformanceLevelDescriptorId" />
           </key>
@@ -4280,8 +4522,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.PersonalInformationVerificationDescriptorAggregate.EdFi.PersonalInformationVerificationDescriptor" table="PersonalInformationVerificationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.PersonalInformationVerificationDescriptorAggregate.EdFi.PersonalInformationVerificationDescriptor" lazy="false" discriminator-value="edfi.PersonalInformationVerificationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PersonalInformationVerificationDescriptor" >
           <key>
             <column name="PersonalInformationVerificationDescriptorId" />
           </key>
@@ -4294,8 +4538,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.PlatformTypeDescriptorAggregate.EdFi.PlatformTypeDescriptor" table="PlatformTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.PlatformTypeDescriptorAggregate.EdFi.PlatformTypeDescriptor" lazy="false" discriminator-value="edfi.PlatformTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PlatformTypeDescriptor" >
           <key>
             <column name="PlatformTypeDescriptorId" />
           </key>
@@ -4308,8 +4554,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.PopulationServedDescriptorAggregate.EdFi.PopulationServedDescriptor" table="PopulationServedDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.PopulationServedDescriptorAggregate.EdFi.PopulationServedDescriptor" lazy="false" discriminator-value="edfi.PopulationServedDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PopulationServedDescriptor" >
           <key>
             <column name="PopulationServedDescriptorId" />
           </key>
@@ -4322,8 +4570,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.PostingResultDescriptorAggregate.EdFi.PostingResultDescriptor" table="PostingResultDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.PostingResultDescriptorAggregate.EdFi.PostingResultDescriptor" lazy="false" discriminator-value="edfi.PostingResultDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PostingResultDescriptor" >
           <key>
             <column name="PostingResultDescriptorId" />
           </key>
@@ -4336,8 +4586,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.PostSecondaryEventCategoryDescriptorAggregate.EdFi.PostSecondaryEventCategoryDescriptor" table="PostSecondaryEventCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.PostSecondaryEventCategoryDescriptorAggregate.EdFi.PostSecondaryEventCategoryDescriptor" lazy="false" discriminator-value="edfi.PostSecondaryEventCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PostSecondaryEventCategoryDescriptor" >
           <key>
             <column name="PostSecondaryEventCategoryDescriptorId" />
           </key>
@@ -4350,8 +4602,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.PostSecondaryInstitutionLevelDescriptorAggregate.EdFi.PostSecondaryInstitutionLevelDescriptor" table="PostSecondaryInstitutionLevelDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.PostSecondaryInstitutionLevelDescriptorAggregate.EdFi.PostSecondaryInstitutionLevelDescriptor" lazy="false" discriminator-value="edfi.PostSecondaryInstitutionLevelDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PostSecondaryInstitutionLevelDescriptor" >
           <key>
             <column name="PostSecondaryInstitutionLevelDescriptorId" />
           </key>
@@ -4364,8 +4618,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.PrimaryLearningDeviceAccessDescriptorAggregate.EdFi.PrimaryLearningDeviceAccessDescriptor" table="PrimaryLearningDeviceAccessDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.PrimaryLearningDeviceAccessDescriptorAggregate.EdFi.PrimaryLearningDeviceAccessDescriptor" lazy="false" discriminator-value="edfi.PrimaryLearningDeviceAccessDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PrimaryLearningDeviceAccessDescriptor" >
           <key>
             <column name="PrimaryLearningDeviceAccessDescriptorId" />
           </key>
@@ -4378,8 +4634,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.PrimaryLearningDeviceAwayFromSchoolDescriptorAggregate.EdFi.PrimaryLearningDeviceAwayFromSchoolDescriptor" table="PrimaryLearningDeviceAwayFromSchoolDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.PrimaryLearningDeviceAwayFromSchoolDescriptorAggregate.EdFi.PrimaryLearningDeviceAwayFromSchoolDescriptor" lazy="false" discriminator-value="edfi.PrimaryLearningDeviceAwayFromSchoolDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PrimaryLearningDeviceAwayFromSchoolDescriptor" >
           <key>
             <column name="PrimaryLearningDeviceAwayFromSchoolDescriptorId" />
           </key>
@@ -4392,8 +4650,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.PrimaryLearningDeviceProviderDescriptorAggregate.EdFi.PrimaryLearningDeviceProviderDescriptor" table="PrimaryLearningDeviceProviderDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.PrimaryLearningDeviceProviderDescriptorAggregate.EdFi.PrimaryLearningDeviceProviderDescriptor" lazy="false" discriminator-value="edfi.PrimaryLearningDeviceProviderDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PrimaryLearningDeviceProviderDescriptor" >
           <key>
             <column name="PrimaryLearningDeviceProviderDescriptorId" />
           </key>
@@ -4406,8 +4666,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ProficiencyDescriptorAggregate.EdFi.ProficiencyDescriptor" table="ProficiencyDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ProficiencyDescriptorAggregate.EdFi.ProficiencyDescriptor" lazy="false" discriminator-value="edfi.ProficiencyDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ProficiencyDescriptor" >
           <key>
             <column name="ProficiencyDescriptorId" />
           </key>
@@ -4420,8 +4682,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ProgramAssignmentDescriptorAggregate.EdFi.ProgramAssignmentDescriptor" table="ProgramAssignmentDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ProgramAssignmentDescriptorAggregate.EdFi.ProgramAssignmentDescriptor" lazy="false" discriminator-value="edfi.ProgramAssignmentDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ProgramAssignmentDescriptor" >
           <key>
             <column name="ProgramAssignmentDescriptorId" />
           </key>
@@ -4434,8 +4698,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ProgramCharacteristicDescriptorAggregate.EdFi.ProgramCharacteristicDescriptor" table="ProgramCharacteristicDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ProgramCharacteristicDescriptorAggregate.EdFi.ProgramCharacteristicDescriptor" lazy="false" discriminator-value="edfi.ProgramCharacteristicDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ProgramCharacteristicDescriptor" >
           <key>
             <column name="ProgramCharacteristicDescriptorId" />
           </key>
@@ -4448,8 +4714,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ProgramSponsorDescriptorAggregate.EdFi.ProgramSponsorDescriptor" table="ProgramSponsorDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ProgramSponsorDescriptorAggregate.EdFi.ProgramSponsorDescriptor" lazy="false" discriminator-value="edfi.ProgramSponsorDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ProgramSponsorDescriptor" >
           <key>
             <column name="ProgramSponsorDescriptorId" />
           </key>
@@ -4462,8 +4730,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ProgramTypeDescriptorAggregate.EdFi.ProgramTypeDescriptor" table="ProgramTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ProgramTypeDescriptorAggregate.EdFi.ProgramTypeDescriptor" lazy="false" discriminator-value="edfi.ProgramTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ProgramTypeDescriptor" >
           <key>
             <column name="ProgramTypeDescriptorId" />
           </key>
@@ -4476,8 +4746,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ProgressDescriptorAggregate.EdFi.ProgressDescriptor" table="ProgressDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ProgressDescriptorAggregate.EdFi.ProgressDescriptor" lazy="false" discriminator-value="edfi.ProgressDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ProgressDescriptor" >
           <key>
             <column name="ProgressDescriptorId" />
           </key>
@@ -4490,8 +4762,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ProgressLevelDescriptorAggregate.EdFi.ProgressLevelDescriptor" table="ProgressLevelDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ProgressLevelDescriptorAggregate.EdFi.ProgressLevelDescriptor" lazy="false" discriminator-value="edfi.ProgressLevelDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ProgressLevelDescriptor" >
           <key>
             <column name="ProgressLevelDescriptorId" />
           </key>
@@ -4504,8 +4778,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ProviderCategoryDescriptorAggregate.EdFi.ProviderCategoryDescriptor" table="ProviderCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ProviderCategoryDescriptorAggregate.EdFi.ProviderCategoryDescriptor" lazy="false" discriminator-value="edfi.ProviderCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ProviderCategoryDescriptor" >
           <key>
             <column name="ProviderCategoryDescriptorId" />
           </key>
@@ -4518,8 +4794,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ProviderProfitabilityDescriptorAggregate.EdFi.ProviderProfitabilityDescriptor" table="ProviderProfitabilityDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ProviderProfitabilityDescriptorAggregate.EdFi.ProviderProfitabilityDescriptor" lazy="false" discriminator-value="edfi.ProviderProfitabilityDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ProviderProfitabilityDescriptor" >
           <key>
             <column name="ProviderProfitabilityDescriptorId" />
           </key>
@@ -4532,8 +4810,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ProviderStatusDescriptorAggregate.EdFi.ProviderStatusDescriptor" table="ProviderStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ProviderStatusDescriptorAggregate.EdFi.ProviderStatusDescriptor" lazy="false" discriminator-value="edfi.ProviderStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ProviderStatusDescriptor" >
           <key>
             <column name="ProviderStatusDescriptorId" />
           </key>
@@ -4546,8 +4826,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.PublicationStatusDescriptorAggregate.EdFi.PublicationStatusDescriptor" table="PublicationStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.PublicationStatusDescriptorAggregate.EdFi.PublicationStatusDescriptor" lazy="false" discriminator-value="edfi.PublicationStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PublicationStatusDescriptor" >
           <key>
             <column name="PublicationStatusDescriptorId" />
           </key>
@@ -4560,8 +4842,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QuestionFormDescriptorAggregate.EdFi.QuestionFormDescriptor" table="QuestionFormDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QuestionFormDescriptorAggregate.EdFi.QuestionFormDescriptor" lazy="false" discriminator-value="edfi.QuestionFormDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="QuestionFormDescriptor" >
           <key>
             <column name="QuestionFormDescriptorId" />
           </key>
@@ -4574,8 +4858,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.RaceDescriptorAggregate.EdFi.RaceDescriptor" table="RaceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.RaceDescriptorAggregate.EdFi.RaceDescriptor" lazy="false" discriminator-value="edfi.RaceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="RaceDescriptor" >
           <key>
             <column name="RaceDescriptorId" />
           </key>
@@ -4588,8 +4874,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ReasonExitedDescriptorAggregate.EdFi.ReasonExitedDescriptor" table="ReasonExitedDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ReasonExitedDescriptorAggregate.EdFi.ReasonExitedDescriptor" lazy="false" discriminator-value="edfi.ReasonExitedDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ReasonExitedDescriptor" >
           <key>
             <column name="ReasonExitedDescriptorId" />
           </key>
@@ -4602,8 +4890,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ReasonNotTestedDescriptorAggregate.EdFi.ReasonNotTestedDescriptor" table="ReasonNotTestedDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ReasonNotTestedDescriptorAggregate.EdFi.ReasonNotTestedDescriptor" lazy="false" discriminator-value="edfi.ReasonNotTestedDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ReasonNotTestedDescriptor" >
           <key>
             <column name="ReasonNotTestedDescriptorId" />
           </key>
@@ -4616,8 +4906,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.RecognitionTypeDescriptorAggregate.EdFi.RecognitionTypeDescriptor" table="RecognitionTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.RecognitionTypeDescriptorAggregate.EdFi.RecognitionTypeDescriptor" lazy="false" discriminator-value="edfi.RecognitionTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="RecognitionTypeDescriptor" >
           <key>
             <column name="RecognitionTypeDescriptorId" />
           </key>
@@ -4630,8 +4922,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.RelationDescriptorAggregate.EdFi.RelationDescriptor" table="RelationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.RelationDescriptorAggregate.EdFi.RelationDescriptor" lazy="false" discriminator-value="edfi.RelationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="RelationDescriptor" >
           <key>
             <column name="RelationDescriptorId" />
           </key>
@@ -4644,8 +4938,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.RepeatIdentifierDescriptorAggregate.EdFi.RepeatIdentifierDescriptor" table="RepeatIdentifierDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.RepeatIdentifierDescriptorAggregate.EdFi.RepeatIdentifierDescriptor" lazy="false" discriminator-value="edfi.RepeatIdentifierDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="RepeatIdentifierDescriptor" >
           <key>
             <column name="RepeatIdentifierDescriptorId" />
           </key>
@@ -4658,8 +4954,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ReporterDescriptionDescriptorAggregate.EdFi.ReporterDescriptionDescriptor" table="ReporterDescriptionDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ReporterDescriptionDescriptorAggregate.EdFi.ReporterDescriptionDescriptor" lazy="false" discriminator-value="edfi.ReporterDescriptionDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ReporterDescriptionDescriptor" >
           <key>
             <column name="ReporterDescriptionDescriptorId" />
           </key>
@@ -4672,8 +4970,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ReportingTagDescriptorAggregate.EdFi.ReportingTagDescriptor" table="ReportingTagDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ReportingTagDescriptorAggregate.EdFi.ReportingTagDescriptor" lazy="false" discriminator-value="edfi.ReportingTagDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ReportingTagDescriptor" >
           <key>
             <column name="ReportingTagDescriptorId" />
           </key>
@@ -4686,8 +4986,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ResidencyStatusDescriptorAggregate.EdFi.ResidencyStatusDescriptor" table="ResidencyStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ResidencyStatusDescriptorAggregate.EdFi.ResidencyStatusDescriptor" lazy="false" discriminator-value="edfi.ResidencyStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ResidencyStatusDescriptor" >
           <key>
             <column name="ResidencyStatusDescriptorId" />
           </key>
@@ -4700,8 +5002,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ResponseIndicatorDescriptorAggregate.EdFi.ResponseIndicatorDescriptor" table="ResponseIndicatorDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ResponseIndicatorDescriptorAggregate.EdFi.ResponseIndicatorDescriptor" lazy="false" discriminator-value="edfi.ResponseIndicatorDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ResponseIndicatorDescriptor" >
           <key>
             <column name="ResponseIndicatorDescriptorId" />
           </key>
@@ -4714,8 +5018,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ResponsibilityDescriptorAggregate.EdFi.ResponsibilityDescriptor" table="ResponsibilityDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ResponsibilityDescriptorAggregate.EdFi.ResponsibilityDescriptor" lazy="false" discriminator-value="edfi.ResponsibilityDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ResponsibilityDescriptor" >
           <key>
             <column name="ResponsibilityDescriptorId" />
           </key>
@@ -4728,8 +5034,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.RestraintEventReasonDescriptorAggregate.EdFi.RestraintEventReasonDescriptor" table="RestraintEventReasonDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.RestraintEventReasonDescriptorAggregate.EdFi.RestraintEventReasonDescriptor" lazy="false" discriminator-value="edfi.RestraintEventReasonDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="RestraintEventReasonDescriptor" >
           <key>
             <column name="RestraintEventReasonDescriptorId" />
           </key>
@@ -4742,8 +5050,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ResultDatatypeTypeDescriptorAggregate.EdFi.ResultDatatypeTypeDescriptor" table="ResultDatatypeTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ResultDatatypeTypeDescriptorAggregate.EdFi.ResultDatatypeTypeDescriptor" lazy="false" discriminator-value="edfi.ResultDatatypeTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ResultDatatypeTypeDescriptor" >
           <key>
             <column name="ResultDatatypeTypeDescriptorId" />
           </key>
@@ -4756,8 +5066,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.RetestIndicatorDescriptorAggregate.EdFi.RetestIndicatorDescriptor" table="RetestIndicatorDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.RetestIndicatorDescriptorAggregate.EdFi.RetestIndicatorDescriptor" lazy="false" discriminator-value="edfi.RetestIndicatorDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="RetestIndicatorDescriptor" >
           <key>
             <column name="RetestIndicatorDescriptorId" />
           </key>
@@ -4770,8 +5082,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.SchoolCategoryDescriptorAggregate.EdFi.SchoolCategoryDescriptor" table="SchoolCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.SchoolCategoryDescriptorAggregate.EdFi.SchoolCategoryDescriptor" lazy="false" discriminator-value="edfi.SchoolCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SchoolCategoryDescriptor" >
           <key>
             <column name="SchoolCategoryDescriptorId" />
           </key>
@@ -4784,8 +5098,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.SchoolChoiceImplementStatusDescriptorAggregate.EdFi.SchoolChoiceImplementStatusDescriptor" table="SchoolChoiceImplementStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.SchoolChoiceImplementStatusDescriptorAggregate.EdFi.SchoolChoiceImplementStatusDescriptor" lazy="false" discriminator-value="edfi.SchoolChoiceImplementStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SchoolChoiceImplementStatusDescriptor" >
           <key>
             <column name="SchoolChoiceImplementStatusDescriptorId" />
           </key>
@@ -4798,8 +5114,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.SchoolFoodServiceProgramServiceDescriptorAggregate.EdFi.SchoolFoodServiceProgramServiceDescriptor" table="SchoolFoodServiceProgramServiceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.SchoolFoodServiceProgramServiceDescriptorAggregate.EdFi.SchoolFoodServiceProgramServiceDescriptor" lazy="false" discriminator-value="edfi.SchoolFoodServiceProgramServiceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SchoolFoodServiceProgramServiceDescriptor" >
           <key>
             <column name="SchoolFoodServiceProgramServiceDescriptorId" />
           </key>
@@ -4812,8 +5130,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.SchoolTypeDescriptorAggregate.EdFi.SchoolTypeDescriptor" table="SchoolTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.SchoolTypeDescriptorAggregate.EdFi.SchoolTypeDescriptor" lazy="false" discriminator-value="edfi.SchoolTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SchoolTypeDescriptor" >
           <key>
             <column name="SchoolTypeDescriptorId" />
           </key>
@@ -4826,8 +5146,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.SectionCharacteristicDescriptorAggregate.EdFi.SectionCharacteristicDescriptor" table="SectionCharacteristicDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.SectionCharacteristicDescriptorAggregate.EdFi.SectionCharacteristicDescriptor" lazy="false" discriminator-value="edfi.SectionCharacteristicDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SectionCharacteristicDescriptor" >
           <key>
             <column name="SectionCharacteristicDescriptorId" />
           </key>
@@ -4840,8 +5162,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.SeparationDescriptorAggregate.EdFi.SeparationDescriptor" table="SeparationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.SeparationDescriptorAggregate.EdFi.SeparationDescriptor" lazy="false" discriminator-value="edfi.SeparationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SeparationDescriptor" >
           <key>
             <column name="SeparationDescriptorId" />
           </key>
@@ -4854,8 +5178,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.SeparationReasonDescriptorAggregate.EdFi.SeparationReasonDescriptor" table="SeparationReasonDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.SeparationReasonDescriptorAggregate.EdFi.SeparationReasonDescriptor" lazy="false" discriminator-value="edfi.SeparationReasonDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SeparationReasonDescriptor" >
           <key>
             <column name="SeparationReasonDescriptorId" />
           </key>
@@ -4868,8 +5194,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ServiceDescriptorAggregate.EdFi.ServiceDescriptor" table="ServiceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ServiceDescriptorAggregate.EdFi.ServiceDescriptor" lazy="false" discriminator-value="edfi.ServiceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ServiceDescriptor" >
           <key>
             <column name="ServiceDescriptorId" />
           </key>
@@ -4882,8 +5210,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.SexDescriptorAggregate.EdFi.SexDescriptor" table="SexDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.SexDescriptorAggregate.EdFi.SexDescriptor" lazy="false" discriminator-value="edfi.SexDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SexDescriptor" >
           <key>
             <column name="SexDescriptorId" />
           </key>
@@ -4896,8 +5226,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.SourceSystemDescriptorAggregate.EdFi.SourceSystemDescriptor" table="SourceSystemDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.SourceSystemDescriptorAggregate.EdFi.SourceSystemDescriptor" lazy="false" discriminator-value="edfi.SourceSystemDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SourceSystemDescriptor" >
           <key>
             <column name="SourceSystemDescriptorId" />
           </key>
@@ -4910,8 +5242,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.SpecialEducationProgramServiceDescriptorAggregate.EdFi.SpecialEducationProgramServiceDescriptor" table="SpecialEducationProgramServiceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.SpecialEducationProgramServiceDescriptorAggregate.EdFi.SpecialEducationProgramServiceDescriptor" lazy="false" discriminator-value="edfi.SpecialEducationProgramServiceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SpecialEducationProgramServiceDescriptor" >
           <key>
             <column name="SpecialEducationProgramServiceDescriptorId" />
           </key>
@@ -4924,8 +5258,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.SpecialEducationSettingDescriptorAggregate.EdFi.SpecialEducationSettingDescriptor" table="SpecialEducationSettingDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.SpecialEducationSettingDescriptorAggregate.EdFi.SpecialEducationSettingDescriptor" lazy="false" discriminator-value="edfi.SpecialEducationSettingDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SpecialEducationSettingDescriptor" >
           <key>
             <column name="SpecialEducationSettingDescriptorId" />
           </key>
@@ -4938,8 +5274,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.StaffClassificationDescriptorAggregate.EdFi.StaffClassificationDescriptor" table="StaffClassificationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.StaffClassificationDescriptorAggregate.EdFi.StaffClassificationDescriptor" lazy="false" discriminator-value="edfi.StaffClassificationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="StaffClassificationDescriptor" >
           <key>
             <column name="StaffClassificationDescriptorId" />
           </key>
@@ -4952,8 +5290,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.StaffIdentificationSystemDescriptorAggregate.EdFi.StaffIdentificationSystemDescriptor" table="StaffIdentificationSystemDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.StaffIdentificationSystemDescriptorAggregate.EdFi.StaffIdentificationSystemDescriptor" lazy="false" discriminator-value="edfi.StaffIdentificationSystemDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="StaffIdentificationSystemDescriptor" >
           <key>
             <column name="StaffIdentificationSystemDescriptorId" />
           </key>
@@ -4966,8 +5306,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.StaffLeaveEventCategoryDescriptorAggregate.EdFi.StaffLeaveEventCategoryDescriptor" table="StaffLeaveEventCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.StaffLeaveEventCategoryDescriptorAggregate.EdFi.StaffLeaveEventCategoryDescriptor" lazy="false" discriminator-value="edfi.StaffLeaveEventCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="StaffLeaveEventCategoryDescriptor" >
           <key>
             <column name="StaffLeaveEventCategoryDescriptorId" />
           </key>
@@ -4980,8 +5322,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.StateAbbreviationDescriptorAggregate.EdFi.StateAbbreviationDescriptor" table="StateAbbreviationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.StateAbbreviationDescriptorAggregate.EdFi.StateAbbreviationDescriptor" lazy="false" discriminator-value="edfi.StateAbbreviationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="StateAbbreviationDescriptor" >
           <key>
             <column name="StateAbbreviationDescriptorId" />
           </key>
@@ -4994,8 +5338,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.StudentCharacteristicDescriptorAggregate.EdFi.StudentCharacteristicDescriptor" table="StudentCharacteristicDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.StudentCharacteristicDescriptorAggregate.EdFi.StudentCharacteristicDescriptor" lazy="false" discriminator-value="edfi.StudentCharacteristicDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="StudentCharacteristicDescriptor" >
           <key>
             <column name="StudentCharacteristicDescriptorId" />
           </key>
@@ -5008,8 +5354,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.StudentIdentificationSystemDescriptorAggregate.EdFi.StudentIdentificationSystemDescriptor" table="StudentIdentificationSystemDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.StudentIdentificationSystemDescriptorAggregate.EdFi.StudentIdentificationSystemDescriptor" lazy="false" discriminator-value="edfi.StudentIdentificationSystemDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="StudentIdentificationSystemDescriptor" >
           <key>
             <column name="StudentIdentificationSystemDescriptorId" />
           </key>
@@ -5022,8 +5370,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.StudentParticipationCodeDescriptorAggregate.EdFi.StudentParticipationCodeDescriptor" table="StudentParticipationCodeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.StudentParticipationCodeDescriptorAggregate.EdFi.StudentParticipationCodeDescriptor" lazy="false" discriminator-value="edfi.StudentParticipationCodeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="StudentParticipationCodeDescriptor" >
           <key>
             <column name="StudentParticipationCodeDescriptorId" />
           </key>
@@ -5036,8 +5386,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.SubmissionStatusDescriptorAggregate.EdFi.SubmissionStatusDescriptor" table="SubmissionStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.SubmissionStatusDescriptorAggregate.EdFi.SubmissionStatusDescriptor" lazy="false" discriminator-value="edfi.SubmissionStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SubmissionStatusDescriptor" >
           <key>
             <column name="SubmissionStatusDescriptorId" />
           </key>
@@ -5050,8 +5402,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.SurveyCategoryDescriptorAggregate.EdFi.SurveyCategoryDescriptor" table="SurveyCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.SurveyCategoryDescriptorAggregate.EdFi.SurveyCategoryDescriptor" lazy="false" discriminator-value="edfi.SurveyCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SurveyCategoryDescriptor" >
           <key>
             <column name="SurveyCategoryDescriptorId" />
           </key>
@@ -5064,8 +5418,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.SurveyLevelDescriptorAggregate.EdFi.SurveyLevelDescriptor" table="SurveyLevelDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.SurveyLevelDescriptorAggregate.EdFi.SurveyLevelDescriptor" lazy="false" discriminator-value="edfi.SurveyLevelDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SurveyLevelDescriptor" >
           <key>
             <column name="SurveyLevelDescriptorId" />
           </key>
@@ -5078,8 +5434,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.TeachingCredentialBasisDescriptorAggregate.EdFi.TeachingCredentialBasisDescriptor" table="TeachingCredentialBasisDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.TeachingCredentialBasisDescriptorAggregate.EdFi.TeachingCredentialBasisDescriptor" lazy="false" discriminator-value="edfi.TeachingCredentialBasisDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="TeachingCredentialBasisDescriptor" >
           <key>
             <column name="TeachingCredentialBasisDescriptorId" />
           </key>
@@ -5092,8 +5450,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.TeachingCredentialDescriptorAggregate.EdFi.TeachingCredentialDescriptor" table="TeachingCredentialDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.TeachingCredentialDescriptorAggregate.EdFi.TeachingCredentialDescriptor" lazy="false" discriminator-value="edfi.TeachingCredentialDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="TeachingCredentialDescriptor" >
           <key>
             <column name="TeachingCredentialDescriptorId" />
           </key>
@@ -5106,8 +5466,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.TechnicalSkillsAssessmentDescriptorAggregate.EdFi.TechnicalSkillsAssessmentDescriptor" table="TechnicalSkillsAssessmentDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.TechnicalSkillsAssessmentDescriptorAggregate.EdFi.TechnicalSkillsAssessmentDescriptor" lazy="false" discriminator-value="edfi.TechnicalSkillsAssessmentDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="TechnicalSkillsAssessmentDescriptor" >
           <key>
             <column name="TechnicalSkillsAssessmentDescriptorId" />
           </key>
@@ -5120,8 +5482,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.TelephoneNumberTypeDescriptorAggregate.EdFi.TelephoneNumberTypeDescriptor" table="TelephoneNumberTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.TelephoneNumberTypeDescriptorAggregate.EdFi.TelephoneNumberTypeDescriptor" lazy="false" discriminator-value="edfi.TelephoneNumberTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="TelephoneNumberTypeDescriptor" >
           <key>
             <column name="TelephoneNumberTypeDescriptorId" />
           </key>
@@ -5134,8 +5498,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.TermDescriptorAggregate.EdFi.TermDescriptor" table="TermDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.TermDescriptorAggregate.EdFi.TermDescriptor" lazy="false" discriminator-value="edfi.TermDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="TermDescriptor" >
           <key>
             <column name="TermDescriptorId" />
           </key>
@@ -5148,8 +5514,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.TitleIPartAParticipantDescriptorAggregate.EdFi.TitleIPartAParticipantDescriptor" table="TitleIPartAParticipantDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.TitleIPartAParticipantDescriptorAggregate.EdFi.TitleIPartAParticipantDescriptor" lazy="false" discriminator-value="edfi.TitleIPartAParticipantDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="TitleIPartAParticipantDescriptor" >
           <key>
             <column name="TitleIPartAParticipantDescriptorId" />
           </key>
@@ -5162,8 +5530,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.TitleIPartAProgramServiceDescriptorAggregate.EdFi.TitleIPartAProgramServiceDescriptor" table="TitleIPartAProgramServiceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.TitleIPartAProgramServiceDescriptorAggregate.EdFi.TitleIPartAProgramServiceDescriptor" lazy="false" discriminator-value="edfi.TitleIPartAProgramServiceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="TitleIPartAProgramServiceDescriptor" >
           <key>
             <column name="TitleIPartAProgramServiceDescriptorId" />
           </key>
@@ -5176,8 +5546,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.TitleIPartASchoolDesignationDescriptorAggregate.EdFi.TitleIPartASchoolDesignationDescriptor" table="TitleIPartASchoolDesignationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.TitleIPartASchoolDesignationDescriptorAggregate.EdFi.TitleIPartASchoolDesignationDescriptor" lazy="false" discriminator-value="edfi.TitleIPartASchoolDesignationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="TitleIPartASchoolDesignationDescriptor" >
           <key>
             <column name="TitleIPartASchoolDesignationDescriptorId" />
           </key>
@@ -5190,8 +5562,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.TribalAffiliationDescriptorAggregate.EdFi.TribalAffiliationDescriptor" table="TribalAffiliationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.TribalAffiliationDescriptorAggregate.EdFi.TribalAffiliationDescriptor" lazy="false" discriminator-value="edfi.TribalAffiliationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="TribalAffiliationDescriptor" >
           <key>
             <column name="TribalAffiliationDescriptorId" />
           </key>
@@ -5204,8 +5578,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.VisaDescriptorAggregate.EdFi.VisaDescriptor" table="VisaDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.VisaDescriptorAggregate.EdFi.VisaDescriptor" lazy="false" discriminator-value="edfi.VisaDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="VisaDescriptor" >
           <key>
             <column name="VisaDescriptorId" />
           </key>
@@ -5218,8 +5594,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.WeaponDescriptorAggregate.EdFi.WeaponDescriptor" table="WeaponDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.WeaponDescriptorAggregate.EdFi.WeaponDescriptor" lazy="false" discriminator-value="edfi.WeaponDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="WeaponDescriptor" >
           <key>
             <column name="WeaponDescriptorId" />
           </key>
@@ -5232,7 +5610,8 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
+      </join>
+    </subclass>
 </class>
 
 
diff --git a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/4.0.0/DataStandard_400_ApprovalTests.Verify.Standard_Std_4.0.0_EntityOrmMappings_PgSql_EntityOrmMappingsForQueries.generated.hbm.approved.xml b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/4.0.0/DataStandard_400_ApprovalTests.Verify.Standard_Std_4.0.0_EntityOrmMappings_PgSql_EntityOrmMappingsForQueries.generated.hbm.approved.xml
index 87d4b8dbd2..73ffc27d77 100644
--- a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/4.0.0/DataStandard_400_ApprovalTests.Verify.Standard_Std_4.0.0_EntityOrmMappings_PgSql_EntityOrmMappingsForQueries.generated.hbm.approved.xml
+++ b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/4.0.0/DataStandard_400_ApprovalTests.Verify.Standard_Std_4.0.0_EntityOrmMappings_PgSql_EntityOrmMappingsForQueries.generated.hbm.approved.xml
@@ -2757,12 +2757,13 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.DescriptorAggregate.EdFi.DescriptorQ" table="Descriptor" lazy="false" abstract="true">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.DescriptorAggregate.EdFi.DescriptorQ" table="Descriptor" lazy="false" abstract="true" discriminator-value="NULL">
     <id name="DescriptorId" column="DescriptorId" type="int">
       <generator class="identity" />
     </id>
 
     <!-- Discriminator -->
+    <discriminator column="Discriminator" type="string" />
 
     <!-- Optimistic locking for aggregate root -->
     <version name="LastModifiedDate" column="LastModifiedDate" type="UtcDateTime" />
@@ -2774,6 +2775,8 @@
     <property name="Id" column="Id" type="guid" not-null="true" />
 
     <!-- Properties -->
+    <!-- Readonly property to surface the discriminator value -->
+    <property name="Discriminator" column="Discriminator" type="string" insert="false" update="false" />
     <property name="CodeValue" column="CodeValue" type="string" length="50" not-null="true" />
     <property name="Description" column="Description" type="string" length="1024" />
     <property name="EffectiveBeginDate" column="EffectiveBeginDate" type="date" />
@@ -2787,7 +2790,8 @@
 
     <!-- Collections -->
     <!-- Derived classes -->
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AbsenceEventCategoryDescriptorAggregate.EdFi.AbsenceEventCategoryDescriptorQ" table="AbsenceEventCategoryDescriptor" lazy="false">
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AbsenceEventCategoryDescriptorAggregate.EdFi.AbsenceEventCategoryDescriptorQ" lazy="false" discriminator-value="edfi.AbsenceEventCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AbsenceEventCategoryDescriptor" >
           <key>
             <column name="AbsenceEventCategoryDescriptorId" />
           </key>
@@ -2807,8 +2811,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StaffAbsenceEventAggregate.EdFi.StaffAbsenceEventQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AcademicHonorCategoryDescriptorAggregate.EdFi.AcademicHonorCategoryDescriptorQ" table="AcademicHonorCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AcademicHonorCategoryDescriptorAggregate.EdFi.AcademicHonorCategoryDescriptorQ" lazy="false" discriminator-value="edfi.AcademicHonorCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AcademicHonorCategoryDescriptor" >
           <key>
             <column name="AcademicHonorCategoryDescriptorId" />
           </key>
@@ -2828,8 +2834,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAcademicRecordAggregate.EdFi.StudentAcademicRecordAcademicHonorQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AcademicSubjectDescriptorAggregate.EdFi.AcademicSubjectDescriptorQ" table="AcademicSubjectDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AcademicSubjectDescriptorAggregate.EdFi.AcademicSubjectDescriptorQ" lazy="false" discriminator-value="edfi.AcademicSubjectDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AcademicSubjectDescriptor" >
           <key>
             <column name="AcademicSubjectDescriptorId" />
           </key>
@@ -2926,8 +2934,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StaffSchoolAssociationAggregate.EdFi.StaffSchoolAssociationAcademicSubjectQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AccommodationDescriptorAggregate.EdFi.AccommodationDescriptorQ" table="AccommodationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AccommodationDescriptorAggregate.EdFi.AccommodationDescriptorQ" lazy="false" discriminator-value="edfi.AccommodationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AccommodationDescriptor" >
           <key>
             <column name="AccommodationDescriptorId" />
           </key>
@@ -2947,8 +2957,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAssessmentAggregate.EdFi.StudentAssessmentAccommodationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AccountTypeDescriptorAggregate.EdFi.AccountTypeDescriptorQ" table="AccountTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AccountTypeDescriptorAggregate.EdFi.AccountTypeDescriptorQ" lazy="false" discriminator-value="edfi.AccountTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AccountTypeDescriptor" >
           <key>
             <column name="AccountTypeDescriptorId" />
           </key>
@@ -2968,8 +2980,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.ChartOfAccountAggregate.EdFi.ChartOfAccountQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AchievementCategoryDescriptorAggregate.EdFi.AchievementCategoryDescriptorQ" table="AchievementCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AchievementCategoryDescriptorAggregate.EdFi.AchievementCategoryDescriptorQ" lazy="false" discriminator-value="edfi.AchievementCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AchievementCategoryDescriptor" >
           <key>
             <column name="AchievementCategoryDescriptorId" />
           </key>
@@ -3010,8 +3024,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAcademicRecordAggregate.EdFi.StudentAcademicRecordRecognitionQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AdditionalCreditTypeDescriptorAggregate.EdFi.AdditionalCreditTypeDescriptorQ" table="AdditionalCreditTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AdditionalCreditTypeDescriptorAggregate.EdFi.AdditionalCreditTypeDescriptorQ" lazy="false" discriminator-value="edfi.AdditionalCreditTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AdditionalCreditTypeDescriptor" >
           <key>
             <column name="AdditionalCreditTypeDescriptorId" />
           </key>
@@ -3031,8 +3047,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.CourseTranscriptAggregate.EdFi.CourseTranscriptEarnedAdditionalCreditsQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AddressTypeDescriptorAggregate.EdFi.AddressTypeDescriptorQ" table="AddressTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AddressTypeDescriptorAggregate.EdFi.AddressTypeDescriptorQ" lazy="false" discriminator-value="edfi.AddressTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AddressTypeDescriptor" >
           <key>
             <column name="AddressTypeDescriptorId" />
           </key>
@@ -3108,8 +3126,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationInternationalAddressQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AdministrationEnvironmentDescriptorAggregate.EdFi.AdministrationEnvironmentDescriptorQ" table="AdministrationEnvironmentDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AdministrationEnvironmentDescriptorAggregate.EdFi.AdministrationEnvironmentDescriptorQ" lazy="false" discriminator-value="edfi.AdministrationEnvironmentDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AdministrationEnvironmentDescriptor" >
           <key>
             <column name="AdministrationEnvironmentDescriptorId" />
           </key>
@@ -3129,8 +3149,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAssessmentAggregate.EdFi.StudentAssessmentQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AdministrativeFundingControlDescriptorAggregate.EdFi.AdministrativeFundingControlDescriptorQ" table="AdministrativeFundingControlDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AdministrativeFundingControlDescriptorAggregate.EdFi.AdministrativeFundingControlDescriptorQ" lazy="false" discriminator-value="edfi.AdministrativeFundingControlDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AdministrativeFundingControlDescriptor" >
           <key>
             <column name="AdministrativeFundingControlDescriptorId" />
           </key>
@@ -3157,8 +3179,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.SchoolAggregate.EdFi.SchoolQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AncestryEthnicOriginDescriptorAggregate.EdFi.AncestryEthnicOriginDescriptorQ" table="AncestryEthnicOriginDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AncestryEthnicOriginDescriptorAggregate.EdFi.AncestryEthnicOriginDescriptorQ" lazy="false" discriminator-value="edfi.AncestryEthnicOriginDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AncestryEthnicOriginDescriptor" >
           <key>
             <column name="AncestryEthnicOriginDescriptorId" />
           </key>
@@ -3185,8 +3209,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationAncestryEthnicOriginQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AssessmentCategoryDescriptorAggregate.EdFi.AssessmentCategoryDescriptorQ" table="AssessmentCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AssessmentCategoryDescriptorAggregate.EdFi.AssessmentCategoryDescriptorQ" lazy="false" discriminator-value="edfi.AssessmentCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AssessmentCategoryDescriptor" >
           <key>
             <column name="AssessmentCategoryDescriptorId" />
           </key>
@@ -3206,8 +3232,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.AssessmentAggregate.EdFi.AssessmentQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AssessmentIdentificationSystemDescriptorAggregate.EdFi.AssessmentIdentificationSystemDescriptorQ" table="AssessmentIdentificationSystemDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AssessmentIdentificationSystemDescriptorAggregate.EdFi.AssessmentIdentificationSystemDescriptorQ" lazy="false" discriminator-value="edfi.AssessmentIdentificationSystemDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AssessmentIdentificationSystemDescriptor" >
           <key>
             <column name="AssessmentIdentificationSystemDescriptorId" />
           </key>
@@ -3227,8 +3255,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.AssessmentAggregate.EdFi.AssessmentIdentificationCodeQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AssessmentItemCategoryDescriptorAggregate.EdFi.AssessmentItemCategoryDescriptorQ" table="AssessmentItemCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AssessmentItemCategoryDescriptorAggregate.EdFi.AssessmentItemCategoryDescriptorQ" lazy="false" discriminator-value="edfi.AssessmentItemCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AssessmentItemCategoryDescriptor" >
           <key>
             <column name="AssessmentItemCategoryDescriptorId" />
           </key>
@@ -3248,8 +3278,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.AssessmentItemAggregate.EdFi.AssessmentItemQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AssessmentItemResultDescriptorAggregate.EdFi.AssessmentItemResultDescriptorQ" table="AssessmentItemResultDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AssessmentItemResultDescriptorAggregate.EdFi.AssessmentItemResultDescriptorQ" lazy="false" discriminator-value="edfi.AssessmentItemResultDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AssessmentItemResultDescriptor" >
           <key>
             <column name="AssessmentItemResultDescriptorId" />
           </key>
@@ -3269,8 +3301,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAssessmentAggregate.EdFi.StudentAssessmentItemQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AssessmentPeriodDescriptorAggregate.EdFi.AssessmentPeriodDescriptorQ" table="AssessmentPeriodDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AssessmentPeriodDescriptorAggregate.EdFi.AssessmentPeriodDescriptorQ" lazy="false" discriminator-value="edfi.AssessmentPeriodDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AssessmentPeriodDescriptor" >
           <key>
             <column name="AssessmentPeriodDescriptorId" />
           </key>
@@ -3297,8 +3331,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAssessmentAggregate.EdFi.StudentAssessmentPeriodQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AssessmentReportingMethodDescriptorAggregate.EdFi.AssessmentReportingMethodDescriptorQ" table="AssessmentReportingMethodDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AssessmentReportingMethodDescriptorAggregate.EdFi.AssessmentReportingMethodDescriptorQ" lazy="false" discriminator-value="edfi.AssessmentReportingMethodDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AssessmentReportingMethodDescriptor" >
           <key>
             <column name="AssessmentReportingMethodDescriptorId" />
           </key>
@@ -3388,8 +3424,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAssessmentAggregate.EdFi.StudentAssessmentStudentObjectiveAssessmentScoreResultQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AssignmentLateStatusDescriptorAggregate.EdFi.AssignmentLateStatusDescriptorQ" table="AssignmentLateStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AssignmentLateStatusDescriptorAggregate.EdFi.AssignmentLateStatusDescriptorQ" lazy="false" discriminator-value="edfi.AssignmentLateStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AssignmentLateStatusDescriptor" >
           <key>
             <column name="AssignmentLateStatusDescriptorId" />
           </key>
@@ -3409,8 +3447,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentGradebookEntryAggregate.EdFi.StudentGradebookEntryQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AttemptStatusDescriptorAggregate.EdFi.AttemptStatusDescriptorQ" table="AttemptStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AttemptStatusDescriptorAggregate.EdFi.AttemptStatusDescriptorQ" lazy="false" discriminator-value="edfi.AttemptStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AttemptStatusDescriptor" >
           <key>
             <column name="AttemptStatusDescriptorId" />
           </key>
@@ -3430,8 +3470,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSectionAssociationAggregate.EdFi.StudentSectionAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AttendanceEventCategoryDescriptorAggregate.EdFi.AttendanceEventCategoryDescriptorQ" table="AttendanceEventCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AttendanceEventCategoryDescriptorAggregate.EdFi.AttendanceEventCategoryDescriptorQ" lazy="false" discriminator-value="edfi.AttendanceEventCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AttendanceEventCategoryDescriptor" >
           <key>
             <column name="AttendanceEventCategoryDescriptorId" />
           </key>
@@ -3472,8 +3514,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSectionAttendanceEventAggregate.EdFi.StudentSectionAttendanceEventQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.BarrierToInternetAccessInResidenceDescriptorAggregate.EdFi.BarrierToInternetAccessInResidenceDescriptorQ" table="BarrierToInternetAccessInResidenceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.BarrierToInternetAccessInResidenceDescriptorAggregate.EdFi.BarrierToInternetAccessInResidenceDescriptorQ" lazy="false" discriminator-value="edfi.BarrierToInternetAccessInResidenceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="BarrierToInternetAccessInResidenceDescriptor" >
           <key>
             <column name="BarrierToInternetAccessInResidenceDescriptorId" />
           </key>
@@ -3493,8 +3537,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.BehaviorDescriptorAggregate.EdFi.BehaviorDescriptorQ" table="BehaviorDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.BehaviorDescriptorAggregate.EdFi.BehaviorDescriptorQ" lazy="false" discriminator-value="edfi.BehaviorDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="BehaviorDescriptor" >
           <key>
             <column name="BehaviorDescriptorId" />
           </key>
@@ -3528,8 +3574,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentDisciplineIncidentBehaviorAssociationAggregate.EdFi.StudentDisciplineIncidentBehaviorAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CalendarEventDescriptorAggregate.EdFi.CalendarEventDescriptorQ" table="CalendarEventDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CalendarEventDescriptorAggregate.EdFi.CalendarEventDescriptorQ" lazy="false" discriminator-value="edfi.CalendarEventDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CalendarEventDescriptor" >
           <key>
             <column name="CalendarEventDescriptorId" />
           </key>
@@ -3549,8 +3597,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.CalendarDateAggregate.EdFi.CalendarDateCalendarEventQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CalendarTypeDescriptorAggregate.EdFi.CalendarTypeDescriptorQ" table="CalendarTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CalendarTypeDescriptorAggregate.EdFi.CalendarTypeDescriptorQ" lazy="false" discriminator-value="edfi.CalendarTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CalendarTypeDescriptor" >
           <key>
             <column name="CalendarTypeDescriptorId" />
           </key>
@@ -3570,8 +3620,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.CalendarAggregate.EdFi.CalendarQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CareerPathwayDescriptorAggregate.EdFi.CareerPathwayDescriptorQ" table="CareerPathwayDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CareerPathwayDescriptorAggregate.EdFi.CareerPathwayDescriptorQ" lazy="false" discriminator-value="edfi.CareerPathwayDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CareerPathwayDescriptor" >
           <key>
             <column name="CareerPathwayDescriptorId" />
           </key>
@@ -3598,8 +3650,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentCTEProgramAssociationAggregate.EdFi.StudentCTEProgramAssociationCTEProgramQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CharterApprovalAgencyTypeDescriptorAggregate.EdFi.CharterApprovalAgencyTypeDescriptorQ" table="CharterApprovalAgencyTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CharterApprovalAgencyTypeDescriptorAggregate.EdFi.CharterApprovalAgencyTypeDescriptorQ" lazy="false" discriminator-value="edfi.CharterApprovalAgencyTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CharterApprovalAgencyTypeDescriptor" >
           <key>
             <column name="CharterApprovalAgencyTypeDescriptorId" />
           </key>
@@ -3619,8 +3673,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.SchoolAggregate.EdFi.SchoolQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CharterStatusDescriptorAggregate.EdFi.CharterStatusDescriptorQ" table="CharterStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CharterStatusDescriptorAggregate.EdFi.CharterStatusDescriptorQ" lazy="false" discriminator-value="edfi.CharterStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CharterStatusDescriptor" >
           <key>
             <column name="CharterStatusDescriptorId" />
           </key>
@@ -3647,8 +3703,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.SchoolAggregate.EdFi.SchoolQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CitizenshipStatusDescriptorAggregate.EdFi.CitizenshipStatusDescriptorQ" table="CitizenshipStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CitizenshipStatusDescriptorAggregate.EdFi.CitizenshipStatusDescriptorQ" lazy="false" discriminator-value="edfi.CitizenshipStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CitizenshipStatusDescriptor" >
           <key>
             <column name="CitizenshipStatusDescriptorId" />
           </key>
@@ -3675,8 +3733,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAggregate.EdFi.StudentQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ClassroomPositionDescriptorAggregate.EdFi.ClassroomPositionDescriptorQ" table="ClassroomPositionDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ClassroomPositionDescriptorAggregate.EdFi.ClassroomPositionDescriptorQ" lazy="false" discriminator-value="edfi.ClassroomPositionDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ClassroomPositionDescriptor" >
           <key>
             <column name="ClassroomPositionDescriptorId" />
           </key>
@@ -3696,8 +3756,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StaffSectionAssociationAggregate.EdFi.StaffSectionAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CohortScopeDescriptorAggregate.EdFi.CohortScopeDescriptorQ" table="CohortScopeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CohortScopeDescriptorAggregate.EdFi.CohortScopeDescriptorQ" lazy="false" discriminator-value="edfi.CohortScopeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CohortScopeDescriptor" >
           <key>
             <column name="CohortScopeDescriptorId" />
           </key>
@@ -3717,8 +3779,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.CohortAggregate.EdFi.CohortQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CohortTypeDescriptorAggregate.EdFi.CohortTypeDescriptorQ" table="CohortTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CohortTypeDescriptorAggregate.EdFi.CohortTypeDescriptorQ" lazy="false" discriminator-value="edfi.CohortTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CohortTypeDescriptor" >
           <key>
             <column name="CohortTypeDescriptorId" />
           </key>
@@ -3738,8 +3802,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.CohortAggregate.EdFi.CohortQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CohortYearTypeDescriptorAggregate.EdFi.CohortYearTypeDescriptorQ" table="CohortYearTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CohortYearTypeDescriptorAggregate.EdFi.CohortYearTypeDescriptorQ" lazy="false" discriminator-value="edfi.CohortYearTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CohortYearTypeDescriptor" >
           <key>
             <column name="CohortYearTypeDescriptorId" />
           </key>
@@ -3759,8 +3825,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationCohortYearQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CompetencyLevelDescriptorAggregate.EdFi.CompetencyLevelDescriptorQ" table="CompetencyLevelDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CompetencyLevelDescriptorAggregate.EdFi.CompetencyLevelDescriptorQ" lazy="false" discriminator-value="edfi.CompetencyLevelDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CompetencyLevelDescriptor" >
           <key>
             <column name="CompetencyLevelDescriptorId" />
           </key>
@@ -3801,8 +3869,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentLearningObjectiveAggregate.EdFi.StudentLearningObjectiveQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ContactTypeDescriptorAggregate.EdFi.ContactTypeDescriptorQ" table="ContactTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ContactTypeDescriptorAggregate.EdFi.ContactTypeDescriptorQ" lazy="false" discriminator-value="edfi.ContactTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ContactTypeDescriptor" >
           <key>
             <column name="ContactTypeDescriptorId" />
           </key>
@@ -3822,8 +3892,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StaffEducationOrganizationContactAssociationAggregate.EdFi.StaffEducationOrganizationContactAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ContentClassDescriptorAggregate.EdFi.ContentClassDescriptorQ" table="ContentClassDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ContentClassDescriptorAggregate.EdFi.ContentClassDescriptorQ" lazy="false" discriminator-value="edfi.ContentClassDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ContentClassDescriptor" >
           <key>
             <column name="ContentClassDescriptorId" />
           </key>
@@ -3843,8 +3915,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.EducationContentAggregate.EdFi.EducationContentQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ContinuationOfServicesReasonDescriptorAggregate.EdFi.ContinuationOfServicesReasonDescriptorQ" table="ContinuationOfServicesReasonDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ContinuationOfServicesReasonDescriptorAggregate.EdFi.ContinuationOfServicesReasonDescriptorQ" lazy="false" discriminator-value="edfi.ContinuationOfServicesReasonDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ContinuationOfServicesReasonDescriptor" >
           <key>
             <column name="ContinuationOfServicesReasonDescriptorId" />
           </key>
@@ -3864,8 +3938,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentMigrantEducationProgramAssociationAggregate.EdFi.StudentMigrantEducationProgramAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CostRateDescriptorAggregate.EdFi.CostRateDescriptorQ" table="CostRateDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CostRateDescriptorAggregate.EdFi.CostRateDescriptorQ" lazy="false" discriminator-value="edfi.CostRateDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CostRateDescriptor" >
           <key>
             <column name="CostRateDescriptorId" />
           </key>
@@ -3885,8 +3961,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.EducationContentAggregate.EdFi.EducationContentQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CountryDescriptorAggregate.EdFi.CountryDescriptorQ" table="CountryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CountryDescriptorAggregate.EdFi.CountryDescriptorQ" lazy="false" discriminator-value="edfi.CountryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CountryDescriptor" >
           <key>
             <column name="CountryDescriptorId" />
           </key>
@@ -3969,8 +4047,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAggregate.EdFi.StudentPersonalIdentificationDocumentQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CourseAttemptResultDescriptorAggregate.EdFi.CourseAttemptResultDescriptorQ" table="CourseAttemptResultDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CourseAttemptResultDescriptorAggregate.EdFi.CourseAttemptResultDescriptorQ" lazy="false" discriminator-value="edfi.CourseAttemptResultDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CourseAttemptResultDescriptor" >
           <key>
             <column name="CourseAttemptResultDescriptorId" />
           </key>
@@ -3990,8 +4070,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.CourseTranscriptAggregate.EdFi.CourseTranscriptQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CourseDefinedByDescriptorAggregate.EdFi.CourseDefinedByDescriptorQ" table="CourseDefinedByDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CourseDefinedByDescriptorAggregate.EdFi.CourseDefinedByDescriptorQ" lazy="false" discriminator-value="edfi.CourseDefinedByDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CourseDefinedByDescriptor" >
           <key>
             <column name="CourseDefinedByDescriptorId" />
           </key>
@@ -4011,8 +4093,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.CourseAggregate.EdFi.CourseQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CourseGPAApplicabilityDescriptorAggregate.EdFi.CourseGPAApplicabilityDescriptorQ" table="CourseGPAApplicabilityDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CourseGPAApplicabilityDescriptorAggregate.EdFi.CourseGPAApplicabilityDescriptorQ" lazy="false" discriminator-value="edfi.CourseGPAApplicabilityDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CourseGPAApplicabilityDescriptor" >
           <key>
             <column name="CourseGPAApplicabilityDescriptorId" />
           </key>
@@ -4032,8 +4116,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.CourseAggregate.EdFi.CourseQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CourseIdentificationSystemDescriptorAggregate.EdFi.CourseIdentificationSystemDescriptorQ" table="CourseIdentificationSystemDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CourseIdentificationSystemDescriptorAggregate.EdFi.CourseIdentificationSystemDescriptorQ" lazy="false" discriminator-value="edfi.CourseIdentificationSystemDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CourseIdentificationSystemDescriptor" >
           <key>
             <column name="CourseIdentificationSystemDescriptorId" />
           </key>
@@ -4060,8 +4146,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.CourseTranscriptAggregate.EdFi.CourseTranscriptAlternativeCourseIdentificationCodeQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CourseLevelCharacteristicDescriptorAggregate.EdFi.CourseLevelCharacteristicDescriptorQ" table="CourseLevelCharacteristicDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CourseLevelCharacteristicDescriptorAggregate.EdFi.CourseLevelCharacteristicDescriptorQ" lazy="false" discriminator-value="edfi.CourseLevelCharacteristicDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CourseLevelCharacteristicDescriptor" >
           <key>
             <column name="CourseLevelCharacteristicDescriptorId" />
           </key>
@@ -4095,8 +4183,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.SectionAggregate.EdFi.SectionCourseLevelCharacteristicQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CourseRepeatCodeDescriptorAggregate.EdFi.CourseRepeatCodeDescriptorQ" table="CourseRepeatCodeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CourseRepeatCodeDescriptorAggregate.EdFi.CourseRepeatCodeDescriptorQ" lazy="false" discriminator-value="edfi.CourseRepeatCodeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CourseRepeatCodeDescriptor" >
           <key>
             <column name="CourseRepeatCodeDescriptorId" />
           </key>
@@ -4116,8 +4206,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.CourseTranscriptAggregate.EdFi.CourseTranscriptQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CredentialFieldDescriptorAggregate.EdFi.CredentialFieldDescriptorQ" table="CredentialFieldDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CredentialFieldDescriptorAggregate.EdFi.CredentialFieldDescriptorQ" lazy="false" discriminator-value="edfi.CredentialFieldDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CredentialFieldDescriptor" >
           <key>
             <column name="CredentialFieldDescriptorId" />
           </key>
@@ -4137,8 +4229,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.CredentialAggregate.EdFi.CredentialQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CredentialTypeDescriptorAggregate.EdFi.CredentialTypeDescriptorQ" table="CredentialTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CredentialTypeDescriptorAggregate.EdFi.CredentialTypeDescriptorQ" lazy="false" discriminator-value="edfi.CredentialTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CredentialTypeDescriptor" >
           <key>
             <column name="CredentialTypeDescriptorId" />
           </key>
@@ -4158,8 +4252,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.CredentialAggregate.EdFi.CredentialQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CreditCategoryDescriptorAggregate.EdFi.CreditCategoryDescriptorQ" table="CreditCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CreditCategoryDescriptorAggregate.EdFi.CreditCategoryDescriptorQ" lazy="false" discriminator-value="edfi.CreditCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CreditCategoryDescriptor" >
           <key>
             <column name="CreditCategoryDescriptorId" />
           </key>
@@ -4186,8 +4282,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.GraduationPlanAggregate.EdFi.GraduationPlanCreditsByCreditCategoryQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CreditTypeDescriptorAggregate.EdFi.CreditTypeDescriptorQ" table="CreditTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CreditTypeDescriptorAggregate.EdFi.CreditTypeDescriptorQ" lazy="false" discriminator-value="edfi.CreditTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CreditTypeDescriptor" >
           <key>
             <column name="CreditTypeDescriptorId" />
           </key>
@@ -4291,8 +4389,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAcademicRecordAggregate.EdFi.StudentAcademicRecordQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CTEProgramServiceDescriptorAggregate.EdFi.CTEProgramServiceDescriptorQ" table="CTEProgramServiceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CTEProgramServiceDescriptorAggregate.EdFi.CTEProgramServiceDescriptorQ" lazy="false" discriminator-value="edfi.CTEProgramServiceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CTEProgramServiceDescriptor" >
           <key>
             <column name="CTEProgramServiceDescriptorId" />
           </key>
@@ -4312,8 +4412,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentCTEProgramAssociationAggregate.EdFi.StudentCTEProgramAssociationCTEProgramServiceQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CurriculumUsedDescriptorAggregate.EdFi.CurriculumUsedDescriptorQ" table="CurriculumUsedDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CurriculumUsedDescriptorAggregate.EdFi.CurriculumUsedDescriptorQ" lazy="false" discriminator-value="edfi.CurriculumUsedDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CurriculumUsedDescriptor" >
           <key>
             <column name="CurriculumUsedDescriptorId" />
           </key>
@@ -4333,8 +4435,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.CourseOfferingAggregate.EdFi.CourseOfferingCurriculumUsedQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.DeliveryMethodDescriptorAggregate.EdFi.DeliveryMethodDescriptorQ" table="DeliveryMethodDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.DeliveryMethodDescriptorAggregate.EdFi.DeliveryMethodDescriptorQ" lazy="false" discriminator-value="edfi.DeliveryMethodDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="DeliveryMethodDescriptor" >
           <key>
             <column name="DeliveryMethodDescriptorId" />
           </key>
@@ -4368,8 +4472,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.InterventionStudyAggregate.EdFi.InterventionStudyQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.DiagnosisDescriptorAggregate.EdFi.DiagnosisDescriptorQ" table="DiagnosisDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.DiagnosisDescriptorAggregate.EdFi.DiagnosisDescriptorQ" lazy="false" discriminator-value="edfi.DiagnosisDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="DiagnosisDescriptor" >
           <key>
             <column name="DiagnosisDescriptorId" />
           </key>
@@ -4410,8 +4516,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentInterventionAssociationAggregate.EdFi.StudentInterventionAssociationInterventionEffectivenessQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.DiplomaLevelDescriptorAggregate.EdFi.DiplomaLevelDescriptorQ" table="DiplomaLevelDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.DiplomaLevelDescriptorAggregate.EdFi.DiplomaLevelDescriptorQ" lazy="false" discriminator-value="edfi.DiplomaLevelDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="DiplomaLevelDescriptor" >
           <key>
             <column name="DiplomaLevelDescriptorId" />
           </key>
@@ -4431,8 +4539,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAcademicRecordAggregate.EdFi.StudentAcademicRecordDiplomaQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.DiplomaTypeDescriptorAggregate.EdFi.DiplomaTypeDescriptorQ" table="DiplomaTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.DiplomaTypeDescriptorAggregate.EdFi.DiplomaTypeDescriptorQ" lazy="false" discriminator-value="edfi.DiplomaTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="DiplomaTypeDescriptor" >
           <key>
             <column name="DiplomaTypeDescriptorId" />
           </key>
@@ -4452,8 +4562,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAcademicRecordAggregate.EdFi.StudentAcademicRecordDiplomaQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.DisabilityDescriptorAggregate.EdFi.DisabilityDescriptorQ" table="DisabilityDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.DisabilityDescriptorAggregate.EdFi.DisabilityDescriptorQ" lazy="false" discriminator-value="edfi.DisabilityDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="DisabilityDescriptor" >
           <key>
             <column name="DisabilityDescriptorId" />
           </key>
@@ -4480,8 +4592,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSpecialEducationProgramAssociationAggregate.EdFi.StudentSpecialEducationProgramAssociationDisabilityQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.DisabilityDesignationDescriptorAggregate.EdFi.DisabilityDesignationDescriptorQ" table="DisabilityDesignationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.DisabilityDesignationDescriptorAggregate.EdFi.DisabilityDesignationDescriptorQ" lazy="false" discriminator-value="edfi.DisabilityDesignationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="DisabilityDesignationDescriptor" >
           <key>
             <column name="DisabilityDesignationDescriptorId" />
           </key>
@@ -4508,8 +4622,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSpecialEducationProgramAssociationAggregate.EdFi.StudentSpecialEducationProgramAssociationDisabilityDesignationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.DisabilityDeterminationSourceTypeDescriptorAggregate.EdFi.DisabilityDeterminationSourceTypeDescriptorQ" table="DisabilityDeterminationSourceTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.DisabilityDeterminationSourceTypeDescriptorAggregate.EdFi.DisabilityDeterminationSourceTypeDescriptorQ" lazy="false" discriminator-value="edfi.DisabilityDeterminationSourceTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="DisabilityDeterminationSourceTypeDescriptor" >
           <key>
             <column name="DisabilityDeterminationSourceTypeDescriptorId" />
           </key>
@@ -4536,8 +4652,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSpecialEducationProgramAssociationAggregate.EdFi.StudentSpecialEducationProgramAssociationDisabilityQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.DisciplineActionLengthDifferenceReasonDescriptorAggregate.EdFi.DisciplineActionLengthDifferenceReasonDescriptorQ" table="DisciplineActionLengthDifferenceReasonDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.DisciplineActionLengthDifferenceReasonDescriptorAggregate.EdFi.DisciplineActionLengthDifferenceReasonDescriptorQ" lazy="false" discriminator-value="edfi.DisciplineActionLengthDifferenceReasonDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="DisciplineActionLengthDifferenceReasonDescriptor" >
           <key>
             <column name="DisciplineActionLengthDifferenceReasonDescriptorId" />
           </key>
@@ -4557,8 +4675,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.DisciplineActionAggregate.EdFi.DisciplineActionQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.DisciplineDescriptorAggregate.EdFi.DisciplineDescriptorQ" table="DisciplineDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.DisciplineDescriptorAggregate.EdFi.DisciplineDescriptorQ" lazy="false" discriminator-value="edfi.DisciplineDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="DisciplineDescriptor" >
           <key>
             <column name="DisciplineDescriptorId" />
           </key>
@@ -4578,8 +4698,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.DisciplineActionAggregate.EdFi.DisciplineActionDisciplineQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.DisciplineIncidentParticipationCodeDescriptorAggregate.EdFi.DisciplineIncidentParticipationCodeDescriptorQ" table="DisciplineIncidentParticipationCodeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.DisciplineIncidentParticipationCodeDescriptorAggregate.EdFi.DisciplineIncidentParticipationCodeDescriptorQ" lazy="false" discriminator-value="edfi.DisciplineIncidentParticipationCodeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="DisciplineIncidentParticipationCodeDescriptor" >
           <key>
             <column name="DisciplineIncidentParticipationCodeDescriptorId" />
           </key>
@@ -4620,8 +4742,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentDisciplineIncidentNonOffenderAssociationAggregate.EdFi.StudentDisciplineIncidentNonOffenderAssociationDisciplineIncidentParticipationCodeQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.EducationalEnvironmentDescriptorAggregate.EdFi.EducationalEnvironmentDescriptorQ" table="EducationalEnvironmentDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.EducationalEnvironmentDescriptorAggregate.EdFi.EducationalEnvironmentDescriptorQ" lazy="false" discriminator-value="edfi.EducationalEnvironmentDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="EducationalEnvironmentDescriptor" >
           <key>
             <column name="EducationalEnvironmentDescriptorId" />
           </key>
@@ -4676,8 +4800,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSectionAttendanceEventAggregate.EdFi.StudentSectionAttendanceEventQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.EducationOrganizationAssociationTypeDescriptorAggregate.EdFi.EducationOrganizationAssociationTypeDescriptorQ" table="EducationOrganizationAssociationTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.EducationOrganizationAssociationTypeDescriptorAggregate.EdFi.EducationOrganizationAssociationTypeDescriptorQ" lazy="false" discriminator-value="edfi.EducationOrganizationAssociationTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="EducationOrganizationAssociationTypeDescriptor" >
           <key>
             <column name="EducationOrganizationAssociationTypeDescriptorId" />
           </key>
@@ -4697,8 +4823,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAssessmentEducationOrganizationAssociationAggregate.EdFi.StudentAssessmentEducationOrganizationAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.EducationOrganizationCategoryDescriptorAggregate.EdFi.EducationOrganizationCategoryDescriptorQ" table="EducationOrganizationCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.EducationOrganizationCategoryDescriptorAggregate.EdFi.EducationOrganizationCategoryDescriptorQ" lazy="false" discriminator-value="edfi.EducationOrganizationCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="EducationOrganizationCategoryDescriptor" >
           <key>
             <column name="EducationOrganizationCategoryDescriptorId" />
           </key>
@@ -4718,8 +4846,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.EducationOrganizationAggregate.EdFi.EducationOrganizationCategoryQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.EducationOrganizationIdentificationSystemDescriptorAggregate.EdFi.EducationOrganizationIdentificationSystemDescriptorQ" table="EducationOrganizationIdentificationSystemDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.EducationOrganizationIdentificationSystemDescriptorAggregate.EdFi.EducationOrganizationIdentificationSystemDescriptorQ" lazy="false" discriminator-value="edfi.EducationOrganizationIdentificationSystemDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="EducationOrganizationIdentificationSystemDescriptor" >
           <key>
             <column name="EducationOrganizationIdentificationSystemDescriptorId" />
           </key>
@@ -4739,8 +4869,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.EducationOrganizationAggregate.EdFi.EducationOrganizationIdentificationCodeQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.EducationPlanDescriptorAggregate.EdFi.EducationPlanDescriptorQ" table="EducationPlanDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.EducationPlanDescriptorAggregate.EdFi.EducationPlanDescriptorQ" lazy="false" discriminator-value="edfi.EducationPlanDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="EducationPlanDescriptor" >
           <key>
             <column name="EducationPlanDescriptorId" />
           </key>
@@ -4760,8 +4892,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSchoolAssociationAggregate.EdFi.StudentSchoolAssociationEducationPlanQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ElectronicMailTypeDescriptorAggregate.EdFi.ElectronicMailTypeDescriptorQ" table="ElectronicMailTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ElectronicMailTypeDescriptorAggregate.EdFi.ElectronicMailTypeDescriptorQ" lazy="false" discriminator-value="edfi.ElectronicMailTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ElectronicMailTypeDescriptor" >
           <key>
             <column name="ElectronicMailTypeDescriptorId" />
           </key>
@@ -4795,8 +4929,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationElectronicMailQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.EmploymentStatusDescriptorAggregate.EdFi.EmploymentStatusDescriptorQ" table="EmploymentStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.EmploymentStatusDescriptorAggregate.EdFi.EmploymentStatusDescriptorQ" lazy="false" discriminator-value="edfi.EmploymentStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="EmploymentStatusDescriptor" >
           <key>
             <column name="EmploymentStatusDescriptorId" />
           </key>
@@ -4823,8 +4959,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StaffEducationOrganizationEmploymentAssociationAggregate.EdFi.StaffEducationOrganizationEmploymentAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.EntryGradeLevelReasonDescriptorAggregate.EdFi.EntryGradeLevelReasonDescriptorQ" table="EntryGradeLevelReasonDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.EntryGradeLevelReasonDescriptorAggregate.EdFi.EntryGradeLevelReasonDescriptorQ" lazy="false" discriminator-value="edfi.EntryGradeLevelReasonDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="EntryGradeLevelReasonDescriptor" >
           <key>
             <column name="EntryGradeLevelReasonDescriptorId" />
           </key>
@@ -4844,8 +4982,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSchoolAssociationAggregate.EdFi.StudentSchoolAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.EntryTypeDescriptorAggregate.EdFi.EntryTypeDescriptorQ" table="EntryTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.EntryTypeDescriptorAggregate.EdFi.EntryTypeDescriptorQ" lazy="false" discriminator-value="edfi.EntryTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="EntryTypeDescriptor" >
           <key>
             <column name="EntryTypeDescriptorId" />
           </key>
@@ -4865,8 +5005,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSchoolAssociationAggregate.EdFi.StudentSchoolAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.EventCircumstanceDescriptorAggregate.EdFi.EventCircumstanceDescriptorQ" table="EventCircumstanceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.EventCircumstanceDescriptorAggregate.EdFi.EventCircumstanceDescriptorQ" lazy="false" discriminator-value="edfi.EventCircumstanceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="EventCircumstanceDescriptor" >
           <key>
             <column name="EventCircumstanceDescriptorId" />
           </key>
@@ -4886,8 +5028,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAssessmentAggregate.EdFi.StudentAssessmentQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ExitWithdrawTypeDescriptorAggregate.EdFi.ExitWithdrawTypeDescriptorQ" table="ExitWithdrawTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ExitWithdrawTypeDescriptorAggregate.EdFi.ExitWithdrawTypeDescriptorQ" lazy="false" discriminator-value="edfi.ExitWithdrawTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ExitWithdrawTypeDescriptor" >
           <key>
             <column name="ExitWithdrawTypeDescriptorId" />
           </key>
@@ -4907,8 +5051,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSchoolAssociationAggregate.EdFi.StudentSchoolAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.FinancialCollectionDescriptorAggregate.EdFi.FinancialCollectionDescriptorQ" table="FinancialCollectionDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.FinancialCollectionDescriptorAggregate.EdFi.FinancialCollectionDescriptorQ" lazy="false" discriminator-value="edfi.FinancialCollectionDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="FinancialCollectionDescriptor" >
           <key>
             <column name="FinancialCollectionDescriptorId" />
           </key>
@@ -4956,8 +5102,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.LocalPayrollAggregate.EdFi.LocalPayrollQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.GradebookEntryTypeDescriptorAggregate.EdFi.GradebookEntryTypeDescriptorQ" table="GradebookEntryTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.GradebookEntryTypeDescriptorAggregate.EdFi.GradebookEntryTypeDescriptorQ" lazy="false" discriminator-value="edfi.GradebookEntryTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="GradebookEntryTypeDescriptor" >
           <key>
             <column name="GradebookEntryTypeDescriptorId" />
           </key>
@@ -4977,8 +5125,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.GradebookEntryAggregate.EdFi.GradebookEntryQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.GradeLevelDescriptorAggregate.EdFi.GradeLevelDescriptorQ" table="GradeLevelDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.GradeLevelDescriptorAggregate.EdFi.GradeLevelDescriptorQ" lazy="false" discriminator-value="edfi.GradeLevelDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="GradeLevelDescriptor" >
           <key>
             <column name="GradeLevelDescriptorId" />
           </key>
@@ -5152,8 +5302,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSchoolAssociationAggregate.EdFi.StudentSchoolAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.GradePointAverageTypeDescriptorAggregate.EdFi.GradePointAverageTypeDescriptorQ" table="GradePointAverageTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.GradePointAverageTypeDescriptorAggregate.EdFi.GradePointAverageTypeDescriptorQ" lazy="false" discriminator-value="edfi.GradePointAverageTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="GradePointAverageTypeDescriptor" >
           <key>
             <column name="GradePointAverageTypeDescriptorId" />
           </key>
@@ -5180,8 +5332,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAcademicRecordAggregate.EdFi.StudentAcademicRecordGradePointAverageQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.GradeTypeDescriptorAggregate.EdFi.GradeTypeDescriptorQ" table="GradeTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.GradeTypeDescriptorAggregate.EdFi.GradeTypeDescriptorQ" lazy="false" discriminator-value="edfi.GradeTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="GradeTypeDescriptor" >
           <key>
             <column name="GradeTypeDescriptorId" />
           </key>
@@ -5201,8 +5355,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.GradeAggregate.EdFi.GradeQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.GradingPeriodDescriptorAggregate.EdFi.GradingPeriodDescriptorQ" table="GradingPeriodDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.GradingPeriodDescriptorAggregate.EdFi.GradingPeriodDescriptorQ" lazy="false" discriminator-value="edfi.GradingPeriodDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="GradingPeriodDescriptor" >
           <key>
             <column name="GradingPeriodDescriptorId" />
           </key>
@@ -5222,8 +5378,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.GradingPeriodAggregate.EdFi.GradingPeriodQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.GraduationPlanTypeDescriptorAggregate.EdFi.GraduationPlanTypeDescriptorQ" table="GraduationPlanTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.GraduationPlanTypeDescriptorAggregate.EdFi.GraduationPlanTypeDescriptorQ" lazy="false" discriminator-value="edfi.GraduationPlanTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="GraduationPlanTypeDescriptor" >
           <key>
             <column name="GraduationPlanTypeDescriptorId" />
           </key>
@@ -5243,8 +5401,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.GraduationPlanAggregate.EdFi.GraduationPlanQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.GunFreeSchoolsActReportingStatusDescriptorAggregate.EdFi.GunFreeSchoolsActReportingStatusDescriptorQ" table="GunFreeSchoolsActReportingStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.GunFreeSchoolsActReportingStatusDescriptorAggregate.EdFi.GunFreeSchoolsActReportingStatusDescriptorQ" lazy="false" discriminator-value="edfi.GunFreeSchoolsActReportingStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="GunFreeSchoolsActReportingStatusDescriptor" >
           <key>
             <column name="GunFreeSchoolsActReportingStatusDescriptorId" />
           </key>
@@ -5264,8 +5424,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.LocalEducationAgencyAggregate.EdFi.LocalEducationAgencyAccountabilityQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.HomelessPrimaryNighttimeResidenceDescriptorAggregate.EdFi.HomelessPrimaryNighttimeResidenceDescriptorQ" table="HomelessPrimaryNighttimeResidenceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.HomelessPrimaryNighttimeResidenceDescriptorAggregate.EdFi.HomelessPrimaryNighttimeResidenceDescriptorQ" lazy="false" discriminator-value="edfi.HomelessPrimaryNighttimeResidenceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="HomelessPrimaryNighttimeResidenceDescriptor" >
           <key>
             <column name="HomelessPrimaryNighttimeResidenceDescriptorId" />
           </key>
@@ -5285,8 +5447,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentHomelessProgramAssociationAggregate.EdFi.StudentHomelessProgramAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.HomelessProgramServiceDescriptorAggregate.EdFi.HomelessProgramServiceDescriptorQ" table="HomelessProgramServiceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.HomelessProgramServiceDescriptorAggregate.EdFi.HomelessProgramServiceDescriptorQ" lazy="false" discriminator-value="edfi.HomelessProgramServiceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="HomelessProgramServiceDescriptor" >
           <key>
             <column name="HomelessProgramServiceDescriptorId" />
           </key>
@@ -5306,8 +5470,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentHomelessProgramAssociationAggregate.EdFi.StudentHomelessProgramAssociationHomelessProgramServiceQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.IdentificationDocumentUseDescriptorAggregate.EdFi.IdentificationDocumentUseDescriptorQ" table="IdentificationDocumentUseDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.IdentificationDocumentUseDescriptorAggregate.EdFi.IdentificationDocumentUseDescriptorQ" lazy="false" discriminator-value="edfi.IdentificationDocumentUseDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="IdentificationDocumentUseDescriptor" >
           <key>
             <column name="IdentificationDocumentUseDescriptorId" />
           </key>
@@ -5355,8 +5521,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAggregate.EdFi.StudentPersonalIdentificationDocumentQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.IncidentLocationDescriptorAggregate.EdFi.IncidentLocationDescriptorQ" table="IncidentLocationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.IncidentLocationDescriptorAggregate.EdFi.IncidentLocationDescriptorQ" lazy="false" discriminator-value="edfi.IncidentLocationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="IncidentLocationDescriptor" >
           <key>
             <column name="IncidentLocationDescriptorId" />
           </key>
@@ -5376,8 +5544,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.DisciplineIncidentAggregate.EdFi.DisciplineIncidentQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.IndicatorDescriptorAggregate.EdFi.IndicatorDescriptorQ" table="IndicatorDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.IndicatorDescriptorAggregate.EdFi.IndicatorDescriptorQ" lazy="false" discriminator-value="edfi.IndicatorDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="IndicatorDescriptor" >
           <key>
             <column name="IndicatorDescriptorId" />
           </key>
@@ -5397,8 +5567,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.EducationOrganizationAggregate.EdFi.EducationOrganizationIndicatorQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.IndicatorGroupDescriptorAggregate.EdFi.IndicatorGroupDescriptorQ" table="IndicatorGroupDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.IndicatorGroupDescriptorAggregate.EdFi.IndicatorGroupDescriptorQ" lazy="false" discriminator-value="edfi.IndicatorGroupDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="IndicatorGroupDescriptor" >
           <key>
             <column name="IndicatorGroupDescriptorId" />
           </key>
@@ -5418,8 +5590,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.EducationOrganizationAggregate.EdFi.EducationOrganizationIndicatorQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.IndicatorLevelDescriptorAggregate.EdFi.IndicatorLevelDescriptorQ" table="IndicatorLevelDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.IndicatorLevelDescriptorAggregate.EdFi.IndicatorLevelDescriptorQ" lazy="false" discriminator-value="edfi.IndicatorLevelDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="IndicatorLevelDescriptor" >
           <key>
             <column name="IndicatorLevelDescriptorId" />
           </key>
@@ -5439,8 +5613,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.EducationOrganizationAggregate.EdFi.EducationOrganizationIndicatorQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.InstitutionTelephoneNumberTypeDescriptorAggregate.EdFi.InstitutionTelephoneNumberTypeDescriptorQ" table="InstitutionTelephoneNumberTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.InstitutionTelephoneNumberTypeDescriptorAggregate.EdFi.InstitutionTelephoneNumberTypeDescriptorQ" lazy="false" discriminator-value="edfi.InstitutionTelephoneNumberTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="InstitutionTelephoneNumberTypeDescriptor" >
           <key>
             <column name="InstitutionTelephoneNumberTypeDescriptorId" />
           </key>
@@ -5460,8 +5636,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.EducationOrganizationAggregate.EdFi.EducationOrganizationInstitutionTelephoneQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.InteractivityStyleDescriptorAggregate.EdFi.InteractivityStyleDescriptorQ" table="InteractivityStyleDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.InteractivityStyleDescriptorAggregate.EdFi.InteractivityStyleDescriptorQ" lazy="false" discriminator-value="edfi.InteractivityStyleDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="InteractivityStyleDescriptor" >
           <key>
             <column name="InteractivityStyleDescriptorId" />
           </key>
@@ -5481,8 +5659,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.EducationContentAggregate.EdFi.EducationContentQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.InternetAccessDescriptorAggregate.EdFi.InternetAccessDescriptorQ" table="InternetAccessDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.InternetAccessDescriptorAggregate.EdFi.InternetAccessDescriptorQ" lazy="false" discriminator-value="edfi.InternetAccessDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="InternetAccessDescriptor" >
           <key>
             <column name="InternetAccessDescriptorId" />
           </key>
@@ -5502,8 +5682,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.SchoolAggregate.EdFi.SchoolQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.InternetAccessTypeInResidenceDescriptorAggregate.EdFi.InternetAccessTypeInResidenceDescriptorQ" table="InternetAccessTypeInResidenceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.InternetAccessTypeInResidenceDescriptorAggregate.EdFi.InternetAccessTypeInResidenceDescriptorQ" lazy="false" discriminator-value="edfi.InternetAccessTypeInResidenceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="InternetAccessTypeInResidenceDescriptor" >
           <key>
             <column name="InternetAccessTypeInResidenceDescriptorId" />
           </key>
@@ -5523,8 +5705,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.InternetPerformanceInResidenceDescriptorAggregate.EdFi.InternetPerformanceInResidenceDescriptorQ" table="InternetPerformanceInResidenceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.InternetPerformanceInResidenceDescriptorAggregate.EdFi.InternetPerformanceInResidenceDescriptorQ" lazy="false" discriminator-value="edfi.InternetPerformanceInResidenceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="InternetPerformanceInResidenceDescriptor" >
           <key>
             <column name="InternetPerformanceInResidenceDescriptorId" />
           </key>
@@ -5544,8 +5728,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.InterventionClassDescriptorAggregate.EdFi.InterventionClassDescriptorQ" table="InterventionClassDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.InterventionClassDescriptorAggregate.EdFi.InterventionClassDescriptorQ" lazy="false" discriminator-value="edfi.InterventionClassDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="InterventionClassDescriptor" >
           <key>
             <column name="InterventionClassDescriptorId" />
           </key>
@@ -5579,8 +5765,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.InterventionStudyAggregate.EdFi.InterventionStudyQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.InterventionEffectivenessRatingDescriptorAggregate.EdFi.InterventionEffectivenessRatingDescriptorQ" table="InterventionEffectivenessRatingDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.InterventionEffectivenessRatingDescriptorAggregate.EdFi.InterventionEffectivenessRatingDescriptorQ" lazy="false" discriminator-value="edfi.InterventionEffectivenessRatingDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="InterventionEffectivenessRatingDescriptor" >
           <key>
             <column name="InterventionEffectivenessRatingDescriptorId" />
           </key>
@@ -5607,8 +5795,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentInterventionAssociationAggregate.EdFi.StudentInterventionAssociationInterventionEffectivenessQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LanguageDescriptorAggregate.EdFi.LanguageDescriptorQ" table="LanguageDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LanguageDescriptorAggregate.EdFi.LanguageDescriptorQ" lazy="false" discriminator-value="edfi.LanguageDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LanguageDescriptor" >
           <key>
             <column name="LanguageDescriptorId" />
           </key>
@@ -5670,8 +5860,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationLanguageQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LanguageInstructionProgramServiceDescriptorAggregate.EdFi.LanguageInstructionProgramServiceDescriptorQ" table="LanguageInstructionProgramServiceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LanguageInstructionProgramServiceDescriptorAggregate.EdFi.LanguageInstructionProgramServiceDescriptorQ" lazy="false" discriminator-value="edfi.LanguageInstructionProgramServiceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LanguageInstructionProgramServiceDescriptor" >
           <key>
             <column name="LanguageInstructionProgramServiceDescriptorId" />
           </key>
@@ -5691,8 +5883,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentLanguageInstructionProgramAssociationAggregate.EdFi.StudentLanguageInstructionProgramAssociationLanguageInstructionProgramServiceQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LanguageUseDescriptorAggregate.EdFi.LanguageUseDescriptorQ" table="LanguageUseDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LanguageUseDescriptorAggregate.EdFi.LanguageUseDescriptorQ" lazy="false" discriminator-value="edfi.LanguageUseDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LanguageUseDescriptor" >
           <key>
             <column name="LanguageUseDescriptorId" />
           </key>
@@ -5726,8 +5920,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationLanguageUseQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LearningStandardCategoryDescriptorAggregate.EdFi.LearningStandardCategoryDescriptorQ" table="LearningStandardCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LearningStandardCategoryDescriptorAggregate.EdFi.LearningStandardCategoryDescriptorQ" lazy="false" discriminator-value="edfi.LearningStandardCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LearningStandardCategoryDescriptor" >
           <key>
             <column name="LearningStandardCategoryDescriptorId" />
           </key>
@@ -5747,8 +5943,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.LearningStandardAggregate.EdFi.LearningStandardQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LearningStandardEquivalenceStrengthDescriptorAggregate.EdFi.LearningStandardEquivalenceStrengthDescriptorQ" table="LearningStandardEquivalenceStrengthDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LearningStandardEquivalenceStrengthDescriptorAggregate.EdFi.LearningStandardEquivalenceStrengthDescriptorQ" lazy="false" discriminator-value="edfi.LearningStandardEquivalenceStrengthDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LearningStandardEquivalenceStrengthDescriptor" >
           <key>
             <column name="LearningStandardEquivalenceStrengthDescriptorId" />
           </key>
@@ -5768,8 +5966,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.LearningStandardEquivalenceAssociationAggregate.EdFi.LearningStandardEquivalenceAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LearningStandardScopeDescriptorAggregate.EdFi.LearningStandardScopeDescriptorQ" table="LearningStandardScopeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LearningStandardScopeDescriptorAggregate.EdFi.LearningStandardScopeDescriptorQ" lazy="false" discriminator-value="edfi.LearningStandardScopeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LearningStandardScopeDescriptor" >
           <key>
             <column name="LearningStandardScopeDescriptorId" />
           </key>
@@ -5789,8 +5989,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.LearningStandardAggregate.EdFi.LearningStandardQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LevelOfEducationDescriptorAggregate.EdFi.LevelOfEducationDescriptorQ" table="LevelOfEducationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LevelOfEducationDescriptorAggregate.EdFi.LevelOfEducationDescriptorQ" lazy="false" discriminator-value="edfi.LevelOfEducationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LevelOfEducationDescriptor" >
           <key>
             <column name="LevelOfEducationDescriptorId" />
           </key>
@@ -5817,8 +6019,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StaffAggregate.EdFi.StaffQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LicenseStatusDescriptorAggregate.EdFi.LicenseStatusDescriptorQ" table="LicenseStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LicenseStatusDescriptorAggregate.EdFi.LicenseStatusDescriptorQ" lazy="false" discriminator-value="edfi.LicenseStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LicenseStatusDescriptor" >
           <key>
             <column name="LicenseStatusDescriptorId" />
           </key>
@@ -5838,8 +6042,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.CommunityProviderLicenseAggregate.EdFi.CommunityProviderLicenseQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LicenseTypeDescriptorAggregate.EdFi.LicenseTypeDescriptorQ" table="LicenseTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LicenseTypeDescriptorAggregate.EdFi.LicenseTypeDescriptorQ" lazy="false" discriminator-value="edfi.LicenseTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LicenseTypeDescriptor" >
           <key>
             <column name="LicenseTypeDescriptorId" />
           </key>
@@ -5859,8 +6065,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.CommunityProviderLicenseAggregate.EdFi.CommunityProviderLicenseQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LimitedEnglishProficiencyDescriptorAggregate.EdFi.LimitedEnglishProficiencyDescriptorQ" table="LimitedEnglishProficiencyDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LimitedEnglishProficiencyDescriptorAggregate.EdFi.LimitedEnglishProficiencyDescriptorQ" lazy="false" discriminator-value="edfi.LimitedEnglishProficiencyDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LimitedEnglishProficiencyDescriptor" >
           <key>
             <column name="LimitedEnglishProficiencyDescriptorId" />
           </key>
@@ -5880,8 +6088,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LocaleDescriptorAggregate.EdFi.LocaleDescriptorQ" table="LocaleDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LocaleDescriptorAggregate.EdFi.LocaleDescriptorQ" lazy="false" discriminator-value="edfi.LocaleDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LocaleDescriptor" >
           <key>
             <column name="LocaleDescriptorId" />
           </key>
@@ -5929,8 +6139,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationAddressQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LocalEducationAgencyCategoryDescriptorAggregate.EdFi.LocalEducationAgencyCategoryDescriptorQ" table="LocalEducationAgencyCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LocalEducationAgencyCategoryDescriptorAggregate.EdFi.LocalEducationAgencyCategoryDescriptorQ" lazy="false" discriminator-value="edfi.LocalEducationAgencyCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LocalEducationAgencyCategoryDescriptor" >
           <key>
             <column name="LocalEducationAgencyCategoryDescriptorId" />
           </key>
@@ -5950,8 +6162,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.LocalEducationAgencyAggregate.EdFi.LocalEducationAgencyQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.MagnetSpecialProgramEmphasisSchoolDescriptorAggregate.EdFi.MagnetSpecialProgramEmphasisSchoolDescriptorQ" table="MagnetSpecialProgramEmphasisSchoolDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.MagnetSpecialProgramEmphasisSchoolDescriptorAggregate.EdFi.MagnetSpecialProgramEmphasisSchoolDescriptorQ" lazy="false" discriminator-value="edfi.MagnetSpecialProgramEmphasisSchoolDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="MagnetSpecialProgramEmphasisSchoolDescriptor" >
           <key>
             <column name="MagnetSpecialProgramEmphasisSchoolDescriptorId" />
           </key>
@@ -5971,8 +6185,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.SchoolAggregate.EdFi.SchoolQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.MediumOfInstructionDescriptorAggregate.EdFi.MediumOfInstructionDescriptorQ" table="MediumOfInstructionDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.MediumOfInstructionDescriptorAggregate.EdFi.MediumOfInstructionDescriptorQ" lazy="false" discriminator-value="edfi.MediumOfInstructionDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="MediumOfInstructionDescriptor" >
           <key>
             <column name="MediumOfInstructionDescriptorId" />
           </key>
@@ -5999,8 +6215,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.SectionAggregate.EdFi.SectionQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.MethodCreditEarnedDescriptorAggregate.EdFi.MethodCreditEarnedDescriptorQ" table="MethodCreditEarnedDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.MethodCreditEarnedDescriptorAggregate.EdFi.MethodCreditEarnedDescriptorQ" lazy="false" discriminator-value="edfi.MethodCreditEarnedDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="MethodCreditEarnedDescriptor" >
           <key>
             <column name="MethodCreditEarnedDescriptorId" />
           </key>
@@ -6027,8 +6245,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.CourseTranscriptAggregate.EdFi.CourseTranscriptPartialCourseTranscriptAwardsQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.MigrantEducationProgramServiceDescriptorAggregate.EdFi.MigrantEducationProgramServiceDescriptorQ" table="MigrantEducationProgramServiceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.MigrantEducationProgramServiceDescriptorAggregate.EdFi.MigrantEducationProgramServiceDescriptorQ" lazy="false" discriminator-value="edfi.MigrantEducationProgramServiceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="MigrantEducationProgramServiceDescriptor" >
           <key>
             <column name="MigrantEducationProgramServiceDescriptorId" />
           </key>
@@ -6048,8 +6268,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentMigrantEducationProgramAssociationAggregate.EdFi.StudentMigrantEducationProgramAssociationMigrantEducationProgramServiceQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ModelEntityDescriptorAggregate.EdFi.ModelEntityDescriptorQ" table="ModelEntityDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ModelEntityDescriptorAggregate.EdFi.ModelEntityDescriptorQ" lazy="false" discriminator-value="edfi.ModelEntityDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ModelEntityDescriptor" >
           <key>
             <column name="ModelEntityDescriptorId" />
           </key>
@@ -6069,8 +6291,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.DescriptorMappingAggregate.EdFi.DescriptorMappingModelEntityQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.MonitoredDescriptorAggregate.EdFi.MonitoredDescriptorQ" table="MonitoredDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.MonitoredDescriptorAggregate.EdFi.MonitoredDescriptorQ" lazy="false" discriminator-value="edfi.MonitoredDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="MonitoredDescriptor" >
           <key>
             <column name="MonitoredDescriptorId" />
           </key>
@@ -6090,8 +6314,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentLanguageInstructionProgramAssociationAggregate.EdFi.StudentLanguageInstructionProgramAssociationEnglishLanguageProficiencyAssessmentQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.NeglectedOrDelinquentProgramDescriptorAggregate.EdFi.NeglectedOrDelinquentProgramDescriptorQ" table="NeglectedOrDelinquentProgramDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.NeglectedOrDelinquentProgramDescriptorAggregate.EdFi.NeglectedOrDelinquentProgramDescriptorQ" lazy="false" discriminator-value="edfi.NeglectedOrDelinquentProgramDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="NeglectedOrDelinquentProgramDescriptor" >
           <key>
             <column name="NeglectedOrDelinquentProgramDescriptorId" />
           </key>
@@ -6111,8 +6337,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentNeglectedOrDelinquentProgramAssociationAggregate.EdFi.StudentNeglectedOrDelinquentProgramAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.NeglectedOrDelinquentProgramServiceDescriptorAggregate.EdFi.NeglectedOrDelinquentProgramServiceDescriptorQ" table="NeglectedOrDelinquentProgramServiceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.NeglectedOrDelinquentProgramServiceDescriptorAggregate.EdFi.NeglectedOrDelinquentProgramServiceDescriptorQ" lazy="false" discriminator-value="edfi.NeglectedOrDelinquentProgramServiceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="NeglectedOrDelinquentProgramServiceDescriptor" >
           <key>
             <column name="NeglectedOrDelinquentProgramServiceDescriptorId" />
           </key>
@@ -6132,8 +6360,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentNeglectedOrDelinquentProgramAssociationAggregate.EdFi.StudentNeglectedOrDelinquentProgramAssociationNeglectedOrDelinquentProgramServiceQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.NetworkPurposeDescriptorAggregate.EdFi.NetworkPurposeDescriptorQ" table="NetworkPurposeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.NetworkPurposeDescriptorAggregate.EdFi.NetworkPurposeDescriptorQ" lazy="false" discriminator-value="edfi.NetworkPurposeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="NetworkPurposeDescriptor" >
           <key>
             <column name="NetworkPurposeDescriptorId" />
           </key>
@@ -6153,8 +6383,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.EducationOrganizationNetworkAggregate.EdFi.EducationOrganizationNetworkQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.OldEthnicityDescriptorAggregate.EdFi.OldEthnicityDescriptorQ" table="OldEthnicityDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.OldEthnicityDescriptorAggregate.EdFi.OldEthnicityDescriptorQ" lazy="false" discriminator-value="edfi.OldEthnicityDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="OldEthnicityDescriptor" >
           <key>
             <column name="OldEthnicityDescriptorId" />
           </key>
@@ -6181,8 +6413,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.OperationalStatusDescriptorAggregate.EdFi.OperationalStatusDescriptorQ" table="OperationalStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.OperationalStatusDescriptorAggregate.EdFi.OperationalStatusDescriptorQ" lazy="false" discriminator-value="edfi.OperationalStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="OperationalStatusDescriptor" >
           <key>
             <column name="OperationalStatusDescriptorId" />
           </key>
@@ -6202,8 +6436,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.EducationOrganizationAggregate.EdFi.EducationOrganizationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.OtherNameTypeDescriptorAggregate.EdFi.OtherNameTypeDescriptorQ" table="OtherNameTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.OtherNameTypeDescriptorAggregate.EdFi.OtherNameTypeDescriptorQ" lazy="false" discriminator-value="edfi.OtherNameTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="OtherNameTypeDescriptor" >
           <key>
             <column name="OtherNameTypeDescriptorId" />
           </key>
@@ -6237,8 +6473,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAggregate.EdFi.StudentOtherNameQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ParticipationDescriptorAggregate.EdFi.ParticipationDescriptorQ" table="ParticipationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ParticipationDescriptorAggregate.EdFi.ParticipationDescriptorQ" lazy="false" discriminator-value="edfi.ParticipationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ParticipationDescriptor" >
           <key>
             <column name="ParticipationDescriptorId" />
           </key>
@@ -6258,8 +6496,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentLanguageInstructionProgramAssociationAggregate.EdFi.StudentLanguageInstructionProgramAssociationEnglishLanguageProficiencyAssessmentQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ParticipationStatusDescriptorAggregate.EdFi.ParticipationStatusDescriptorQ" table="ParticipationStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ParticipationStatusDescriptorAggregate.EdFi.ParticipationStatusDescriptorQ" lazy="false" discriminator-value="edfi.ParticipationStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ParticipationStatusDescriptor" >
           <key>
             <column name="ParticipationStatusDescriptorId" />
           </key>
@@ -6286,8 +6526,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.GeneralStudentProgramAssociationAggregate.EdFi.GeneralStudentProgramAssociationProgramParticipationStatusQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PerformanceBaseConversionDescriptorAggregate.EdFi.PerformanceBaseConversionDescriptorQ" table="PerformanceBaseConversionDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PerformanceBaseConversionDescriptorAggregate.EdFi.PerformanceBaseConversionDescriptorQ" lazy="false" discriminator-value="edfi.PerformanceBaseConversionDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PerformanceBaseConversionDescriptor" >
           <key>
             <column name="PerformanceBaseConversionDescriptorId" />
           </key>
@@ -6314,8 +6556,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.GradeAggregate.EdFi.GradeLearningStandardGradeQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PerformanceLevelDescriptorAggregate.EdFi.PerformanceLevelDescriptorQ" table="PerformanceLevelDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PerformanceLevelDescriptorAggregate.EdFi.PerformanceLevelDescriptorQ" lazy="false" discriminator-value="edfi.PerformanceLevelDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PerformanceLevelDescriptor" >
           <key>
             <column name="PerformanceLevelDescriptorId" />
           </key>
@@ -6363,8 +6607,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAssessmentAggregate.EdFi.StudentAssessmentStudentObjectiveAssessmentPerformanceLevelQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PersonalInformationVerificationDescriptorAggregate.EdFi.PersonalInformationVerificationDescriptorQ" table="PersonalInformationVerificationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PersonalInformationVerificationDescriptorAggregate.EdFi.PersonalInformationVerificationDescriptorQ" lazy="false" discriminator-value="edfi.PersonalInformationVerificationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PersonalInformationVerificationDescriptor" >
           <key>
             <column name="PersonalInformationVerificationDescriptorId" />
           </key>
@@ -6412,8 +6658,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAggregate.EdFi.StudentPersonalIdentificationDocumentQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PlatformTypeDescriptorAggregate.EdFi.PlatformTypeDescriptorQ" table="PlatformTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PlatformTypeDescriptorAggregate.EdFi.PlatformTypeDescriptorQ" lazy="false" discriminator-value="edfi.PlatformTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PlatformTypeDescriptor" >
           <key>
             <column name="PlatformTypeDescriptorId" />
           </key>
@@ -6440,8 +6688,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAssessmentAggregate.EdFi.StudentAssessmentQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PopulationServedDescriptorAggregate.EdFi.PopulationServedDescriptorQ" table="PopulationServedDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PopulationServedDescriptorAggregate.EdFi.PopulationServedDescriptorQ" lazy="false" discriminator-value="edfi.PopulationServedDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PopulationServedDescriptor" >
           <key>
             <column name="PopulationServedDescriptorId" />
           </key>
@@ -6496,8 +6746,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentInterventionAssociationAggregate.EdFi.StudentInterventionAssociationInterventionEffectivenessQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PostingResultDescriptorAggregate.EdFi.PostingResultDescriptorQ" table="PostingResultDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PostingResultDescriptorAggregate.EdFi.PostingResultDescriptorQ" lazy="false" discriminator-value="edfi.PostingResultDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PostingResultDescriptor" >
           <key>
             <column name="PostingResultDescriptorId" />
           </key>
@@ -6517,8 +6769,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.OpenStaffPositionAggregate.EdFi.OpenStaffPositionQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PostSecondaryEventCategoryDescriptorAggregate.EdFi.PostSecondaryEventCategoryDescriptorQ" table="PostSecondaryEventCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PostSecondaryEventCategoryDescriptorAggregate.EdFi.PostSecondaryEventCategoryDescriptorQ" lazy="false" discriminator-value="edfi.PostSecondaryEventCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PostSecondaryEventCategoryDescriptor" >
           <key>
             <column name="PostSecondaryEventCategoryDescriptorId" />
           </key>
@@ -6538,8 +6792,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.PostSecondaryEventAggregate.EdFi.PostSecondaryEventQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PostSecondaryInstitutionLevelDescriptorAggregate.EdFi.PostSecondaryInstitutionLevelDescriptorQ" table="PostSecondaryInstitutionLevelDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PostSecondaryInstitutionLevelDescriptorAggregate.EdFi.PostSecondaryInstitutionLevelDescriptorQ" lazy="false" discriminator-value="edfi.PostSecondaryInstitutionLevelDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PostSecondaryInstitutionLevelDescriptor" >
           <key>
             <column name="PostSecondaryInstitutionLevelDescriptorId" />
           </key>
@@ -6559,8 +6815,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.PostSecondaryInstitutionAggregate.EdFi.PostSecondaryInstitutionQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PrimaryLearningDeviceAccessDescriptorAggregate.EdFi.PrimaryLearningDeviceAccessDescriptorQ" table="PrimaryLearningDeviceAccessDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PrimaryLearningDeviceAccessDescriptorAggregate.EdFi.PrimaryLearningDeviceAccessDescriptorQ" lazy="false" discriminator-value="edfi.PrimaryLearningDeviceAccessDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PrimaryLearningDeviceAccessDescriptor" >
           <key>
             <column name="PrimaryLearningDeviceAccessDescriptorId" />
           </key>
@@ -6580,8 +6838,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PrimaryLearningDeviceAwayFromSchoolDescriptorAggregate.EdFi.PrimaryLearningDeviceAwayFromSchoolDescriptorQ" table="PrimaryLearningDeviceAwayFromSchoolDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PrimaryLearningDeviceAwayFromSchoolDescriptorAggregate.EdFi.PrimaryLearningDeviceAwayFromSchoolDescriptorQ" lazy="false" discriminator-value="edfi.PrimaryLearningDeviceAwayFromSchoolDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PrimaryLearningDeviceAwayFromSchoolDescriptor" >
           <key>
             <column name="PrimaryLearningDeviceAwayFromSchoolDescriptorId" />
           </key>
@@ -6601,8 +6861,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PrimaryLearningDeviceProviderDescriptorAggregate.EdFi.PrimaryLearningDeviceProviderDescriptorQ" table="PrimaryLearningDeviceProviderDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PrimaryLearningDeviceProviderDescriptorAggregate.EdFi.PrimaryLearningDeviceProviderDescriptorQ" lazy="false" discriminator-value="edfi.PrimaryLearningDeviceProviderDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PrimaryLearningDeviceProviderDescriptor" >
           <key>
             <column name="PrimaryLearningDeviceProviderDescriptorId" />
           </key>
@@ -6622,8 +6884,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ProficiencyDescriptorAggregate.EdFi.ProficiencyDescriptorQ" table="ProficiencyDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ProficiencyDescriptorAggregate.EdFi.ProficiencyDescriptorQ" lazy="false" discriminator-value="edfi.ProficiencyDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ProficiencyDescriptor" >
           <key>
             <column name="ProficiencyDescriptorId" />
           </key>
@@ -6643,8 +6907,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentLanguageInstructionProgramAssociationAggregate.EdFi.StudentLanguageInstructionProgramAssociationEnglishLanguageProficiencyAssessmentQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ProgramAssignmentDescriptorAggregate.EdFi.ProgramAssignmentDescriptorQ" table="ProgramAssignmentDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ProgramAssignmentDescriptorAggregate.EdFi.ProgramAssignmentDescriptorQ" lazy="false" discriminator-value="edfi.ProgramAssignmentDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ProgramAssignmentDescriptor" >
           <key>
             <column name="ProgramAssignmentDescriptorId" />
           </key>
@@ -6671,8 +6937,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StaffSchoolAssociationAggregate.EdFi.StaffSchoolAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ProgramCharacteristicDescriptorAggregate.EdFi.ProgramCharacteristicDescriptorQ" table="ProgramCharacteristicDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ProgramCharacteristicDescriptorAggregate.EdFi.ProgramCharacteristicDescriptorQ" lazy="false" discriminator-value="edfi.ProgramCharacteristicDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ProgramCharacteristicDescriptor" >
           <key>
             <column name="ProgramCharacteristicDescriptorId" />
           </key>
@@ -6699,8 +6967,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationProgramParticipationProgramCharacteristicQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ProgramSponsorDescriptorAggregate.EdFi.ProgramSponsorDescriptorQ" table="ProgramSponsorDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ProgramSponsorDescriptorAggregate.EdFi.ProgramSponsorDescriptorQ" lazy="false" discriminator-value="edfi.ProgramSponsorDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ProgramSponsorDescriptor" >
           <key>
             <column name="ProgramSponsorDescriptorId" />
           </key>
@@ -6720,8 +6990,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.ProgramAggregate.EdFi.ProgramSponsorQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ProgramTypeDescriptorAggregate.EdFi.ProgramTypeDescriptorQ" table="ProgramTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ProgramTypeDescriptorAggregate.EdFi.ProgramTypeDescriptorQ" lazy="false" discriminator-value="edfi.ProgramTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ProgramTypeDescriptor" >
           <key>
             <column name="ProgramTypeDescriptorId" />
           </key>
@@ -6748,8 +7020,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationProgramParticipationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ProgressDescriptorAggregate.EdFi.ProgressDescriptorQ" table="ProgressDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ProgressDescriptorAggregate.EdFi.ProgressDescriptorQ" lazy="false" discriminator-value="edfi.ProgressDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ProgressDescriptor" >
           <key>
             <column name="ProgressDescriptorId" />
           </key>
@@ -6769,8 +7043,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentLanguageInstructionProgramAssociationAggregate.EdFi.StudentLanguageInstructionProgramAssociationEnglishLanguageProficiencyAssessmentQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ProgressLevelDescriptorAggregate.EdFi.ProgressLevelDescriptorQ" table="ProgressLevelDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ProgressLevelDescriptorAggregate.EdFi.ProgressLevelDescriptorQ" lazy="false" discriminator-value="edfi.ProgressLevelDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ProgressLevelDescriptor" >
           <key>
             <column name="ProgressLevelDescriptorId" />
           </key>
@@ -6797,8 +7073,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentNeglectedOrDelinquentProgramAssociationAggregate.EdFi.StudentNeglectedOrDelinquentProgramAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ProviderCategoryDescriptorAggregate.EdFi.ProviderCategoryDescriptorQ" table="ProviderCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ProviderCategoryDescriptorAggregate.EdFi.ProviderCategoryDescriptorQ" lazy="false" discriminator-value="edfi.ProviderCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ProviderCategoryDescriptor" >
           <key>
             <column name="ProviderCategoryDescriptorId" />
           </key>
@@ -6818,8 +7096,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.CommunityProviderAggregate.EdFi.CommunityProviderQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ProviderProfitabilityDescriptorAggregate.EdFi.ProviderProfitabilityDescriptorQ" table="ProviderProfitabilityDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ProviderProfitabilityDescriptorAggregate.EdFi.ProviderProfitabilityDescriptorQ" lazy="false" discriminator-value="edfi.ProviderProfitabilityDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ProviderProfitabilityDescriptor" >
           <key>
             <column name="ProviderProfitabilityDescriptorId" />
           </key>
@@ -6839,8 +7119,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.CommunityProviderAggregate.EdFi.CommunityProviderQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ProviderStatusDescriptorAggregate.EdFi.ProviderStatusDescriptorQ" table="ProviderStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ProviderStatusDescriptorAggregate.EdFi.ProviderStatusDescriptorQ" lazy="false" discriminator-value="edfi.ProviderStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ProviderStatusDescriptor" >
           <key>
             <column name="ProviderStatusDescriptorId" />
           </key>
@@ -6860,8 +7142,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.CommunityProviderAggregate.EdFi.CommunityProviderQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PublicationStatusDescriptorAggregate.EdFi.PublicationStatusDescriptorQ" table="PublicationStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PublicationStatusDescriptorAggregate.EdFi.PublicationStatusDescriptorQ" lazy="false" discriminator-value="edfi.PublicationStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PublicationStatusDescriptor" >
           <key>
             <column name="PublicationStatusDescriptorId" />
           </key>
@@ -6895,8 +7179,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.LearningStandardAggregate.EdFi.LearningStandardContentStandardQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.QuestionFormDescriptorAggregate.EdFi.QuestionFormDescriptorQ" table="QuestionFormDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.QuestionFormDescriptorAggregate.EdFi.QuestionFormDescriptorQ" lazy="false" discriminator-value="edfi.QuestionFormDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="QuestionFormDescriptor" >
           <key>
             <column name="QuestionFormDescriptorId" />
           </key>
@@ -6916,8 +7202,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyQuestionAggregate.EdFi.SurveyQuestionQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.RaceDescriptorAggregate.EdFi.RaceDescriptorQ" table="RaceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.RaceDescriptorAggregate.EdFi.RaceDescriptorQ" lazy="false" discriminator-value="edfi.RaceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="RaceDescriptor" >
           <key>
             <column name="RaceDescriptorId" />
           </key>
@@ -6944,8 +7232,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationRaceQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ReasonExitedDescriptorAggregate.EdFi.ReasonExitedDescriptorQ" table="ReasonExitedDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ReasonExitedDescriptorAggregate.EdFi.ReasonExitedDescriptorQ" lazy="false" discriminator-value="edfi.ReasonExitedDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ReasonExitedDescriptor" >
           <key>
             <column name="ReasonExitedDescriptorId" />
           </key>
@@ -6965,8 +7255,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.GeneralStudentProgramAssociationAggregate.EdFi.GeneralStudentProgramAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ReasonNotTestedDescriptorAggregate.EdFi.ReasonNotTestedDescriptorQ" table="ReasonNotTestedDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ReasonNotTestedDescriptorAggregate.EdFi.ReasonNotTestedDescriptorQ" lazy="false" discriminator-value="edfi.ReasonNotTestedDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ReasonNotTestedDescriptor" >
           <key>
             <column name="ReasonNotTestedDescriptorId" />
           </key>
@@ -6986,8 +7278,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAssessmentAggregate.EdFi.StudentAssessmentQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.RecognitionTypeDescriptorAggregate.EdFi.RecognitionTypeDescriptorQ" table="RecognitionTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.RecognitionTypeDescriptorAggregate.EdFi.RecognitionTypeDescriptorQ" lazy="false" discriminator-value="edfi.RecognitionTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="RecognitionTypeDescriptor" >
           <key>
             <column name="RecognitionTypeDescriptorId" />
           </key>
@@ -7014,8 +7308,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAcademicRecordAggregate.EdFi.StudentAcademicRecordRecognitionQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.RelationDescriptorAggregate.EdFi.RelationDescriptorQ" table="RelationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.RelationDescriptorAggregate.EdFi.RelationDescriptorQ" lazy="false" discriminator-value="edfi.RelationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="RelationDescriptor" >
           <key>
             <column name="RelationDescriptorId" />
           </key>
@@ -7035,8 +7331,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentParentAssociationAggregate.EdFi.StudentParentAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.RepeatIdentifierDescriptorAggregate.EdFi.RepeatIdentifierDescriptorQ" table="RepeatIdentifierDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.RepeatIdentifierDescriptorAggregate.EdFi.RepeatIdentifierDescriptorQ" lazy="false" discriminator-value="edfi.RepeatIdentifierDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="RepeatIdentifierDescriptor" >
           <key>
             <column name="RepeatIdentifierDescriptorId" />
           </key>
@@ -7056,8 +7354,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSectionAssociationAggregate.EdFi.StudentSectionAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ReporterDescriptionDescriptorAggregate.EdFi.ReporterDescriptionDescriptorQ" table="ReporterDescriptionDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ReporterDescriptionDescriptorAggregate.EdFi.ReporterDescriptionDescriptorQ" lazy="false" discriminator-value="edfi.ReporterDescriptionDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ReporterDescriptionDescriptor" >
           <key>
             <column name="ReporterDescriptionDescriptorId" />
           </key>
@@ -7077,8 +7377,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.DisciplineIncidentAggregate.EdFi.DisciplineIncidentQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ReportingTagDescriptorAggregate.EdFi.ReportingTagDescriptorQ" table="ReportingTagDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ReportingTagDescriptorAggregate.EdFi.ReportingTagDescriptorQ" lazy="false" discriminator-value="edfi.ReportingTagDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ReportingTagDescriptor" >
           <key>
             <column name="ReportingTagDescriptorId" />
           </key>
@@ -7161,8 +7463,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.SourceDimensionAggregate.EdFi.SourceDimensionReportingTagQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ResidencyStatusDescriptorAggregate.EdFi.ResidencyStatusDescriptorQ" table="ResidencyStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ResidencyStatusDescriptorAggregate.EdFi.ResidencyStatusDescriptorQ" lazy="false" discriminator-value="edfi.ResidencyStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ResidencyStatusDescriptor" >
           <key>
             <column name="ResidencyStatusDescriptorId" />
           </key>
@@ -7182,8 +7486,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSchoolAssociationAggregate.EdFi.StudentSchoolAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ResponseIndicatorDescriptorAggregate.EdFi.ResponseIndicatorDescriptorQ" table="ResponseIndicatorDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ResponseIndicatorDescriptorAggregate.EdFi.ResponseIndicatorDescriptorQ" lazy="false" discriminator-value="edfi.ResponseIndicatorDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ResponseIndicatorDescriptor" >
           <key>
             <column name="ResponseIndicatorDescriptorId" />
           </key>
@@ -7203,8 +7509,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAssessmentAggregate.EdFi.StudentAssessmentItemQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ResponsibilityDescriptorAggregate.EdFi.ResponsibilityDescriptorQ" table="ResponsibilityDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ResponsibilityDescriptorAggregate.EdFi.ResponsibilityDescriptorQ" lazy="false" discriminator-value="edfi.ResponsibilityDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ResponsibilityDescriptor" >
           <key>
             <column name="ResponsibilityDescriptorId" />
           </key>
@@ -7224,8 +7532,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationResponsibilityAssociationAggregate.EdFi.StudentEducationOrganizationResponsibilityAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.RestraintEventReasonDescriptorAggregate.EdFi.RestraintEventReasonDescriptorQ" table="RestraintEventReasonDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.RestraintEventReasonDescriptorAggregate.EdFi.RestraintEventReasonDescriptorQ" lazy="false" discriminator-value="edfi.RestraintEventReasonDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="RestraintEventReasonDescriptor" >
           <key>
             <column name="RestraintEventReasonDescriptorId" />
           </key>
@@ -7245,8 +7555,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.RestraintEventAggregate.EdFi.RestraintEventReasonQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ResultDatatypeTypeDescriptorAggregate.EdFi.ResultDatatypeTypeDescriptorQ" table="ResultDatatypeTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ResultDatatypeTypeDescriptorAggregate.EdFi.ResultDatatypeTypeDescriptorQ" lazy="false" discriminator-value="edfi.ResultDatatypeTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ResultDatatypeTypeDescriptor" >
           <key>
             <column name="ResultDatatypeTypeDescriptorId" />
           </key>
@@ -7315,8 +7627,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAssessmentAggregate.EdFi.StudentAssessmentStudentObjectiveAssessmentScoreResultQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.RetestIndicatorDescriptorAggregate.EdFi.RetestIndicatorDescriptorQ" table="RetestIndicatorDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.RetestIndicatorDescriptorAggregate.EdFi.RetestIndicatorDescriptorQ" lazy="false" discriminator-value="edfi.RetestIndicatorDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="RetestIndicatorDescriptor" >
           <key>
             <column name="RetestIndicatorDescriptorId" />
           </key>
@@ -7336,8 +7650,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAssessmentAggregate.EdFi.StudentAssessmentQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SchoolCategoryDescriptorAggregate.EdFi.SchoolCategoryDescriptorQ" table="SchoolCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SchoolCategoryDescriptorAggregate.EdFi.SchoolCategoryDescriptorQ" lazy="false" discriminator-value="edfi.SchoolCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SchoolCategoryDescriptor" >
           <key>
             <column name="SchoolCategoryDescriptorId" />
           </key>
@@ -7357,8 +7673,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.SchoolAggregate.EdFi.SchoolCategoryQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SchoolChoiceImplementStatusDescriptorAggregate.EdFi.SchoolChoiceImplementStatusDescriptorQ" table="SchoolChoiceImplementStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SchoolChoiceImplementStatusDescriptorAggregate.EdFi.SchoolChoiceImplementStatusDescriptorQ" lazy="false" discriminator-value="edfi.SchoolChoiceImplementStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SchoolChoiceImplementStatusDescriptor" >
           <key>
             <column name="SchoolChoiceImplementStatusDescriptorId" />
           </key>
@@ -7378,8 +7696,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.LocalEducationAgencyAggregate.EdFi.LocalEducationAgencyAccountabilityQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SchoolFoodServiceProgramServiceDescriptorAggregate.EdFi.SchoolFoodServiceProgramServiceDescriptorQ" table="SchoolFoodServiceProgramServiceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SchoolFoodServiceProgramServiceDescriptorAggregate.EdFi.SchoolFoodServiceProgramServiceDescriptorQ" lazy="false" discriminator-value="edfi.SchoolFoodServiceProgramServiceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SchoolFoodServiceProgramServiceDescriptor" >
           <key>
             <column name="SchoolFoodServiceProgramServiceDescriptorId" />
           </key>
@@ -7399,8 +7719,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSchoolFoodServiceProgramAssociationAggregate.EdFi.StudentSchoolFoodServiceProgramAssociationSchoolFoodServiceProgramServiceQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SchoolTypeDescriptorAggregate.EdFi.SchoolTypeDescriptorQ" table="SchoolTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SchoolTypeDescriptorAggregate.EdFi.SchoolTypeDescriptorQ" lazy="false" discriminator-value="edfi.SchoolTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SchoolTypeDescriptor" >
           <key>
             <column name="SchoolTypeDescriptorId" />
           </key>
@@ -7420,8 +7742,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.SchoolAggregate.EdFi.SchoolQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SectionCharacteristicDescriptorAggregate.EdFi.SectionCharacteristicDescriptorQ" table="SectionCharacteristicDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SectionCharacteristicDescriptorAggregate.EdFi.SectionCharacteristicDescriptorQ" lazy="false" discriminator-value="edfi.SectionCharacteristicDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SectionCharacteristicDescriptor" >
           <key>
             <column name="SectionCharacteristicDescriptorId" />
           </key>
@@ -7441,8 +7765,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.SectionAggregate.EdFi.SectionCharacteristicQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SeparationDescriptorAggregate.EdFi.SeparationDescriptorQ" table="SeparationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SeparationDescriptorAggregate.EdFi.SeparationDescriptorQ" lazy="false" discriminator-value="edfi.SeparationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SeparationDescriptor" >
           <key>
             <column name="SeparationDescriptorId" />
           </key>
@@ -7462,8 +7788,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StaffEducationOrganizationEmploymentAssociationAggregate.EdFi.StaffEducationOrganizationEmploymentAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SeparationReasonDescriptorAggregate.EdFi.SeparationReasonDescriptorQ" table="SeparationReasonDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SeparationReasonDescriptorAggregate.EdFi.SeparationReasonDescriptorQ" lazy="false" discriminator-value="edfi.SeparationReasonDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SeparationReasonDescriptor" >
           <key>
             <column name="SeparationReasonDescriptorId" />
           </key>
@@ -7483,8 +7811,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StaffEducationOrganizationEmploymentAssociationAggregate.EdFi.StaffEducationOrganizationEmploymentAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ServiceDescriptorAggregate.EdFi.ServiceDescriptorQ" table="ServiceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ServiceDescriptorAggregate.EdFi.ServiceDescriptorQ" lazy="false" discriminator-value="edfi.ServiceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ServiceDescriptor" >
           <key>
             <column name="ServiceDescriptorId" />
           </key>
@@ -7525,8 +7855,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentTitleIPartAProgramAssociationAggregate.EdFi.StudentTitleIPartAProgramAssociationServiceQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SexDescriptorAggregate.EdFi.SexDescriptorQ" table="SexDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SexDescriptorAggregate.EdFi.SexDescriptorQ" lazy="false" discriminator-value="edfi.SexDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SexDescriptor" >
           <key>
             <column name="SexDescriptorId" />
           </key>
@@ -7595,8 +7927,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SourceSystemDescriptorAggregate.EdFi.SourceSystemDescriptorQ" table="SourceSystemDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SourceSystemDescriptorAggregate.EdFi.SourceSystemDescriptorQ" lazy="false" discriminator-value="edfi.SourceSystemDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SourceSystemDescriptor" >
           <key>
             <column name="SourceSystemDescriptorId" />
           </key>
@@ -7616,8 +7950,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.PersonAggregate.EdFi.PersonQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SpecialEducationProgramServiceDescriptorAggregate.EdFi.SpecialEducationProgramServiceDescriptorQ" table="SpecialEducationProgramServiceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SpecialEducationProgramServiceDescriptorAggregate.EdFi.SpecialEducationProgramServiceDescriptorQ" lazy="false" discriminator-value="edfi.SpecialEducationProgramServiceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SpecialEducationProgramServiceDescriptor" >
           <key>
             <column name="SpecialEducationProgramServiceDescriptorId" />
           </key>
@@ -7637,8 +7973,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSpecialEducationProgramAssociationAggregate.EdFi.StudentSpecialEducationProgramAssociationSpecialEducationProgramServiceQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SpecialEducationSettingDescriptorAggregate.EdFi.SpecialEducationSettingDescriptorQ" table="SpecialEducationSettingDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SpecialEducationSettingDescriptorAggregate.EdFi.SpecialEducationSettingDescriptorQ" lazy="false" discriminator-value="edfi.SpecialEducationSettingDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SpecialEducationSettingDescriptor" >
           <key>
             <column name="SpecialEducationSettingDescriptorId" />
           </key>
@@ -7658,8 +7996,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSpecialEducationProgramAssociationAggregate.EdFi.StudentSpecialEducationProgramAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffClassificationDescriptorAggregate.EdFi.StaffClassificationDescriptorQ" table="StaffClassificationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffClassificationDescriptorAggregate.EdFi.StaffClassificationDescriptorQ" lazy="false" discriminator-value="edfi.StaffClassificationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="StaffClassificationDescriptor" >
           <key>
             <column name="StaffClassificationDescriptorId" />
           </key>
@@ -7686,8 +8026,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StaffEducationOrganizationAssignmentAssociationAggregate.EdFi.StaffEducationOrganizationAssignmentAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffIdentificationSystemDescriptorAggregate.EdFi.StaffIdentificationSystemDescriptorQ" table="StaffIdentificationSystemDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffIdentificationSystemDescriptorAggregate.EdFi.StaffIdentificationSystemDescriptorQ" lazy="false" discriminator-value="edfi.StaffIdentificationSystemDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="StaffIdentificationSystemDescriptor" >
           <key>
             <column name="StaffIdentificationSystemDescriptorId" />
           </key>
@@ -7707,8 +8049,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StaffAggregate.EdFi.StaffIdentificationCodeQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffLeaveEventCategoryDescriptorAggregate.EdFi.StaffLeaveEventCategoryDescriptorQ" table="StaffLeaveEventCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffLeaveEventCategoryDescriptorAggregate.EdFi.StaffLeaveEventCategoryDescriptorQ" lazy="false" discriminator-value="edfi.StaffLeaveEventCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="StaffLeaveEventCategoryDescriptor" >
           <key>
             <column name="StaffLeaveEventCategoryDescriptorId" />
           </key>
@@ -7728,8 +8072,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StaffLeaveAggregate.EdFi.StaffLeaveQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.StateAbbreviationDescriptorAggregate.EdFi.StateAbbreviationDescriptorQ" table="StateAbbreviationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.StateAbbreviationDescriptorAggregate.EdFi.StateAbbreviationDescriptorQ" lazy="false" discriminator-value="edfi.StateAbbreviationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="StateAbbreviationDescriptor" >
           <key>
             <column name="StateAbbreviationDescriptorId" />
           </key>
@@ -7798,8 +8144,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationAddressQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentCharacteristicDescriptorAggregate.EdFi.StudentCharacteristicDescriptorQ" table="StudentCharacteristicDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentCharacteristicDescriptorAggregate.EdFi.StudentCharacteristicDescriptorQ" lazy="false" discriminator-value="edfi.StudentCharacteristicDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="StudentCharacteristicDescriptor" >
           <key>
             <column name="StudentCharacteristicDescriptorId" />
           </key>
@@ -7819,8 +8167,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationStudentCharacteristicQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentIdentificationSystemDescriptorAggregate.EdFi.StudentIdentificationSystemDescriptorQ" table="StudentIdentificationSystemDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentIdentificationSystemDescriptorAggregate.EdFi.StudentIdentificationSystemDescriptorQ" lazy="false" discriminator-value="edfi.StudentIdentificationSystemDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="StudentIdentificationSystemDescriptor" >
           <key>
             <column name="StudentIdentificationSystemDescriptorId" />
           </key>
@@ -7840,8 +8190,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationStudentIdentificationCodeQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentParticipationCodeDescriptorAggregate.EdFi.StudentParticipationCodeDescriptorQ" table="StudentParticipationCodeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentParticipationCodeDescriptorAggregate.EdFi.StudentParticipationCodeDescriptorQ" lazy="false" discriminator-value="edfi.StudentParticipationCodeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="StudentParticipationCodeDescriptor" >
           <key>
             <column name="StudentParticipationCodeDescriptorId" />
           </key>
@@ -7861,8 +8213,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentDisciplineIncidentAssociationAggregate.EdFi.StudentDisciplineIncidentAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SubmissionStatusDescriptorAggregate.EdFi.SubmissionStatusDescriptorQ" table="SubmissionStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SubmissionStatusDescriptorAggregate.EdFi.SubmissionStatusDescriptorQ" lazy="false" discriminator-value="edfi.SubmissionStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SubmissionStatusDescriptor" >
           <key>
             <column name="SubmissionStatusDescriptorId" />
           </key>
@@ -7882,8 +8236,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentGradebookEntryAggregate.EdFi.StudentGradebookEntryQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyCategoryDescriptorAggregate.EdFi.SurveyCategoryDescriptorQ" table="SurveyCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyCategoryDescriptorAggregate.EdFi.SurveyCategoryDescriptorQ" lazy="false" discriminator-value="edfi.SurveyCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SurveyCategoryDescriptor" >
           <key>
             <column name="SurveyCategoryDescriptorId" />
           </key>
@@ -7903,8 +8259,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyAggregate.EdFi.SurveyQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyLevelDescriptorAggregate.EdFi.SurveyLevelDescriptorQ" table="SurveyLevelDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyLevelDescriptorAggregate.EdFi.SurveyLevelDescriptorQ" lazy="false" discriminator-value="edfi.SurveyLevelDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SurveyLevelDescriptor" >
           <key>
             <column name="SurveyLevelDescriptorId" />
           </key>
@@ -7924,8 +8282,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyResponseAggregate.EdFi.SurveyResponseSurveyLevelQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.TeachingCredentialBasisDescriptorAggregate.EdFi.TeachingCredentialBasisDescriptorQ" table="TeachingCredentialBasisDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.TeachingCredentialBasisDescriptorAggregate.EdFi.TeachingCredentialBasisDescriptorQ" lazy="false" discriminator-value="edfi.TeachingCredentialBasisDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="TeachingCredentialBasisDescriptor" >
           <key>
             <column name="TeachingCredentialBasisDescriptorId" />
           </key>
@@ -7945,8 +8305,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.CredentialAggregate.EdFi.CredentialQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.TeachingCredentialDescriptorAggregate.EdFi.TeachingCredentialDescriptorQ" table="TeachingCredentialDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.TeachingCredentialDescriptorAggregate.EdFi.TeachingCredentialDescriptorQ" lazy="false" discriminator-value="edfi.TeachingCredentialDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="TeachingCredentialDescriptor" >
           <key>
             <column name="TeachingCredentialDescriptorId" />
           </key>
@@ -7966,8 +8328,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.CredentialAggregate.EdFi.CredentialQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.TechnicalSkillsAssessmentDescriptorAggregate.EdFi.TechnicalSkillsAssessmentDescriptorQ" table="TechnicalSkillsAssessmentDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.TechnicalSkillsAssessmentDescriptorAggregate.EdFi.TechnicalSkillsAssessmentDescriptorQ" lazy="false" discriminator-value="edfi.TechnicalSkillsAssessmentDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="TechnicalSkillsAssessmentDescriptor" >
           <key>
             <column name="TechnicalSkillsAssessmentDescriptorId" />
           </key>
@@ -7987,8 +8351,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentCTEProgramAssociationAggregate.EdFi.StudentCTEProgramAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.TelephoneNumberTypeDescriptorAggregate.EdFi.TelephoneNumberTypeDescriptorQ" table="TelephoneNumberTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.TelephoneNumberTypeDescriptorAggregate.EdFi.TelephoneNumberTypeDescriptorQ" lazy="false" discriminator-value="edfi.TelephoneNumberTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="TelephoneNumberTypeDescriptor" >
           <key>
             <column name="TelephoneNumberTypeDescriptorId" />
           </key>
@@ -8029,8 +8395,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationTelephoneQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.TermDescriptorAggregate.EdFi.TermDescriptorQ" table="TermDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.TermDescriptorAggregate.EdFi.TermDescriptorQ" lazy="false" discriminator-value="edfi.TermDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="TermDescriptor" >
           <key>
             <column name="TermDescriptorId" />
           </key>
@@ -8064,8 +8432,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationCohortYearQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.TitleIPartAParticipantDescriptorAggregate.EdFi.TitleIPartAParticipantDescriptorQ" table="TitleIPartAParticipantDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.TitleIPartAParticipantDescriptorAggregate.EdFi.TitleIPartAParticipantDescriptorQ" lazy="false" discriminator-value="edfi.TitleIPartAParticipantDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="TitleIPartAParticipantDescriptor" >
           <key>
             <column name="TitleIPartAParticipantDescriptorId" />
           </key>
@@ -8085,8 +8455,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentTitleIPartAProgramAssociationAggregate.EdFi.StudentTitleIPartAProgramAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.TitleIPartAProgramServiceDescriptorAggregate.EdFi.TitleIPartAProgramServiceDescriptorQ" table="TitleIPartAProgramServiceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.TitleIPartAProgramServiceDescriptorAggregate.EdFi.TitleIPartAProgramServiceDescriptorQ" lazy="false" discriminator-value="edfi.TitleIPartAProgramServiceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="TitleIPartAProgramServiceDescriptor" >
           <key>
             <column name="TitleIPartAProgramServiceDescriptorId" />
           </key>
@@ -8106,8 +8478,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentTitleIPartAProgramAssociationAggregate.EdFi.StudentTitleIPartAProgramAssociationTitleIPartAProgramServiceQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.TitleIPartASchoolDesignationDescriptorAggregate.EdFi.TitleIPartASchoolDesignationDescriptorQ" table="TitleIPartASchoolDesignationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.TitleIPartASchoolDesignationDescriptorAggregate.EdFi.TitleIPartASchoolDesignationDescriptorQ" lazy="false" discriminator-value="edfi.TitleIPartASchoolDesignationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="TitleIPartASchoolDesignationDescriptor" >
           <key>
             <column name="TitleIPartASchoolDesignationDescriptorId" />
           </key>
@@ -8127,8 +8501,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.SchoolAggregate.EdFi.SchoolQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.TribalAffiliationDescriptorAggregate.EdFi.TribalAffiliationDescriptorQ" table="TribalAffiliationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.TribalAffiliationDescriptorAggregate.EdFi.TribalAffiliationDescriptorQ" lazy="false" discriminator-value="edfi.TribalAffiliationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="TribalAffiliationDescriptor" >
           <key>
             <column name="TribalAffiliationDescriptorId" />
           </key>
@@ -8155,8 +8531,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationTribalAffiliationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.VisaDescriptorAggregate.EdFi.VisaDescriptorQ" table="VisaDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.VisaDescriptorAggregate.EdFi.VisaDescriptorQ" lazy="false" discriminator-value="edfi.VisaDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="VisaDescriptor" >
           <key>
             <column name="VisaDescriptorId" />
           </key>
@@ -8183,8 +8561,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAggregate.EdFi.StudentVisaQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.WeaponDescriptorAggregate.EdFi.WeaponDescriptorQ" table="WeaponDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.WeaponDescriptorAggregate.EdFi.WeaponDescriptorQ" lazy="false" discriminator-value="edfi.WeaponDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="WeaponDescriptor" >
           <key>
             <column name="WeaponDescriptorId" />
           </key>
@@ -8204,7 +8584,8 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.DisciplineIncidentAggregate.EdFi.DisciplineIncidentWeaponQ" />
           </set>
 
-      </joined-subclass>
+      </join>
+    </subclass>
 </class>
 
 
diff --git a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/4.0.0/DataStandard_400_ApprovalTests.Verify.Standard_Std_4.0.0_Models_Entities_EntitiesForQueries.generated.approved.cs b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/4.0.0/DataStandard_400_ApprovalTests.Verify.Standard_Std_4.0.0_Models_Entities_EntitiesForQueries.generated.approved.cs
index e81e8d8ec8..f73eab61fa 100644
--- a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/4.0.0/DataStandard_400_ApprovalTests.Verify.Standard_Std_4.0.0_Models_Entities_EntitiesForQueries.generated.approved.cs
+++ b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/4.0.0/DataStandard_400_ApprovalTests.Verify.Standard_Std_4.0.0_Models_Entities_EntitiesForQueries.generated.approved.cs
@@ -5489,6 +5489,12 @@ public abstract class DescriptorQ : AggregateRootWithCompositeKey
         public virtual int DescriptorId { get; set; }
         // -------------------------------------------------------------
 
+        // =============================================================
+        //                          Discriminator
+        // -------------------------------------------------------------
+
+        public virtual string Discriminator { get; set; }
+
         // =============================================================
         //                          Properties
         // -------------------------------------------------------------
diff --git a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/4.0.0/DataStandard_400_ApprovalTests.Verify.Standard_Std_4.0.0_Resources_Resources.generated.approved.cs b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/4.0.0/DataStandard_400_ApprovalTests.Verify.Standard_Std_4.0.0_Resources_Resources.generated.approved.cs
index aa7e57ab16..411149e822 100644
--- a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/4.0.0/DataStandard_400_ApprovalTests.Verify.Standard_Std_4.0.0_Resources_Resources.generated.approved.cs
+++ b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/4.0.0/DataStandard_400_ApprovalTests.Verify.Standard_Std_4.0.0_Resources_Resources.generated.approved.cs
@@ -41627,6 +41627,12 @@ public class DescriptorReference : IResourceReference
         /// </summary>
         public Guid ResourceId { get; set; }
 
+        /// <summary>
+        /// Gets or sets the discriminator value which identifies the concrete sub-type of the referenced resource
+        /// when the referenced resource has been derived; otherwise <b>null</b>.
+        /// </summary>
+        public string Discriminator { get; set; }
+
 
         private Link _link;
 
@@ -41672,7 +41678,26 @@ private Link CreateLink()
                 Href = $"/ed-fi/descriptors/{ResourceId:n}"
             };
 
-            return link;
+            if (string.IsNullOrEmpty(Discriminator))
+                return link;
+
+            string[] linkParts = Discriminator.Split('.');
+
+            if (linkParts.Length < 2)
+                return link;
+
+            var resource = GeneratedArtifactStaticDependencies.ResourceModelProvider.GetResourceModel()
+                .GetResourceByFullName(new FullName(linkParts[0], linkParts[1]));
+
+            // return the default link if the relationship is already correct, and/or if the resource is not found.
+            if (resource == null || link.Rel == resource.Name)
+                return link;
+
+            return new Link
+            {
+                Rel = resource.Name,
+                Href = $"/{resource.SchemaUriSegment()}/{resource.PluralName.ToCamelCase()}/{ResourceId:n}"
+            };
         }
     } // Aggregate reference
 
diff --git a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/5.1.0/DataStandard_510_ApprovalTests.Verify.Standard_Std_5.1.0_EntityOrmMappings_MsSql_EntityOrmMappings.generated.hbm.approved.xml b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/5.1.0/DataStandard_510_ApprovalTests.Verify.Standard_Std_5.1.0_EntityOrmMappings_MsSql_EntityOrmMappings.generated.hbm.approved.xml
index 926bf7c9bc..ad3d7561fc 100644
--- a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/5.1.0/DataStandard_510_ApprovalTests.Verify.Standard_Std_5.1.0_EntityOrmMappings_MsSql_EntityOrmMappings.generated.hbm.approved.xml
+++ b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/5.1.0/DataStandard_510_ApprovalTests.Verify.Standard_Std_5.1.0_EntityOrmMappings_MsSql_EntityOrmMappings.generated.hbm.approved.xml
@@ -3091,12 +3091,13 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.DescriptorAggregate.EdFi.Descriptor" table="Descriptor" lazy="false" abstract="true">
+  <class name="EdFi.Ods.Entities.NHibernate.DescriptorAggregate.EdFi.Descriptor" table="Descriptor" lazy="false" abstract="true" discriminator-value="NULL">
     <id name="DescriptorId" column="DescriptorId" type="int">
       <generator class="identity" />
     </id>
 
     <!-- Discriminator -->
+    <discriminator column="Discriminator" type="string" />
 
     <!-- Optimistic locking for aggregate root -->
     <version name="LastModifiedDate" column="LastModifiedDate" type="UtcDateTime" />
@@ -3121,7 +3122,8 @@
 
     <!-- Collections -->
     <!-- Derived classes -->
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.AbsenceEventCategoryDescriptorAggregate.EdFi.AbsenceEventCategoryDescriptor" table="AbsenceEventCategoryDescriptor" lazy="false">
+    <subclass name="EdFi.Ods.Entities.NHibernate.AbsenceEventCategoryDescriptorAggregate.EdFi.AbsenceEventCategoryDescriptor" lazy="false" discriminator-value="edfi.AbsenceEventCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AbsenceEventCategoryDescriptor" >
           <key>
             <column name="AbsenceEventCategoryDescriptorId" />
           </key>
@@ -3134,8 +3136,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.AcademicHonorCategoryDescriptorAggregate.EdFi.AcademicHonorCategoryDescriptor" table="AcademicHonorCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.AcademicHonorCategoryDescriptorAggregate.EdFi.AcademicHonorCategoryDescriptor" lazy="false" discriminator-value="edfi.AcademicHonorCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AcademicHonorCategoryDescriptor" >
           <key>
             <column name="AcademicHonorCategoryDescriptorId" />
           </key>
@@ -3148,8 +3152,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.AcademicSubjectDescriptorAggregate.EdFi.AcademicSubjectDescriptor" table="AcademicSubjectDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.AcademicSubjectDescriptorAggregate.EdFi.AcademicSubjectDescriptor" lazy="false" discriminator-value="edfi.AcademicSubjectDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AcademicSubjectDescriptor" >
           <key>
             <column name="AcademicSubjectDescriptorId" />
           </key>
@@ -3162,8 +3168,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.AccommodationDescriptorAggregate.EdFi.AccommodationDescriptor" table="AccommodationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.AccommodationDescriptorAggregate.EdFi.AccommodationDescriptor" lazy="false" discriminator-value="edfi.AccommodationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AccommodationDescriptor" >
           <key>
             <column name="AccommodationDescriptorId" />
           </key>
@@ -3176,8 +3184,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.AccountTypeDescriptorAggregate.EdFi.AccountTypeDescriptor" table="AccountTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.AccountTypeDescriptorAggregate.EdFi.AccountTypeDescriptor" lazy="false" discriminator-value="edfi.AccountTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AccountTypeDescriptor" >
           <key>
             <column name="AccountTypeDescriptorId" />
           </key>
@@ -3190,8 +3200,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.AchievementCategoryDescriptorAggregate.EdFi.AchievementCategoryDescriptor" table="AchievementCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.AchievementCategoryDescriptorAggregate.EdFi.AchievementCategoryDescriptor" lazy="false" discriminator-value="edfi.AchievementCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AchievementCategoryDescriptor" >
           <key>
             <column name="AchievementCategoryDescriptorId" />
           </key>
@@ -3204,8 +3216,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.AdditionalCreditTypeDescriptorAggregate.EdFi.AdditionalCreditTypeDescriptor" table="AdditionalCreditTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.AdditionalCreditTypeDescriptorAggregate.EdFi.AdditionalCreditTypeDescriptor" lazy="false" discriminator-value="edfi.AdditionalCreditTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AdditionalCreditTypeDescriptor" >
           <key>
             <column name="AdditionalCreditTypeDescriptorId" />
           </key>
@@ -3218,8 +3232,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.AddressTypeDescriptorAggregate.EdFi.AddressTypeDescriptor" table="AddressTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.AddressTypeDescriptorAggregate.EdFi.AddressTypeDescriptor" lazy="false" discriminator-value="edfi.AddressTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AddressTypeDescriptor" >
           <key>
             <column name="AddressTypeDescriptorId" />
           </key>
@@ -3232,8 +3248,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.AdministrationEnvironmentDescriptorAggregate.EdFi.AdministrationEnvironmentDescriptor" table="AdministrationEnvironmentDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.AdministrationEnvironmentDescriptorAggregate.EdFi.AdministrationEnvironmentDescriptor" lazy="false" discriminator-value="edfi.AdministrationEnvironmentDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AdministrationEnvironmentDescriptor" >
           <key>
             <column name="AdministrationEnvironmentDescriptorId" />
           </key>
@@ -3246,8 +3264,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.AdministrativeFundingControlDescriptorAggregate.EdFi.AdministrativeFundingControlDescriptor" table="AdministrativeFundingControlDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.AdministrativeFundingControlDescriptorAggregate.EdFi.AdministrativeFundingControlDescriptor" lazy="false" discriminator-value="edfi.AdministrativeFundingControlDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AdministrativeFundingControlDescriptor" >
           <key>
             <column name="AdministrativeFundingControlDescriptorId" />
           </key>
@@ -3260,8 +3280,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.AncestryEthnicOriginDescriptorAggregate.EdFi.AncestryEthnicOriginDescriptor" table="AncestryEthnicOriginDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.AncestryEthnicOriginDescriptorAggregate.EdFi.AncestryEthnicOriginDescriptor" lazy="false" discriminator-value="edfi.AncestryEthnicOriginDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AncestryEthnicOriginDescriptor" >
           <key>
             <column name="AncestryEthnicOriginDescriptorId" />
           </key>
@@ -3274,8 +3296,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.AssessmentCategoryDescriptorAggregate.EdFi.AssessmentCategoryDescriptor" table="AssessmentCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.AssessmentCategoryDescriptorAggregate.EdFi.AssessmentCategoryDescriptor" lazy="false" discriminator-value="edfi.AssessmentCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AssessmentCategoryDescriptor" >
           <key>
             <column name="AssessmentCategoryDescriptorId" />
           </key>
@@ -3288,8 +3312,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.AssessmentIdentificationSystemDescriptorAggregate.EdFi.AssessmentIdentificationSystemDescriptor" table="AssessmentIdentificationSystemDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.AssessmentIdentificationSystemDescriptorAggregate.EdFi.AssessmentIdentificationSystemDescriptor" lazy="false" discriminator-value="edfi.AssessmentIdentificationSystemDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AssessmentIdentificationSystemDescriptor" >
           <key>
             <column name="AssessmentIdentificationSystemDescriptorId" />
           </key>
@@ -3302,8 +3328,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.AssessmentItemCategoryDescriptorAggregate.EdFi.AssessmentItemCategoryDescriptor" table="AssessmentItemCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.AssessmentItemCategoryDescriptorAggregate.EdFi.AssessmentItemCategoryDescriptor" lazy="false" discriminator-value="edfi.AssessmentItemCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AssessmentItemCategoryDescriptor" >
           <key>
             <column name="AssessmentItemCategoryDescriptorId" />
           </key>
@@ -3316,8 +3344,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.AssessmentItemResultDescriptorAggregate.EdFi.AssessmentItemResultDescriptor" table="AssessmentItemResultDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.AssessmentItemResultDescriptorAggregate.EdFi.AssessmentItemResultDescriptor" lazy="false" discriminator-value="edfi.AssessmentItemResultDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AssessmentItemResultDescriptor" >
           <key>
             <column name="AssessmentItemResultDescriptorId" />
           </key>
@@ -3330,8 +3360,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.AssessmentPeriodDescriptorAggregate.EdFi.AssessmentPeriodDescriptor" table="AssessmentPeriodDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.AssessmentPeriodDescriptorAggregate.EdFi.AssessmentPeriodDescriptor" lazy="false" discriminator-value="edfi.AssessmentPeriodDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AssessmentPeriodDescriptor" >
           <key>
             <column name="AssessmentPeriodDescriptorId" />
           </key>
@@ -3344,8 +3376,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.AssessmentReportingMethodDescriptorAggregate.EdFi.AssessmentReportingMethodDescriptor" table="AssessmentReportingMethodDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.AssessmentReportingMethodDescriptorAggregate.EdFi.AssessmentReportingMethodDescriptor" lazy="false" discriminator-value="edfi.AssessmentReportingMethodDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AssessmentReportingMethodDescriptor" >
           <key>
             <column name="AssessmentReportingMethodDescriptorId" />
           </key>
@@ -3358,8 +3392,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.AssignmentLateStatusDescriptorAggregate.EdFi.AssignmentLateStatusDescriptor" table="AssignmentLateStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.AssignmentLateStatusDescriptorAggregate.EdFi.AssignmentLateStatusDescriptor" lazy="false" discriminator-value="edfi.AssignmentLateStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AssignmentLateStatusDescriptor" >
           <key>
             <column name="AssignmentLateStatusDescriptorId" />
           </key>
@@ -3372,8 +3408,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.AttemptStatusDescriptorAggregate.EdFi.AttemptStatusDescriptor" table="AttemptStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.AttemptStatusDescriptorAggregate.EdFi.AttemptStatusDescriptor" lazy="false" discriminator-value="edfi.AttemptStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AttemptStatusDescriptor" >
           <key>
             <column name="AttemptStatusDescriptorId" />
           </key>
@@ -3386,8 +3424,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.AttendanceEventCategoryDescriptorAggregate.EdFi.AttendanceEventCategoryDescriptor" table="AttendanceEventCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.AttendanceEventCategoryDescriptorAggregate.EdFi.AttendanceEventCategoryDescriptor" lazy="false" discriminator-value="edfi.AttendanceEventCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AttendanceEventCategoryDescriptor" >
           <key>
             <column name="AttendanceEventCategoryDescriptorId" />
           </key>
@@ -3400,8 +3440,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.BarrierToInternetAccessInResidenceDescriptorAggregate.EdFi.BarrierToInternetAccessInResidenceDescriptor" table="BarrierToInternetAccessInResidenceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.BarrierToInternetAccessInResidenceDescriptorAggregate.EdFi.BarrierToInternetAccessInResidenceDescriptor" lazy="false" discriminator-value="edfi.BarrierToInternetAccessInResidenceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="BarrierToInternetAccessInResidenceDescriptor" >
           <key>
             <column name="BarrierToInternetAccessInResidenceDescriptorId" />
           </key>
@@ -3414,8 +3456,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.BehaviorDescriptorAggregate.EdFi.BehaviorDescriptor" table="BehaviorDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.BehaviorDescriptorAggregate.EdFi.BehaviorDescriptor" lazy="false" discriminator-value="edfi.BehaviorDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="BehaviorDescriptor" >
           <key>
             <column name="BehaviorDescriptorId" />
           </key>
@@ -3428,8 +3472,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.BusRouteDescriptorAggregate.EdFi.BusRouteDescriptor" table="BusRouteDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.BusRouteDescriptorAggregate.EdFi.BusRouteDescriptor" lazy="false" discriminator-value="edfi.BusRouteDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="BusRouteDescriptor" >
           <key>
             <column name="BusRouteDescriptorId" />
           </key>
@@ -3442,8 +3488,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CalendarEventDescriptorAggregate.EdFi.CalendarEventDescriptor" table="CalendarEventDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CalendarEventDescriptorAggregate.EdFi.CalendarEventDescriptor" lazy="false" discriminator-value="edfi.CalendarEventDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CalendarEventDescriptor" >
           <key>
             <column name="CalendarEventDescriptorId" />
           </key>
@@ -3456,8 +3504,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CalendarTypeDescriptorAggregate.EdFi.CalendarTypeDescriptor" table="CalendarTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CalendarTypeDescriptorAggregate.EdFi.CalendarTypeDescriptor" lazy="false" discriminator-value="edfi.CalendarTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CalendarTypeDescriptor" >
           <key>
             <column name="CalendarTypeDescriptorId" />
           </key>
@@ -3470,8 +3520,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CareerPathwayDescriptorAggregate.EdFi.CareerPathwayDescriptor" table="CareerPathwayDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CareerPathwayDescriptorAggregate.EdFi.CareerPathwayDescriptor" lazy="false" discriminator-value="edfi.CareerPathwayDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CareerPathwayDescriptor" >
           <key>
             <column name="CareerPathwayDescriptorId" />
           </key>
@@ -3484,8 +3536,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CharterApprovalAgencyTypeDescriptorAggregate.EdFi.CharterApprovalAgencyTypeDescriptor" table="CharterApprovalAgencyTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CharterApprovalAgencyTypeDescriptorAggregate.EdFi.CharterApprovalAgencyTypeDescriptor" lazy="false" discriminator-value="edfi.CharterApprovalAgencyTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CharterApprovalAgencyTypeDescriptor" >
           <key>
             <column name="CharterApprovalAgencyTypeDescriptorId" />
           </key>
@@ -3498,8 +3552,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CharterStatusDescriptorAggregate.EdFi.CharterStatusDescriptor" table="CharterStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CharterStatusDescriptorAggregate.EdFi.CharterStatusDescriptor" lazy="false" discriminator-value="edfi.CharterStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CharterStatusDescriptor" >
           <key>
             <column name="CharterStatusDescriptorId" />
           </key>
@@ -3512,8 +3568,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CitizenshipStatusDescriptorAggregate.EdFi.CitizenshipStatusDescriptor" table="CitizenshipStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CitizenshipStatusDescriptorAggregate.EdFi.CitizenshipStatusDescriptor" lazy="false" discriminator-value="edfi.CitizenshipStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CitizenshipStatusDescriptor" >
           <key>
             <column name="CitizenshipStatusDescriptorId" />
           </key>
@@ -3526,8 +3584,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ClassroomPositionDescriptorAggregate.EdFi.ClassroomPositionDescriptor" table="ClassroomPositionDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ClassroomPositionDescriptorAggregate.EdFi.ClassroomPositionDescriptor" lazy="false" discriminator-value="edfi.ClassroomPositionDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ClassroomPositionDescriptor" >
           <key>
             <column name="ClassroomPositionDescriptorId" />
           </key>
@@ -3540,8 +3600,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CohortScopeDescriptorAggregate.EdFi.CohortScopeDescriptor" table="CohortScopeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CohortScopeDescriptorAggregate.EdFi.CohortScopeDescriptor" lazy="false" discriminator-value="edfi.CohortScopeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CohortScopeDescriptor" >
           <key>
             <column name="CohortScopeDescriptorId" />
           </key>
@@ -3554,8 +3616,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CohortTypeDescriptorAggregate.EdFi.CohortTypeDescriptor" table="CohortTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CohortTypeDescriptorAggregate.EdFi.CohortTypeDescriptor" lazy="false" discriminator-value="edfi.CohortTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CohortTypeDescriptor" >
           <key>
             <column name="CohortTypeDescriptorId" />
           </key>
@@ -3568,8 +3632,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CohortYearTypeDescriptorAggregate.EdFi.CohortYearTypeDescriptor" table="CohortYearTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CohortYearTypeDescriptorAggregate.EdFi.CohortYearTypeDescriptor" lazy="false" discriminator-value="edfi.CohortYearTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CohortYearTypeDescriptor" >
           <key>
             <column name="CohortYearTypeDescriptorId" />
           </key>
@@ -3582,8 +3648,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CompetencyLevelDescriptorAggregate.EdFi.CompetencyLevelDescriptor" table="CompetencyLevelDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CompetencyLevelDescriptorAggregate.EdFi.CompetencyLevelDescriptor" lazy="false" discriminator-value="edfi.CompetencyLevelDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CompetencyLevelDescriptor" >
           <key>
             <column name="CompetencyLevelDescriptorId" />
           </key>
@@ -3596,8 +3664,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ContactTypeDescriptorAggregate.EdFi.ContactTypeDescriptor" table="ContactTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ContactTypeDescriptorAggregate.EdFi.ContactTypeDescriptor" lazy="false" discriminator-value="edfi.ContactTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ContactTypeDescriptor" >
           <key>
             <column name="ContactTypeDescriptorId" />
           </key>
@@ -3610,8 +3680,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ContentClassDescriptorAggregate.EdFi.ContentClassDescriptor" table="ContentClassDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ContentClassDescriptorAggregate.EdFi.ContentClassDescriptor" lazy="false" discriminator-value="edfi.ContentClassDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ContentClassDescriptor" >
           <key>
             <column name="ContentClassDescriptorId" />
           </key>
@@ -3624,8 +3696,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ContinuationOfServicesReasonDescriptorAggregate.EdFi.ContinuationOfServicesReasonDescriptor" table="ContinuationOfServicesReasonDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ContinuationOfServicesReasonDescriptorAggregate.EdFi.ContinuationOfServicesReasonDescriptor" lazy="false" discriminator-value="edfi.ContinuationOfServicesReasonDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ContinuationOfServicesReasonDescriptor" >
           <key>
             <column name="ContinuationOfServicesReasonDescriptorId" />
           </key>
@@ -3638,8 +3712,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CostRateDescriptorAggregate.EdFi.CostRateDescriptor" table="CostRateDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CostRateDescriptorAggregate.EdFi.CostRateDescriptor" lazy="false" discriminator-value="edfi.CostRateDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CostRateDescriptor" >
           <key>
             <column name="CostRateDescriptorId" />
           </key>
@@ -3652,8 +3728,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CountryDescriptorAggregate.EdFi.CountryDescriptor" table="CountryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CountryDescriptorAggregate.EdFi.CountryDescriptor" lazy="false" discriminator-value="edfi.CountryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CountryDescriptor" >
           <key>
             <column name="CountryDescriptorId" />
           </key>
@@ -3666,8 +3744,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CourseAttemptResultDescriptorAggregate.EdFi.CourseAttemptResultDescriptor" table="CourseAttemptResultDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CourseAttemptResultDescriptorAggregate.EdFi.CourseAttemptResultDescriptor" lazy="false" discriminator-value="edfi.CourseAttemptResultDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CourseAttemptResultDescriptor" >
           <key>
             <column name="CourseAttemptResultDescriptorId" />
           </key>
@@ -3680,8 +3760,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CourseDefinedByDescriptorAggregate.EdFi.CourseDefinedByDescriptor" table="CourseDefinedByDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CourseDefinedByDescriptorAggregate.EdFi.CourseDefinedByDescriptor" lazy="false" discriminator-value="edfi.CourseDefinedByDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CourseDefinedByDescriptor" >
           <key>
             <column name="CourseDefinedByDescriptorId" />
           </key>
@@ -3694,8 +3776,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CourseGPAApplicabilityDescriptorAggregate.EdFi.CourseGPAApplicabilityDescriptor" table="CourseGPAApplicabilityDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CourseGPAApplicabilityDescriptorAggregate.EdFi.CourseGPAApplicabilityDescriptor" lazy="false" discriminator-value="edfi.CourseGPAApplicabilityDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CourseGPAApplicabilityDescriptor" >
           <key>
             <column name="CourseGPAApplicabilityDescriptorId" />
           </key>
@@ -3708,8 +3792,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CourseIdentificationSystemDescriptorAggregate.EdFi.CourseIdentificationSystemDescriptor" table="CourseIdentificationSystemDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CourseIdentificationSystemDescriptorAggregate.EdFi.CourseIdentificationSystemDescriptor" lazy="false" discriminator-value="edfi.CourseIdentificationSystemDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CourseIdentificationSystemDescriptor" >
           <key>
             <column name="CourseIdentificationSystemDescriptorId" />
           </key>
@@ -3722,8 +3808,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CourseLevelCharacteristicDescriptorAggregate.EdFi.CourseLevelCharacteristicDescriptor" table="CourseLevelCharacteristicDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CourseLevelCharacteristicDescriptorAggregate.EdFi.CourseLevelCharacteristicDescriptor" lazy="false" discriminator-value="edfi.CourseLevelCharacteristicDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CourseLevelCharacteristicDescriptor" >
           <key>
             <column name="CourseLevelCharacteristicDescriptorId" />
           </key>
@@ -3736,8 +3824,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CourseRepeatCodeDescriptorAggregate.EdFi.CourseRepeatCodeDescriptor" table="CourseRepeatCodeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CourseRepeatCodeDescriptorAggregate.EdFi.CourseRepeatCodeDescriptor" lazy="false" discriminator-value="edfi.CourseRepeatCodeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CourseRepeatCodeDescriptor" >
           <key>
             <column name="CourseRepeatCodeDescriptorId" />
           </key>
@@ -3750,8 +3840,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CredentialFieldDescriptorAggregate.EdFi.CredentialFieldDescriptor" table="CredentialFieldDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CredentialFieldDescriptorAggregate.EdFi.CredentialFieldDescriptor" lazy="false" discriminator-value="edfi.CredentialFieldDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CredentialFieldDescriptor" >
           <key>
             <column name="CredentialFieldDescriptorId" />
           </key>
@@ -3764,8 +3856,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CredentialTypeDescriptorAggregate.EdFi.CredentialTypeDescriptor" table="CredentialTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CredentialTypeDescriptorAggregate.EdFi.CredentialTypeDescriptor" lazy="false" discriminator-value="edfi.CredentialTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CredentialTypeDescriptor" >
           <key>
             <column name="CredentialTypeDescriptorId" />
           </key>
@@ -3778,8 +3872,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CreditCategoryDescriptorAggregate.EdFi.CreditCategoryDescriptor" table="CreditCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CreditCategoryDescriptorAggregate.EdFi.CreditCategoryDescriptor" lazy="false" discriminator-value="edfi.CreditCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CreditCategoryDescriptor" >
           <key>
             <column name="CreditCategoryDescriptorId" />
           </key>
@@ -3792,8 +3888,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CreditTypeDescriptorAggregate.EdFi.CreditTypeDescriptor" table="CreditTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CreditTypeDescriptorAggregate.EdFi.CreditTypeDescriptor" lazy="false" discriminator-value="edfi.CreditTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CreditTypeDescriptor" >
           <key>
             <column name="CreditTypeDescriptorId" />
           </key>
@@ -3806,8 +3904,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CrisisTypeDescriptorAggregate.EdFi.CrisisTypeDescriptor" table="CrisisTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CrisisTypeDescriptorAggregate.EdFi.CrisisTypeDescriptor" lazy="false" discriminator-value="edfi.CrisisTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CrisisTypeDescriptor" >
           <key>
             <column name="CrisisTypeDescriptorId" />
           </key>
@@ -3820,8 +3920,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CTEProgramServiceDescriptorAggregate.EdFi.CTEProgramServiceDescriptor" table="CTEProgramServiceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CTEProgramServiceDescriptorAggregate.EdFi.CTEProgramServiceDescriptor" lazy="false" discriminator-value="edfi.CTEProgramServiceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CTEProgramServiceDescriptor" >
           <key>
             <column name="CTEProgramServiceDescriptorId" />
           </key>
@@ -3834,8 +3936,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CurriculumUsedDescriptorAggregate.EdFi.CurriculumUsedDescriptor" table="CurriculumUsedDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CurriculumUsedDescriptorAggregate.EdFi.CurriculumUsedDescriptor" lazy="false" discriminator-value="edfi.CurriculumUsedDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CurriculumUsedDescriptor" >
           <key>
             <column name="CurriculumUsedDescriptorId" />
           </key>
@@ -3848,8 +3952,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.DeliveryMethodDescriptorAggregate.EdFi.DeliveryMethodDescriptor" table="DeliveryMethodDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.DeliveryMethodDescriptorAggregate.EdFi.DeliveryMethodDescriptor" lazy="false" discriminator-value="edfi.DeliveryMethodDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="DeliveryMethodDescriptor" >
           <key>
             <column name="DeliveryMethodDescriptorId" />
           </key>
@@ -3862,8 +3968,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.DiagnosisDescriptorAggregate.EdFi.DiagnosisDescriptor" table="DiagnosisDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.DiagnosisDescriptorAggregate.EdFi.DiagnosisDescriptor" lazy="false" discriminator-value="edfi.DiagnosisDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="DiagnosisDescriptor" >
           <key>
             <column name="DiagnosisDescriptorId" />
           </key>
@@ -3876,8 +3984,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.DiplomaLevelDescriptorAggregate.EdFi.DiplomaLevelDescriptor" table="DiplomaLevelDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.DiplomaLevelDescriptorAggregate.EdFi.DiplomaLevelDescriptor" lazy="false" discriminator-value="edfi.DiplomaLevelDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="DiplomaLevelDescriptor" >
           <key>
             <column name="DiplomaLevelDescriptorId" />
           </key>
@@ -3890,8 +4000,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.DiplomaTypeDescriptorAggregate.EdFi.DiplomaTypeDescriptor" table="DiplomaTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.DiplomaTypeDescriptorAggregate.EdFi.DiplomaTypeDescriptor" lazy="false" discriminator-value="edfi.DiplomaTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="DiplomaTypeDescriptor" >
           <key>
             <column name="DiplomaTypeDescriptorId" />
           </key>
@@ -3904,8 +4016,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.DisabilityDescriptorAggregate.EdFi.DisabilityDescriptor" table="DisabilityDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.DisabilityDescriptorAggregate.EdFi.DisabilityDescriptor" lazy="false" discriminator-value="edfi.DisabilityDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="DisabilityDescriptor" >
           <key>
             <column name="DisabilityDescriptorId" />
           </key>
@@ -3918,8 +4032,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.DisabilityDesignationDescriptorAggregate.EdFi.DisabilityDesignationDescriptor" table="DisabilityDesignationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.DisabilityDesignationDescriptorAggregate.EdFi.DisabilityDesignationDescriptor" lazy="false" discriminator-value="edfi.DisabilityDesignationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="DisabilityDesignationDescriptor" >
           <key>
             <column name="DisabilityDesignationDescriptorId" />
           </key>
@@ -3932,8 +4048,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.DisabilityDeterminationSourceTypeDescriptorAggregate.EdFi.DisabilityDeterminationSourceTypeDescriptor" table="DisabilityDeterminationSourceTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.DisabilityDeterminationSourceTypeDescriptorAggregate.EdFi.DisabilityDeterminationSourceTypeDescriptor" lazy="false" discriminator-value="edfi.DisabilityDeterminationSourceTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="DisabilityDeterminationSourceTypeDescriptor" >
           <key>
             <column name="DisabilityDeterminationSourceTypeDescriptorId" />
           </key>
@@ -3946,8 +4064,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.DisciplineActionLengthDifferenceReasonDescriptorAggregate.EdFi.DisciplineActionLengthDifferenceReasonDescriptor" table="DisciplineActionLengthDifferenceReasonDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.DisciplineActionLengthDifferenceReasonDescriptorAggregate.EdFi.DisciplineActionLengthDifferenceReasonDescriptor" lazy="false" discriminator-value="edfi.DisciplineActionLengthDifferenceReasonDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="DisciplineActionLengthDifferenceReasonDescriptor" >
           <key>
             <column name="DisciplineActionLengthDifferenceReasonDescriptorId" />
           </key>
@@ -3960,8 +4080,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.DisciplineDescriptorAggregate.EdFi.DisciplineDescriptor" table="DisciplineDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.DisciplineDescriptorAggregate.EdFi.DisciplineDescriptor" lazy="false" discriminator-value="edfi.DisciplineDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="DisciplineDescriptor" >
           <key>
             <column name="DisciplineDescriptorId" />
           </key>
@@ -3974,8 +4096,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.DisciplineIncidentParticipationCodeDescriptorAggregate.EdFi.DisciplineIncidentParticipationCodeDescriptor" table="DisciplineIncidentParticipationCodeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.DisciplineIncidentParticipationCodeDescriptorAggregate.EdFi.DisciplineIncidentParticipationCodeDescriptor" lazy="false" discriminator-value="edfi.DisciplineIncidentParticipationCodeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="DisciplineIncidentParticipationCodeDescriptor" >
           <key>
             <column name="DisciplineIncidentParticipationCodeDescriptorId" />
           </key>
@@ -3988,8 +4112,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.DisplacedStudentStatusDescriptorAggregate.EdFi.DisplacedStudentStatusDescriptor" table="DisplacedStudentStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.DisplacedStudentStatusDescriptorAggregate.EdFi.DisplacedStudentStatusDescriptor" lazy="false" discriminator-value="edfi.DisplacedStudentStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="DisplacedStudentStatusDescriptor" >
           <key>
             <column name="DisplacedStudentStatusDescriptorId" />
           </key>
@@ -4002,8 +4128,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.EducationalEnvironmentDescriptorAggregate.EdFi.EducationalEnvironmentDescriptor" table="EducationalEnvironmentDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.EducationalEnvironmentDescriptorAggregate.EdFi.EducationalEnvironmentDescriptor" lazy="false" discriminator-value="edfi.EducationalEnvironmentDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="EducationalEnvironmentDescriptor" >
           <key>
             <column name="EducationalEnvironmentDescriptorId" />
           </key>
@@ -4016,8 +4144,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.EducationOrganizationAssociationTypeDescriptorAggregate.EdFi.EducationOrganizationAssociationTypeDescriptor" table="EducationOrganizationAssociationTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.EducationOrganizationAssociationTypeDescriptorAggregate.EdFi.EducationOrganizationAssociationTypeDescriptor" lazy="false" discriminator-value="edfi.EducationOrganizationAssociationTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="EducationOrganizationAssociationTypeDescriptor" >
           <key>
             <column name="EducationOrganizationAssociationTypeDescriptorId" />
           </key>
@@ -4030,8 +4160,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.EducationOrganizationCategoryDescriptorAggregate.EdFi.EducationOrganizationCategoryDescriptor" table="EducationOrganizationCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.EducationOrganizationCategoryDescriptorAggregate.EdFi.EducationOrganizationCategoryDescriptor" lazy="false" discriminator-value="edfi.EducationOrganizationCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="EducationOrganizationCategoryDescriptor" >
           <key>
             <column name="EducationOrganizationCategoryDescriptorId" />
           </key>
@@ -4044,8 +4176,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.EducationOrganizationIdentificationSystemDescriptorAggregate.EdFi.EducationOrganizationIdentificationSystemDescriptor" table="EducationOrganizationIdentificationSystemDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.EducationOrganizationIdentificationSystemDescriptorAggregate.EdFi.EducationOrganizationIdentificationSystemDescriptor" lazy="false" discriminator-value="edfi.EducationOrganizationIdentificationSystemDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="EducationOrganizationIdentificationSystemDescriptor" >
           <key>
             <column name="EducationOrganizationIdentificationSystemDescriptorId" />
           </key>
@@ -4058,8 +4192,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.EducationPlanDescriptorAggregate.EdFi.EducationPlanDescriptor" table="EducationPlanDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.EducationPlanDescriptorAggregate.EdFi.EducationPlanDescriptor" lazy="false" discriminator-value="edfi.EducationPlanDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="EducationPlanDescriptor" >
           <key>
             <column name="EducationPlanDescriptorId" />
           </key>
@@ -4072,8 +4208,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ElectronicMailTypeDescriptorAggregate.EdFi.ElectronicMailTypeDescriptor" table="ElectronicMailTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ElectronicMailTypeDescriptorAggregate.EdFi.ElectronicMailTypeDescriptor" lazy="false" discriminator-value="edfi.ElectronicMailTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ElectronicMailTypeDescriptor" >
           <key>
             <column name="ElectronicMailTypeDescriptorId" />
           </key>
@@ -4086,8 +4224,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.EligibilityDelayReasonDescriptorAggregate.EdFi.EligibilityDelayReasonDescriptor" table="EligibilityDelayReasonDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.EligibilityDelayReasonDescriptorAggregate.EdFi.EligibilityDelayReasonDescriptor" lazy="false" discriminator-value="edfi.EligibilityDelayReasonDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="EligibilityDelayReasonDescriptor" >
           <key>
             <column name="EligibilityDelayReasonDescriptorId" />
           </key>
@@ -4100,8 +4240,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.EligibilityEvaluationTypeDescriptorAggregate.EdFi.EligibilityEvaluationTypeDescriptor" table="EligibilityEvaluationTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.EligibilityEvaluationTypeDescriptorAggregate.EdFi.EligibilityEvaluationTypeDescriptor" lazy="false" discriminator-value="edfi.EligibilityEvaluationTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="EligibilityEvaluationTypeDescriptor" >
           <key>
             <column name="EligibilityEvaluationTypeDescriptorId" />
           </key>
@@ -4114,8 +4256,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.EmploymentStatusDescriptorAggregate.EdFi.EmploymentStatusDescriptor" table="EmploymentStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.EmploymentStatusDescriptorAggregate.EdFi.EmploymentStatusDescriptor" lazy="false" discriminator-value="edfi.EmploymentStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="EmploymentStatusDescriptor" >
           <key>
             <column name="EmploymentStatusDescriptorId" />
           </key>
@@ -4128,8 +4272,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.EnrollmentTypeDescriptorAggregate.EdFi.EnrollmentTypeDescriptor" table="EnrollmentTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.EnrollmentTypeDescriptorAggregate.EdFi.EnrollmentTypeDescriptor" lazy="false" discriminator-value="edfi.EnrollmentTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="EnrollmentTypeDescriptor" >
           <key>
             <column name="EnrollmentTypeDescriptorId" />
           </key>
@@ -4142,8 +4288,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.EntryGradeLevelReasonDescriptorAggregate.EdFi.EntryGradeLevelReasonDescriptor" table="EntryGradeLevelReasonDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.EntryGradeLevelReasonDescriptorAggregate.EdFi.EntryGradeLevelReasonDescriptor" lazy="false" discriminator-value="edfi.EntryGradeLevelReasonDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="EntryGradeLevelReasonDescriptor" >
           <key>
             <column name="EntryGradeLevelReasonDescriptorId" />
           </key>
@@ -4156,8 +4304,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.EntryTypeDescriptorAggregate.EdFi.EntryTypeDescriptor" table="EntryTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.EntryTypeDescriptorAggregate.EdFi.EntryTypeDescriptor" lazy="false" discriminator-value="edfi.EntryTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="EntryTypeDescriptor" >
           <key>
             <column name="EntryTypeDescriptorId" />
           </key>
@@ -4170,8 +4320,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.EvaluationDelayReasonDescriptorAggregate.EdFi.EvaluationDelayReasonDescriptor" table="EvaluationDelayReasonDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.EvaluationDelayReasonDescriptorAggregate.EdFi.EvaluationDelayReasonDescriptor" lazy="false" discriminator-value="edfi.EvaluationDelayReasonDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="EvaluationDelayReasonDescriptor" >
           <key>
             <column name="EvaluationDelayReasonDescriptorId" />
           </key>
@@ -4184,8 +4336,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.EventCircumstanceDescriptorAggregate.EdFi.EventCircumstanceDescriptor" table="EventCircumstanceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.EventCircumstanceDescriptorAggregate.EdFi.EventCircumstanceDescriptor" lazy="false" discriminator-value="edfi.EventCircumstanceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="EventCircumstanceDescriptor" >
           <key>
             <column name="EventCircumstanceDescriptorId" />
           </key>
@@ -4198,8 +4352,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ExitWithdrawTypeDescriptorAggregate.EdFi.ExitWithdrawTypeDescriptor" table="ExitWithdrawTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ExitWithdrawTypeDescriptorAggregate.EdFi.ExitWithdrawTypeDescriptor" lazy="false" discriminator-value="edfi.ExitWithdrawTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ExitWithdrawTypeDescriptor" >
           <key>
             <column name="ExitWithdrawTypeDescriptorId" />
           </key>
@@ -4212,8 +4368,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.FinancialCollectionDescriptorAggregate.EdFi.FinancialCollectionDescriptor" table="FinancialCollectionDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.FinancialCollectionDescriptorAggregate.EdFi.FinancialCollectionDescriptor" lazy="false" discriminator-value="edfi.FinancialCollectionDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="FinancialCollectionDescriptor" >
           <key>
             <column name="FinancialCollectionDescriptorId" />
           </key>
@@ -4226,8 +4384,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.GradebookEntryTypeDescriptorAggregate.EdFi.GradebookEntryTypeDescriptor" table="GradebookEntryTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.GradebookEntryTypeDescriptorAggregate.EdFi.GradebookEntryTypeDescriptor" lazy="false" discriminator-value="edfi.GradebookEntryTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="GradebookEntryTypeDescriptor" >
           <key>
             <column name="GradebookEntryTypeDescriptorId" />
           </key>
@@ -4240,8 +4400,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.GradeLevelDescriptorAggregate.EdFi.GradeLevelDescriptor" table="GradeLevelDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.GradeLevelDescriptorAggregate.EdFi.GradeLevelDescriptor" lazy="false" discriminator-value="edfi.GradeLevelDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="GradeLevelDescriptor" >
           <key>
             <column name="GradeLevelDescriptorId" />
           </key>
@@ -4254,8 +4416,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.GradePointAverageTypeDescriptorAggregate.EdFi.GradePointAverageTypeDescriptor" table="GradePointAverageTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.GradePointAverageTypeDescriptorAggregate.EdFi.GradePointAverageTypeDescriptor" lazy="false" discriminator-value="edfi.GradePointAverageTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="GradePointAverageTypeDescriptor" >
           <key>
             <column name="GradePointAverageTypeDescriptorId" />
           </key>
@@ -4268,8 +4432,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.GradeTypeDescriptorAggregate.EdFi.GradeTypeDescriptor" table="GradeTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.GradeTypeDescriptorAggregate.EdFi.GradeTypeDescriptor" lazy="false" discriminator-value="edfi.GradeTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="GradeTypeDescriptor" >
           <key>
             <column name="GradeTypeDescriptorId" />
           </key>
@@ -4282,8 +4448,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.GradingPeriodDescriptorAggregate.EdFi.GradingPeriodDescriptor" table="GradingPeriodDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.GradingPeriodDescriptorAggregate.EdFi.GradingPeriodDescriptor" lazy="false" discriminator-value="edfi.GradingPeriodDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="GradingPeriodDescriptor" >
           <key>
             <column name="GradingPeriodDescriptorId" />
           </key>
@@ -4296,8 +4464,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.GraduationPlanTypeDescriptorAggregate.EdFi.GraduationPlanTypeDescriptor" table="GraduationPlanTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.GraduationPlanTypeDescriptorAggregate.EdFi.GraduationPlanTypeDescriptor" lazy="false" discriminator-value="edfi.GraduationPlanTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="GraduationPlanTypeDescriptor" >
           <key>
             <column name="GraduationPlanTypeDescriptorId" />
           </key>
@@ -4310,8 +4480,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.GunFreeSchoolsActReportingStatusDescriptorAggregate.EdFi.GunFreeSchoolsActReportingStatusDescriptor" table="GunFreeSchoolsActReportingStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.GunFreeSchoolsActReportingStatusDescriptorAggregate.EdFi.GunFreeSchoolsActReportingStatusDescriptor" lazy="false" discriminator-value="edfi.GunFreeSchoolsActReportingStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="GunFreeSchoolsActReportingStatusDescriptor" >
           <key>
             <column name="GunFreeSchoolsActReportingStatusDescriptorId" />
           </key>
@@ -4324,8 +4496,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.HomelessPrimaryNighttimeResidenceDescriptorAggregate.EdFi.HomelessPrimaryNighttimeResidenceDescriptor" table="HomelessPrimaryNighttimeResidenceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.HomelessPrimaryNighttimeResidenceDescriptorAggregate.EdFi.HomelessPrimaryNighttimeResidenceDescriptor" lazy="false" discriminator-value="edfi.HomelessPrimaryNighttimeResidenceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="HomelessPrimaryNighttimeResidenceDescriptor" >
           <key>
             <column name="HomelessPrimaryNighttimeResidenceDescriptorId" />
           </key>
@@ -4338,8 +4512,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.HomelessProgramServiceDescriptorAggregate.EdFi.HomelessProgramServiceDescriptor" table="HomelessProgramServiceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.HomelessProgramServiceDescriptorAggregate.EdFi.HomelessProgramServiceDescriptor" lazy="false" discriminator-value="edfi.HomelessProgramServiceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="HomelessProgramServiceDescriptor" >
           <key>
             <column name="HomelessProgramServiceDescriptorId" />
           </key>
@@ -4352,8 +4528,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.IDEAPartDescriptorAggregate.EdFi.IDEAPartDescriptor" table="IDEAPartDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.IDEAPartDescriptorAggregate.EdFi.IDEAPartDescriptor" lazy="false" discriminator-value="edfi.IDEAPartDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="IDEAPartDescriptor" >
           <key>
             <column name="IDEAPartDescriptorId" />
           </key>
@@ -4366,8 +4544,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.IdentificationDocumentUseDescriptorAggregate.EdFi.IdentificationDocumentUseDescriptor" table="IdentificationDocumentUseDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.IdentificationDocumentUseDescriptorAggregate.EdFi.IdentificationDocumentUseDescriptor" lazy="false" discriminator-value="edfi.IdentificationDocumentUseDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="IdentificationDocumentUseDescriptor" >
           <key>
             <column name="IdentificationDocumentUseDescriptorId" />
           </key>
@@ -4380,8 +4560,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ImmunizationTypeDescriptorAggregate.EdFi.ImmunizationTypeDescriptor" table="ImmunizationTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ImmunizationTypeDescriptorAggregate.EdFi.ImmunizationTypeDescriptor" lazy="false" discriminator-value="edfi.ImmunizationTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ImmunizationTypeDescriptor" >
           <key>
             <column name="ImmunizationTypeDescriptorId" />
           </key>
@@ -4394,8 +4576,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.IncidentLocationDescriptorAggregate.EdFi.IncidentLocationDescriptor" table="IncidentLocationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.IncidentLocationDescriptorAggregate.EdFi.IncidentLocationDescriptor" lazy="false" discriminator-value="edfi.IncidentLocationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="IncidentLocationDescriptor" >
           <key>
             <column name="IncidentLocationDescriptorId" />
           </key>
@@ -4408,8 +4592,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.IndicatorDescriptorAggregate.EdFi.IndicatorDescriptor" table="IndicatorDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.IndicatorDescriptorAggregate.EdFi.IndicatorDescriptor" lazy="false" discriminator-value="edfi.IndicatorDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="IndicatorDescriptor" >
           <key>
             <column name="IndicatorDescriptorId" />
           </key>
@@ -4422,8 +4608,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.IndicatorGroupDescriptorAggregate.EdFi.IndicatorGroupDescriptor" table="IndicatorGroupDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.IndicatorGroupDescriptorAggregate.EdFi.IndicatorGroupDescriptor" lazy="false" discriminator-value="edfi.IndicatorGroupDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="IndicatorGroupDescriptor" >
           <key>
             <column name="IndicatorGroupDescriptorId" />
           </key>
@@ -4436,8 +4624,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.IndicatorLevelDescriptorAggregate.EdFi.IndicatorLevelDescriptor" table="IndicatorLevelDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.IndicatorLevelDescriptorAggregate.EdFi.IndicatorLevelDescriptor" lazy="false" discriminator-value="edfi.IndicatorLevelDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="IndicatorLevelDescriptor" >
           <key>
             <column name="IndicatorLevelDescriptorId" />
           </key>
@@ -4450,8 +4640,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.InstitutionTelephoneNumberTypeDescriptorAggregate.EdFi.InstitutionTelephoneNumberTypeDescriptor" table="InstitutionTelephoneNumberTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.InstitutionTelephoneNumberTypeDescriptorAggregate.EdFi.InstitutionTelephoneNumberTypeDescriptor" lazy="false" discriminator-value="edfi.InstitutionTelephoneNumberTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="InstitutionTelephoneNumberTypeDescriptor" >
           <key>
             <column name="InstitutionTelephoneNumberTypeDescriptorId" />
           </key>
@@ -4464,8 +4656,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.InteractivityStyleDescriptorAggregate.EdFi.InteractivityStyleDescriptor" table="InteractivityStyleDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.InteractivityStyleDescriptorAggregate.EdFi.InteractivityStyleDescriptor" lazy="false" discriminator-value="edfi.InteractivityStyleDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="InteractivityStyleDescriptor" >
           <key>
             <column name="InteractivityStyleDescriptorId" />
           </key>
@@ -4478,8 +4672,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.InternetAccessDescriptorAggregate.EdFi.InternetAccessDescriptor" table="InternetAccessDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.InternetAccessDescriptorAggregate.EdFi.InternetAccessDescriptor" lazy="false" discriminator-value="edfi.InternetAccessDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="InternetAccessDescriptor" >
           <key>
             <column name="InternetAccessDescriptorId" />
           </key>
@@ -4492,8 +4688,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.InternetAccessTypeInResidenceDescriptorAggregate.EdFi.InternetAccessTypeInResidenceDescriptor" table="InternetAccessTypeInResidenceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.InternetAccessTypeInResidenceDescriptorAggregate.EdFi.InternetAccessTypeInResidenceDescriptor" lazy="false" discriminator-value="edfi.InternetAccessTypeInResidenceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="InternetAccessTypeInResidenceDescriptor" >
           <key>
             <column name="InternetAccessTypeInResidenceDescriptorId" />
           </key>
@@ -4506,8 +4704,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.InternetPerformanceInResidenceDescriptorAggregate.EdFi.InternetPerformanceInResidenceDescriptor" table="InternetPerformanceInResidenceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.InternetPerformanceInResidenceDescriptorAggregate.EdFi.InternetPerformanceInResidenceDescriptor" lazy="false" discriminator-value="edfi.InternetPerformanceInResidenceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="InternetPerformanceInResidenceDescriptor" >
           <key>
             <column name="InternetPerformanceInResidenceDescriptorId" />
           </key>
@@ -4520,8 +4720,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.InterventionClassDescriptorAggregate.EdFi.InterventionClassDescriptor" table="InterventionClassDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.InterventionClassDescriptorAggregate.EdFi.InterventionClassDescriptor" lazy="false" discriminator-value="edfi.InterventionClassDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="InterventionClassDescriptor" >
           <key>
             <column name="InterventionClassDescriptorId" />
           </key>
@@ -4534,8 +4736,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.InterventionEffectivenessRatingDescriptorAggregate.EdFi.InterventionEffectivenessRatingDescriptor" table="InterventionEffectivenessRatingDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.InterventionEffectivenessRatingDescriptorAggregate.EdFi.InterventionEffectivenessRatingDescriptor" lazy="false" discriminator-value="edfi.InterventionEffectivenessRatingDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="InterventionEffectivenessRatingDescriptor" >
           <key>
             <column name="InterventionEffectivenessRatingDescriptorId" />
           </key>
@@ -4548,8 +4752,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.LanguageDescriptorAggregate.EdFi.LanguageDescriptor" table="LanguageDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.LanguageDescriptorAggregate.EdFi.LanguageDescriptor" lazy="false" discriminator-value="edfi.LanguageDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LanguageDescriptor" >
           <key>
             <column name="LanguageDescriptorId" />
           </key>
@@ -4562,8 +4768,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.LanguageInstructionProgramServiceDescriptorAggregate.EdFi.LanguageInstructionProgramServiceDescriptor" table="LanguageInstructionProgramServiceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.LanguageInstructionProgramServiceDescriptorAggregate.EdFi.LanguageInstructionProgramServiceDescriptor" lazy="false" discriminator-value="edfi.LanguageInstructionProgramServiceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LanguageInstructionProgramServiceDescriptor" >
           <key>
             <column name="LanguageInstructionProgramServiceDescriptorId" />
           </key>
@@ -4576,8 +4784,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.LanguageUseDescriptorAggregate.EdFi.LanguageUseDescriptor" table="LanguageUseDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.LanguageUseDescriptorAggregate.EdFi.LanguageUseDescriptor" lazy="false" discriminator-value="edfi.LanguageUseDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LanguageUseDescriptor" >
           <key>
             <column name="LanguageUseDescriptorId" />
           </key>
@@ -4590,8 +4800,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.LearningStandardCategoryDescriptorAggregate.EdFi.LearningStandardCategoryDescriptor" table="LearningStandardCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.LearningStandardCategoryDescriptorAggregate.EdFi.LearningStandardCategoryDescriptor" lazy="false" discriminator-value="edfi.LearningStandardCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LearningStandardCategoryDescriptor" >
           <key>
             <column name="LearningStandardCategoryDescriptorId" />
           </key>
@@ -4604,8 +4816,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.LearningStandardEquivalenceStrengthDescriptorAggregate.EdFi.LearningStandardEquivalenceStrengthDescriptor" table="LearningStandardEquivalenceStrengthDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.LearningStandardEquivalenceStrengthDescriptorAggregate.EdFi.LearningStandardEquivalenceStrengthDescriptor" lazy="false" discriminator-value="edfi.LearningStandardEquivalenceStrengthDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LearningStandardEquivalenceStrengthDescriptor" >
           <key>
             <column name="LearningStandardEquivalenceStrengthDescriptorId" />
           </key>
@@ -4618,8 +4832,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.LearningStandardScopeDescriptorAggregate.EdFi.LearningStandardScopeDescriptor" table="LearningStandardScopeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.LearningStandardScopeDescriptorAggregate.EdFi.LearningStandardScopeDescriptor" lazy="false" discriminator-value="edfi.LearningStandardScopeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LearningStandardScopeDescriptor" >
           <key>
             <column name="LearningStandardScopeDescriptorId" />
           </key>
@@ -4632,8 +4848,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.LevelOfEducationDescriptorAggregate.EdFi.LevelOfEducationDescriptor" table="LevelOfEducationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.LevelOfEducationDescriptorAggregate.EdFi.LevelOfEducationDescriptor" lazy="false" discriminator-value="edfi.LevelOfEducationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LevelOfEducationDescriptor" >
           <key>
             <column name="LevelOfEducationDescriptorId" />
           </key>
@@ -4646,8 +4864,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.LicenseStatusDescriptorAggregate.EdFi.LicenseStatusDescriptor" table="LicenseStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.LicenseStatusDescriptorAggregate.EdFi.LicenseStatusDescriptor" lazy="false" discriminator-value="edfi.LicenseStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LicenseStatusDescriptor" >
           <key>
             <column name="LicenseStatusDescriptorId" />
           </key>
@@ -4660,8 +4880,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.LicenseTypeDescriptorAggregate.EdFi.LicenseTypeDescriptor" table="LicenseTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.LicenseTypeDescriptorAggregate.EdFi.LicenseTypeDescriptor" lazy="false" discriminator-value="edfi.LicenseTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LicenseTypeDescriptor" >
           <key>
             <column name="LicenseTypeDescriptorId" />
           </key>
@@ -4674,8 +4896,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.LimitedEnglishProficiencyDescriptorAggregate.EdFi.LimitedEnglishProficiencyDescriptor" table="LimitedEnglishProficiencyDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.LimitedEnglishProficiencyDescriptorAggregate.EdFi.LimitedEnglishProficiencyDescriptor" lazy="false" discriminator-value="edfi.LimitedEnglishProficiencyDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LimitedEnglishProficiencyDescriptor" >
           <key>
             <column name="LimitedEnglishProficiencyDescriptorId" />
           </key>
@@ -4688,8 +4912,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.LocaleDescriptorAggregate.EdFi.LocaleDescriptor" table="LocaleDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.LocaleDescriptorAggregate.EdFi.LocaleDescriptor" lazy="false" discriminator-value="edfi.LocaleDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LocaleDescriptor" >
           <key>
             <column name="LocaleDescriptorId" />
           </key>
@@ -4702,8 +4928,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.LocalEducationAgencyCategoryDescriptorAggregate.EdFi.LocalEducationAgencyCategoryDescriptor" table="LocalEducationAgencyCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.LocalEducationAgencyCategoryDescriptorAggregate.EdFi.LocalEducationAgencyCategoryDescriptor" lazy="false" discriminator-value="edfi.LocalEducationAgencyCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LocalEducationAgencyCategoryDescriptor" >
           <key>
             <column name="LocalEducationAgencyCategoryDescriptorId" />
           </key>
@@ -4716,8 +4944,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.MagnetSpecialProgramEmphasisSchoolDescriptorAggregate.EdFi.MagnetSpecialProgramEmphasisSchoolDescriptor" table="MagnetSpecialProgramEmphasisSchoolDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.MagnetSpecialProgramEmphasisSchoolDescriptorAggregate.EdFi.MagnetSpecialProgramEmphasisSchoolDescriptor" lazy="false" discriminator-value="edfi.MagnetSpecialProgramEmphasisSchoolDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="MagnetSpecialProgramEmphasisSchoolDescriptor" >
           <key>
             <column name="MagnetSpecialProgramEmphasisSchoolDescriptorId" />
           </key>
@@ -4730,8 +4960,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.MediumOfInstructionDescriptorAggregate.EdFi.MediumOfInstructionDescriptor" table="MediumOfInstructionDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.MediumOfInstructionDescriptorAggregate.EdFi.MediumOfInstructionDescriptor" lazy="false" discriminator-value="edfi.MediumOfInstructionDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="MediumOfInstructionDescriptor" >
           <key>
             <column name="MediumOfInstructionDescriptorId" />
           </key>
@@ -4744,8 +4976,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.MethodCreditEarnedDescriptorAggregate.EdFi.MethodCreditEarnedDescriptor" table="MethodCreditEarnedDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.MethodCreditEarnedDescriptorAggregate.EdFi.MethodCreditEarnedDescriptor" lazy="false" discriminator-value="edfi.MethodCreditEarnedDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="MethodCreditEarnedDescriptor" >
           <key>
             <column name="MethodCreditEarnedDescriptorId" />
           </key>
@@ -4758,8 +4992,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.MigrantEducationProgramServiceDescriptorAggregate.EdFi.MigrantEducationProgramServiceDescriptor" table="MigrantEducationProgramServiceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.MigrantEducationProgramServiceDescriptorAggregate.EdFi.MigrantEducationProgramServiceDescriptor" lazy="false" discriminator-value="edfi.MigrantEducationProgramServiceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="MigrantEducationProgramServiceDescriptor" >
           <key>
             <column name="MigrantEducationProgramServiceDescriptorId" />
           </key>
@@ -4772,8 +5008,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ModelEntityDescriptorAggregate.EdFi.ModelEntityDescriptor" table="ModelEntityDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ModelEntityDescriptorAggregate.EdFi.ModelEntityDescriptor" lazy="false" discriminator-value="edfi.ModelEntityDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ModelEntityDescriptor" >
           <key>
             <column name="ModelEntityDescriptorId" />
           </key>
@@ -4786,8 +5024,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.MonitoredDescriptorAggregate.EdFi.MonitoredDescriptor" table="MonitoredDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.MonitoredDescriptorAggregate.EdFi.MonitoredDescriptor" lazy="false" discriminator-value="edfi.MonitoredDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="MonitoredDescriptor" >
           <key>
             <column name="MonitoredDescriptorId" />
           </key>
@@ -4800,8 +5040,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.NeglectedOrDelinquentProgramDescriptorAggregate.EdFi.NeglectedOrDelinquentProgramDescriptor" table="NeglectedOrDelinquentProgramDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.NeglectedOrDelinquentProgramDescriptorAggregate.EdFi.NeglectedOrDelinquentProgramDescriptor" lazy="false" discriminator-value="edfi.NeglectedOrDelinquentProgramDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="NeglectedOrDelinquentProgramDescriptor" >
           <key>
             <column name="NeglectedOrDelinquentProgramDescriptorId" />
           </key>
@@ -4814,8 +5056,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.NeglectedOrDelinquentProgramServiceDescriptorAggregate.EdFi.NeglectedOrDelinquentProgramServiceDescriptor" table="NeglectedOrDelinquentProgramServiceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.NeglectedOrDelinquentProgramServiceDescriptorAggregate.EdFi.NeglectedOrDelinquentProgramServiceDescriptor" lazy="false" discriminator-value="edfi.NeglectedOrDelinquentProgramServiceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="NeglectedOrDelinquentProgramServiceDescriptor" >
           <key>
             <column name="NeglectedOrDelinquentProgramServiceDescriptorId" />
           </key>
@@ -4828,8 +5072,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.NetworkPurposeDescriptorAggregate.EdFi.NetworkPurposeDescriptor" table="NetworkPurposeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.NetworkPurposeDescriptorAggregate.EdFi.NetworkPurposeDescriptor" lazy="false" discriminator-value="edfi.NetworkPurposeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="NetworkPurposeDescriptor" >
           <key>
             <column name="NetworkPurposeDescriptorId" />
           </key>
@@ -4842,8 +5088,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.NonMedicalImmunizationExemptionDescriptorAggregate.EdFi.NonMedicalImmunizationExemptionDescriptor" table="NonMedicalImmunizationExemptionDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.NonMedicalImmunizationExemptionDescriptorAggregate.EdFi.NonMedicalImmunizationExemptionDescriptor" lazy="false" discriminator-value="edfi.NonMedicalImmunizationExemptionDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="NonMedicalImmunizationExemptionDescriptor" >
           <key>
             <column name="NonMedicalImmunizationExemptionDescriptorId" />
           </key>
@@ -4856,8 +5104,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.OperationalStatusDescriptorAggregate.EdFi.OperationalStatusDescriptor" table="OperationalStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.OperationalStatusDescriptorAggregate.EdFi.OperationalStatusDescriptor" lazy="false" discriminator-value="edfi.OperationalStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="OperationalStatusDescriptor" >
           <key>
             <column name="OperationalStatusDescriptorId" />
           </key>
@@ -4870,8 +5120,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.OtherNameTypeDescriptorAggregate.EdFi.OtherNameTypeDescriptor" table="OtherNameTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.OtherNameTypeDescriptorAggregate.EdFi.OtherNameTypeDescriptor" lazy="false" discriminator-value="edfi.OtherNameTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="OtherNameTypeDescriptor" >
           <key>
             <column name="OtherNameTypeDescriptorId" />
           </key>
@@ -4884,8 +5136,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ParticipationDescriptorAggregate.EdFi.ParticipationDescriptor" table="ParticipationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ParticipationDescriptorAggregate.EdFi.ParticipationDescriptor" lazy="false" discriminator-value="edfi.ParticipationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ParticipationDescriptor" >
           <key>
             <column name="ParticipationDescriptorId" />
           </key>
@@ -4898,8 +5152,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ParticipationStatusDescriptorAggregate.EdFi.ParticipationStatusDescriptor" table="ParticipationStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ParticipationStatusDescriptorAggregate.EdFi.ParticipationStatusDescriptor" lazy="false" discriminator-value="edfi.ParticipationStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ParticipationStatusDescriptor" >
           <key>
             <column name="ParticipationStatusDescriptorId" />
           </key>
@@ -4912,8 +5168,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.PerformanceBaseConversionDescriptorAggregate.EdFi.PerformanceBaseConversionDescriptor" table="PerformanceBaseConversionDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.PerformanceBaseConversionDescriptorAggregate.EdFi.PerformanceBaseConversionDescriptor" lazy="false" discriminator-value="edfi.PerformanceBaseConversionDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PerformanceBaseConversionDescriptor" >
           <key>
             <column name="PerformanceBaseConversionDescriptorId" />
           </key>
@@ -4926,8 +5184,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.PerformanceLevelDescriptorAggregate.EdFi.PerformanceLevelDescriptor" table="PerformanceLevelDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.PerformanceLevelDescriptorAggregate.EdFi.PerformanceLevelDescriptor" lazy="false" discriminator-value="edfi.PerformanceLevelDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PerformanceLevelDescriptor" >
           <key>
             <column name="PerformanceLevelDescriptorId" />
           </key>
@@ -4940,8 +5200,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.PersonalInformationVerificationDescriptorAggregate.EdFi.PersonalInformationVerificationDescriptor" table="PersonalInformationVerificationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.PersonalInformationVerificationDescriptorAggregate.EdFi.PersonalInformationVerificationDescriptor" lazy="false" discriminator-value="edfi.PersonalInformationVerificationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PersonalInformationVerificationDescriptor" >
           <key>
             <column name="PersonalInformationVerificationDescriptorId" />
           </key>
@@ -4954,8 +5216,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.PlatformTypeDescriptorAggregate.EdFi.PlatformTypeDescriptor" table="PlatformTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.PlatformTypeDescriptorAggregate.EdFi.PlatformTypeDescriptor" lazy="false" discriminator-value="edfi.PlatformTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PlatformTypeDescriptor" >
           <key>
             <column name="PlatformTypeDescriptorId" />
           </key>
@@ -4968,8 +5232,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.PopulationServedDescriptorAggregate.EdFi.PopulationServedDescriptor" table="PopulationServedDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.PopulationServedDescriptorAggregate.EdFi.PopulationServedDescriptor" lazy="false" discriminator-value="edfi.PopulationServedDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PopulationServedDescriptor" >
           <key>
             <column name="PopulationServedDescriptorId" />
           </key>
@@ -4982,8 +5248,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.PostingResultDescriptorAggregate.EdFi.PostingResultDescriptor" table="PostingResultDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.PostingResultDescriptorAggregate.EdFi.PostingResultDescriptor" lazy="false" discriminator-value="edfi.PostingResultDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PostingResultDescriptor" >
           <key>
             <column name="PostingResultDescriptorId" />
           </key>
@@ -4996,8 +5264,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.PostSecondaryEventCategoryDescriptorAggregate.EdFi.PostSecondaryEventCategoryDescriptor" table="PostSecondaryEventCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.PostSecondaryEventCategoryDescriptorAggregate.EdFi.PostSecondaryEventCategoryDescriptor" lazy="false" discriminator-value="edfi.PostSecondaryEventCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PostSecondaryEventCategoryDescriptor" >
           <key>
             <column name="PostSecondaryEventCategoryDescriptorId" />
           </key>
@@ -5010,8 +5280,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.PostSecondaryInstitutionLevelDescriptorAggregate.EdFi.PostSecondaryInstitutionLevelDescriptor" table="PostSecondaryInstitutionLevelDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.PostSecondaryInstitutionLevelDescriptorAggregate.EdFi.PostSecondaryInstitutionLevelDescriptor" lazy="false" discriminator-value="edfi.PostSecondaryInstitutionLevelDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PostSecondaryInstitutionLevelDescriptor" >
           <key>
             <column name="PostSecondaryInstitutionLevelDescriptorId" />
           </key>
@@ -5024,8 +5296,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.PrimaryLearningDeviceAccessDescriptorAggregate.EdFi.PrimaryLearningDeviceAccessDescriptor" table="PrimaryLearningDeviceAccessDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.PrimaryLearningDeviceAccessDescriptorAggregate.EdFi.PrimaryLearningDeviceAccessDescriptor" lazy="false" discriminator-value="edfi.PrimaryLearningDeviceAccessDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PrimaryLearningDeviceAccessDescriptor" >
           <key>
             <column name="PrimaryLearningDeviceAccessDescriptorId" />
           </key>
@@ -5038,8 +5312,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.PrimaryLearningDeviceAwayFromSchoolDescriptorAggregate.EdFi.PrimaryLearningDeviceAwayFromSchoolDescriptor" table="PrimaryLearningDeviceAwayFromSchoolDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.PrimaryLearningDeviceAwayFromSchoolDescriptorAggregate.EdFi.PrimaryLearningDeviceAwayFromSchoolDescriptor" lazy="false" discriminator-value="edfi.PrimaryLearningDeviceAwayFromSchoolDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PrimaryLearningDeviceAwayFromSchoolDescriptor" >
           <key>
             <column name="PrimaryLearningDeviceAwayFromSchoolDescriptorId" />
           </key>
@@ -5052,8 +5328,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.PrimaryLearningDeviceProviderDescriptorAggregate.EdFi.PrimaryLearningDeviceProviderDescriptor" table="PrimaryLearningDeviceProviderDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.PrimaryLearningDeviceProviderDescriptorAggregate.EdFi.PrimaryLearningDeviceProviderDescriptor" lazy="false" discriminator-value="edfi.PrimaryLearningDeviceProviderDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PrimaryLearningDeviceProviderDescriptor" >
           <key>
             <column name="PrimaryLearningDeviceProviderDescriptorId" />
           </key>
@@ -5066,8 +5344,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ProficiencyDescriptorAggregate.EdFi.ProficiencyDescriptor" table="ProficiencyDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ProficiencyDescriptorAggregate.EdFi.ProficiencyDescriptor" lazy="false" discriminator-value="edfi.ProficiencyDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ProficiencyDescriptor" >
           <key>
             <column name="ProficiencyDescriptorId" />
           </key>
@@ -5080,8 +5360,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ProgramAssignmentDescriptorAggregate.EdFi.ProgramAssignmentDescriptor" table="ProgramAssignmentDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ProgramAssignmentDescriptorAggregate.EdFi.ProgramAssignmentDescriptor" lazy="false" discriminator-value="edfi.ProgramAssignmentDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ProgramAssignmentDescriptor" >
           <key>
             <column name="ProgramAssignmentDescriptorId" />
           </key>
@@ -5094,8 +5376,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ProgramCharacteristicDescriptorAggregate.EdFi.ProgramCharacteristicDescriptor" table="ProgramCharacteristicDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ProgramCharacteristicDescriptorAggregate.EdFi.ProgramCharacteristicDescriptor" lazy="false" discriminator-value="edfi.ProgramCharacteristicDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ProgramCharacteristicDescriptor" >
           <key>
             <column name="ProgramCharacteristicDescriptorId" />
           </key>
@@ -5108,8 +5392,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ProgramEvaluationPeriodDescriptorAggregate.EdFi.ProgramEvaluationPeriodDescriptor" table="ProgramEvaluationPeriodDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ProgramEvaluationPeriodDescriptorAggregate.EdFi.ProgramEvaluationPeriodDescriptor" lazy="false" discriminator-value="edfi.ProgramEvaluationPeriodDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ProgramEvaluationPeriodDescriptor" >
           <key>
             <column name="ProgramEvaluationPeriodDescriptorId" />
           </key>
@@ -5122,8 +5408,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ProgramEvaluationTypeDescriptorAggregate.EdFi.ProgramEvaluationTypeDescriptor" table="ProgramEvaluationTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ProgramEvaluationTypeDescriptorAggregate.EdFi.ProgramEvaluationTypeDescriptor" lazy="false" discriminator-value="edfi.ProgramEvaluationTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ProgramEvaluationTypeDescriptor" >
           <key>
             <column name="ProgramEvaluationTypeDescriptorId" />
           </key>
@@ -5136,8 +5424,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ProgramSponsorDescriptorAggregate.EdFi.ProgramSponsorDescriptor" table="ProgramSponsorDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ProgramSponsorDescriptorAggregate.EdFi.ProgramSponsorDescriptor" lazy="false" discriminator-value="edfi.ProgramSponsorDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ProgramSponsorDescriptor" >
           <key>
             <column name="ProgramSponsorDescriptorId" />
           </key>
@@ -5150,8 +5440,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ProgramTypeDescriptorAggregate.EdFi.ProgramTypeDescriptor" table="ProgramTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ProgramTypeDescriptorAggregate.EdFi.ProgramTypeDescriptor" lazy="false" discriminator-value="edfi.ProgramTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ProgramTypeDescriptor" >
           <key>
             <column name="ProgramTypeDescriptorId" />
           </key>
@@ -5164,8 +5456,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ProgressDescriptorAggregate.EdFi.ProgressDescriptor" table="ProgressDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ProgressDescriptorAggregate.EdFi.ProgressDescriptor" lazy="false" discriminator-value="edfi.ProgressDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ProgressDescriptor" >
           <key>
             <column name="ProgressDescriptorId" />
           </key>
@@ -5178,8 +5472,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ProgressLevelDescriptorAggregate.EdFi.ProgressLevelDescriptor" table="ProgressLevelDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ProgressLevelDescriptorAggregate.EdFi.ProgressLevelDescriptor" lazy="false" discriminator-value="edfi.ProgressLevelDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ProgressLevelDescriptor" >
           <key>
             <column name="ProgressLevelDescriptorId" />
           </key>
@@ -5192,8 +5488,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ProviderCategoryDescriptorAggregate.EdFi.ProviderCategoryDescriptor" table="ProviderCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ProviderCategoryDescriptorAggregate.EdFi.ProviderCategoryDescriptor" lazy="false" discriminator-value="edfi.ProviderCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ProviderCategoryDescriptor" >
           <key>
             <column name="ProviderCategoryDescriptorId" />
           </key>
@@ -5206,8 +5504,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ProviderProfitabilityDescriptorAggregate.EdFi.ProviderProfitabilityDescriptor" table="ProviderProfitabilityDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ProviderProfitabilityDescriptorAggregate.EdFi.ProviderProfitabilityDescriptor" lazy="false" discriminator-value="edfi.ProviderProfitabilityDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ProviderProfitabilityDescriptor" >
           <key>
             <column name="ProviderProfitabilityDescriptorId" />
           </key>
@@ -5220,8 +5520,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ProviderStatusDescriptorAggregate.EdFi.ProviderStatusDescriptor" table="ProviderStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ProviderStatusDescriptorAggregate.EdFi.ProviderStatusDescriptor" lazy="false" discriminator-value="edfi.ProviderStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ProviderStatusDescriptor" >
           <key>
             <column name="ProviderStatusDescriptorId" />
           </key>
@@ -5234,8 +5536,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.PublicationStatusDescriptorAggregate.EdFi.PublicationStatusDescriptor" table="PublicationStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.PublicationStatusDescriptorAggregate.EdFi.PublicationStatusDescriptor" lazy="false" discriminator-value="edfi.PublicationStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PublicationStatusDescriptor" >
           <key>
             <column name="PublicationStatusDescriptorId" />
           </key>
@@ -5248,8 +5552,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QuestionFormDescriptorAggregate.EdFi.QuestionFormDescriptor" table="QuestionFormDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QuestionFormDescriptorAggregate.EdFi.QuestionFormDescriptor" lazy="false" discriminator-value="edfi.QuestionFormDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="QuestionFormDescriptor" >
           <key>
             <column name="QuestionFormDescriptorId" />
           </key>
@@ -5262,8 +5568,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.RaceDescriptorAggregate.EdFi.RaceDescriptor" table="RaceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.RaceDescriptorAggregate.EdFi.RaceDescriptor" lazy="false" discriminator-value="edfi.RaceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="RaceDescriptor" >
           <key>
             <column name="RaceDescriptorId" />
           </key>
@@ -5276,8 +5584,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.RatingLevelDescriptorAggregate.EdFi.RatingLevelDescriptor" table="RatingLevelDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.RatingLevelDescriptorAggregate.EdFi.RatingLevelDescriptor" lazy="false" discriminator-value="edfi.RatingLevelDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="RatingLevelDescriptor" >
           <key>
             <column name="RatingLevelDescriptorId" />
           </key>
@@ -5290,8 +5600,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ReasonExitedDescriptorAggregate.EdFi.ReasonExitedDescriptor" table="ReasonExitedDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ReasonExitedDescriptorAggregate.EdFi.ReasonExitedDescriptor" lazy="false" discriminator-value="edfi.ReasonExitedDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ReasonExitedDescriptor" >
           <key>
             <column name="ReasonExitedDescriptorId" />
           </key>
@@ -5304,8 +5616,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ReasonNotTestedDescriptorAggregate.EdFi.ReasonNotTestedDescriptor" table="ReasonNotTestedDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ReasonNotTestedDescriptorAggregate.EdFi.ReasonNotTestedDescriptor" lazy="false" discriminator-value="edfi.ReasonNotTestedDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ReasonNotTestedDescriptor" >
           <key>
             <column name="ReasonNotTestedDescriptorId" />
           </key>
@@ -5318,8 +5632,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.RecognitionTypeDescriptorAggregate.EdFi.RecognitionTypeDescriptor" table="RecognitionTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.RecognitionTypeDescriptorAggregate.EdFi.RecognitionTypeDescriptor" lazy="false" discriminator-value="edfi.RecognitionTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="RecognitionTypeDescriptor" >
           <key>
             <column name="RecognitionTypeDescriptorId" />
           </key>
@@ -5332,8 +5648,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.RelationDescriptorAggregate.EdFi.RelationDescriptor" table="RelationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.RelationDescriptorAggregate.EdFi.RelationDescriptor" lazy="false" discriminator-value="edfi.RelationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="RelationDescriptor" >
           <key>
             <column name="RelationDescriptorId" />
           </key>
@@ -5346,8 +5664,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.RepeatIdentifierDescriptorAggregate.EdFi.RepeatIdentifierDescriptor" table="RepeatIdentifierDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.RepeatIdentifierDescriptorAggregate.EdFi.RepeatIdentifierDescriptor" lazy="false" discriminator-value="edfi.RepeatIdentifierDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="RepeatIdentifierDescriptor" >
           <key>
             <column name="RepeatIdentifierDescriptorId" />
           </key>
@@ -5360,8 +5680,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ReporterDescriptionDescriptorAggregate.EdFi.ReporterDescriptionDescriptor" table="ReporterDescriptionDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ReporterDescriptionDescriptorAggregate.EdFi.ReporterDescriptionDescriptor" lazy="false" discriminator-value="edfi.ReporterDescriptionDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ReporterDescriptionDescriptor" >
           <key>
             <column name="ReporterDescriptionDescriptorId" />
           </key>
@@ -5374,8 +5696,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ReportingTagDescriptorAggregate.EdFi.ReportingTagDescriptor" table="ReportingTagDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ReportingTagDescriptorAggregate.EdFi.ReportingTagDescriptor" lazy="false" discriminator-value="edfi.ReportingTagDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ReportingTagDescriptor" >
           <key>
             <column name="ReportingTagDescriptorId" />
           </key>
@@ -5388,8 +5712,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ResidencyStatusDescriptorAggregate.EdFi.ResidencyStatusDescriptor" table="ResidencyStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ResidencyStatusDescriptorAggregate.EdFi.ResidencyStatusDescriptor" lazy="false" discriminator-value="edfi.ResidencyStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ResidencyStatusDescriptor" >
           <key>
             <column name="ResidencyStatusDescriptorId" />
           </key>
@@ -5402,8 +5728,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ResponseIndicatorDescriptorAggregate.EdFi.ResponseIndicatorDescriptor" table="ResponseIndicatorDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ResponseIndicatorDescriptorAggregate.EdFi.ResponseIndicatorDescriptor" lazy="false" discriminator-value="edfi.ResponseIndicatorDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ResponseIndicatorDescriptor" >
           <key>
             <column name="ResponseIndicatorDescriptorId" />
           </key>
@@ -5416,8 +5744,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ResponsibilityDescriptorAggregate.EdFi.ResponsibilityDescriptor" table="ResponsibilityDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ResponsibilityDescriptorAggregate.EdFi.ResponsibilityDescriptor" lazy="false" discriminator-value="edfi.ResponsibilityDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ResponsibilityDescriptor" >
           <key>
             <column name="ResponsibilityDescriptorId" />
           </key>
@@ -5430,8 +5760,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.RestraintEventReasonDescriptorAggregate.EdFi.RestraintEventReasonDescriptor" table="RestraintEventReasonDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.RestraintEventReasonDescriptorAggregate.EdFi.RestraintEventReasonDescriptor" lazy="false" discriminator-value="edfi.RestraintEventReasonDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="RestraintEventReasonDescriptor" >
           <key>
             <column name="RestraintEventReasonDescriptorId" />
           </key>
@@ -5444,8 +5776,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ResultDatatypeTypeDescriptorAggregate.EdFi.ResultDatatypeTypeDescriptor" table="ResultDatatypeTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ResultDatatypeTypeDescriptorAggregate.EdFi.ResultDatatypeTypeDescriptor" lazy="false" discriminator-value="edfi.ResultDatatypeTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ResultDatatypeTypeDescriptor" >
           <key>
             <column name="ResultDatatypeTypeDescriptorId" />
           </key>
@@ -5458,8 +5792,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.RetestIndicatorDescriptorAggregate.EdFi.RetestIndicatorDescriptor" table="RetestIndicatorDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.RetestIndicatorDescriptorAggregate.EdFi.RetestIndicatorDescriptor" lazy="false" discriminator-value="edfi.RetestIndicatorDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="RetestIndicatorDescriptor" >
           <key>
             <column name="RetestIndicatorDescriptorId" />
           </key>
@@ -5472,8 +5808,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.SchoolCategoryDescriptorAggregate.EdFi.SchoolCategoryDescriptor" table="SchoolCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.SchoolCategoryDescriptorAggregate.EdFi.SchoolCategoryDescriptor" lazy="false" discriminator-value="edfi.SchoolCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SchoolCategoryDescriptor" >
           <key>
             <column name="SchoolCategoryDescriptorId" />
           </key>
@@ -5486,8 +5824,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.SchoolChoiceBasisDescriptorAggregate.EdFi.SchoolChoiceBasisDescriptor" table="SchoolChoiceBasisDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.SchoolChoiceBasisDescriptorAggregate.EdFi.SchoolChoiceBasisDescriptor" lazy="false" discriminator-value="edfi.SchoolChoiceBasisDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SchoolChoiceBasisDescriptor" >
           <key>
             <column name="SchoolChoiceBasisDescriptorId" />
           </key>
@@ -5500,8 +5840,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.SchoolChoiceImplementStatusDescriptorAggregate.EdFi.SchoolChoiceImplementStatusDescriptor" table="SchoolChoiceImplementStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.SchoolChoiceImplementStatusDescriptorAggregate.EdFi.SchoolChoiceImplementStatusDescriptor" lazy="false" discriminator-value="edfi.SchoolChoiceImplementStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SchoolChoiceImplementStatusDescriptor" >
           <key>
             <column name="SchoolChoiceImplementStatusDescriptorId" />
           </key>
@@ -5514,8 +5856,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.SchoolFoodServiceProgramServiceDescriptorAggregate.EdFi.SchoolFoodServiceProgramServiceDescriptor" table="SchoolFoodServiceProgramServiceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.SchoolFoodServiceProgramServiceDescriptorAggregate.EdFi.SchoolFoodServiceProgramServiceDescriptor" lazy="false" discriminator-value="edfi.SchoolFoodServiceProgramServiceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SchoolFoodServiceProgramServiceDescriptor" >
           <key>
             <column name="SchoolFoodServiceProgramServiceDescriptorId" />
           </key>
@@ -5528,8 +5872,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.SchoolTypeDescriptorAggregate.EdFi.SchoolTypeDescriptor" table="SchoolTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.SchoolTypeDescriptorAggregate.EdFi.SchoolTypeDescriptor" lazy="false" discriminator-value="edfi.SchoolTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SchoolTypeDescriptor" >
           <key>
             <column name="SchoolTypeDescriptorId" />
           </key>
@@ -5542,8 +5888,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.SectionCharacteristicDescriptorAggregate.EdFi.SectionCharacteristicDescriptor" table="SectionCharacteristicDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.SectionCharacteristicDescriptorAggregate.EdFi.SectionCharacteristicDescriptor" lazy="false" discriminator-value="edfi.SectionCharacteristicDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SectionCharacteristicDescriptor" >
           <key>
             <column name="SectionCharacteristicDescriptorId" />
           </key>
@@ -5556,8 +5904,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.SectionTypeDescriptorAggregate.EdFi.SectionTypeDescriptor" table="SectionTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.SectionTypeDescriptorAggregate.EdFi.SectionTypeDescriptor" lazy="false" discriminator-value="edfi.SectionTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SectionTypeDescriptor" >
           <key>
             <column name="SectionTypeDescriptorId" />
           </key>
@@ -5570,8 +5920,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.SeparationDescriptorAggregate.EdFi.SeparationDescriptor" table="SeparationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.SeparationDescriptorAggregate.EdFi.SeparationDescriptor" lazy="false" discriminator-value="edfi.SeparationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SeparationDescriptor" >
           <key>
             <column name="SeparationDescriptorId" />
           </key>
@@ -5584,8 +5936,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.SeparationReasonDescriptorAggregate.EdFi.SeparationReasonDescriptor" table="SeparationReasonDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.SeparationReasonDescriptorAggregate.EdFi.SeparationReasonDescriptor" lazy="false" discriminator-value="edfi.SeparationReasonDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SeparationReasonDescriptor" >
           <key>
             <column name="SeparationReasonDescriptorId" />
           </key>
@@ -5598,8 +5952,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ServiceDescriptorAggregate.EdFi.ServiceDescriptor" table="ServiceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ServiceDescriptorAggregate.EdFi.ServiceDescriptor" lazy="false" discriminator-value="edfi.ServiceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ServiceDescriptor" >
           <key>
             <column name="ServiceDescriptorId" />
           </key>
@@ -5612,8 +5968,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.SexDescriptorAggregate.EdFi.SexDescriptor" table="SexDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.SexDescriptorAggregate.EdFi.SexDescriptor" lazy="false" discriminator-value="edfi.SexDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SexDescriptor" >
           <key>
             <column name="SexDescriptorId" />
           </key>
@@ -5626,8 +5984,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.SourceSystemDescriptorAggregate.EdFi.SourceSystemDescriptor" table="SourceSystemDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.SourceSystemDescriptorAggregate.EdFi.SourceSystemDescriptor" lazy="false" discriminator-value="edfi.SourceSystemDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SourceSystemDescriptor" >
           <key>
             <column name="SourceSystemDescriptorId" />
           </key>
@@ -5640,8 +6000,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.SpecialEducationExitReasonDescriptorAggregate.EdFi.SpecialEducationExitReasonDescriptor" table="SpecialEducationExitReasonDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.SpecialEducationExitReasonDescriptorAggregate.EdFi.SpecialEducationExitReasonDescriptor" lazy="false" discriminator-value="edfi.SpecialEducationExitReasonDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SpecialEducationExitReasonDescriptor" >
           <key>
             <column name="SpecialEducationExitReasonDescriptorId" />
           </key>
@@ -5654,8 +6016,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.SpecialEducationProgramServiceDescriptorAggregate.EdFi.SpecialEducationProgramServiceDescriptor" table="SpecialEducationProgramServiceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.SpecialEducationProgramServiceDescriptorAggregate.EdFi.SpecialEducationProgramServiceDescriptor" lazy="false" discriminator-value="edfi.SpecialEducationProgramServiceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SpecialEducationProgramServiceDescriptor" >
           <key>
             <column name="SpecialEducationProgramServiceDescriptorId" />
           </key>
@@ -5668,8 +6032,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.SpecialEducationSettingDescriptorAggregate.EdFi.SpecialEducationSettingDescriptor" table="SpecialEducationSettingDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.SpecialEducationSettingDescriptorAggregate.EdFi.SpecialEducationSettingDescriptor" lazy="false" discriminator-value="edfi.SpecialEducationSettingDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SpecialEducationSettingDescriptor" >
           <key>
             <column name="SpecialEducationSettingDescriptorId" />
           </key>
@@ -5682,8 +6048,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.StaffClassificationDescriptorAggregate.EdFi.StaffClassificationDescriptor" table="StaffClassificationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.StaffClassificationDescriptorAggregate.EdFi.StaffClassificationDescriptor" lazy="false" discriminator-value="edfi.StaffClassificationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="StaffClassificationDescriptor" >
           <key>
             <column name="StaffClassificationDescriptorId" />
           </key>
@@ -5696,8 +6064,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.StaffIdentificationSystemDescriptorAggregate.EdFi.StaffIdentificationSystemDescriptor" table="StaffIdentificationSystemDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.StaffIdentificationSystemDescriptorAggregate.EdFi.StaffIdentificationSystemDescriptor" lazy="false" discriminator-value="edfi.StaffIdentificationSystemDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="StaffIdentificationSystemDescriptor" >
           <key>
             <column name="StaffIdentificationSystemDescriptorId" />
           </key>
@@ -5710,8 +6080,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.StaffLeaveEventCategoryDescriptorAggregate.EdFi.StaffLeaveEventCategoryDescriptor" table="StaffLeaveEventCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.StaffLeaveEventCategoryDescriptorAggregate.EdFi.StaffLeaveEventCategoryDescriptor" lazy="false" discriminator-value="edfi.StaffLeaveEventCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="StaffLeaveEventCategoryDescriptor" >
           <key>
             <column name="StaffLeaveEventCategoryDescriptorId" />
           </key>
@@ -5724,8 +6096,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.StateAbbreviationDescriptorAggregate.EdFi.StateAbbreviationDescriptor" table="StateAbbreviationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.StateAbbreviationDescriptorAggregate.EdFi.StateAbbreviationDescriptor" lazy="false" discriminator-value="edfi.StateAbbreviationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="StateAbbreviationDescriptor" >
           <key>
             <column name="StateAbbreviationDescriptorId" />
           </key>
@@ -5738,8 +6112,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.StudentCharacteristicDescriptorAggregate.EdFi.StudentCharacteristicDescriptor" table="StudentCharacteristicDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.StudentCharacteristicDescriptorAggregate.EdFi.StudentCharacteristicDescriptor" lazy="false" discriminator-value="edfi.StudentCharacteristicDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="StudentCharacteristicDescriptor" >
           <key>
             <column name="StudentCharacteristicDescriptorId" />
           </key>
@@ -5752,8 +6128,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.StudentIdentificationSystemDescriptorAggregate.EdFi.StudentIdentificationSystemDescriptor" table="StudentIdentificationSystemDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.StudentIdentificationSystemDescriptorAggregate.EdFi.StudentIdentificationSystemDescriptor" lazy="false" discriminator-value="edfi.StudentIdentificationSystemDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="StudentIdentificationSystemDescriptor" >
           <key>
             <column name="StudentIdentificationSystemDescriptorId" />
           </key>
@@ -5766,8 +6144,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.StudentParticipationCodeDescriptorAggregate.EdFi.StudentParticipationCodeDescriptor" table="StudentParticipationCodeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.StudentParticipationCodeDescriptorAggregate.EdFi.StudentParticipationCodeDescriptor" lazy="false" discriminator-value="edfi.StudentParticipationCodeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="StudentParticipationCodeDescriptor" >
           <key>
             <column name="StudentParticipationCodeDescriptorId" />
           </key>
@@ -5780,8 +6160,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.SubmissionStatusDescriptorAggregate.EdFi.SubmissionStatusDescriptor" table="SubmissionStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.SubmissionStatusDescriptorAggregate.EdFi.SubmissionStatusDescriptor" lazy="false" discriminator-value="edfi.SubmissionStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SubmissionStatusDescriptor" >
           <key>
             <column name="SubmissionStatusDescriptorId" />
           </key>
@@ -5794,8 +6176,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.SupporterMilitaryConnectionDescriptorAggregate.EdFi.SupporterMilitaryConnectionDescriptor" table="SupporterMilitaryConnectionDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.SupporterMilitaryConnectionDescriptorAggregate.EdFi.SupporterMilitaryConnectionDescriptor" lazy="false" discriminator-value="edfi.SupporterMilitaryConnectionDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SupporterMilitaryConnectionDescriptor" >
           <key>
             <column name="SupporterMilitaryConnectionDescriptorId" />
           </key>
@@ -5808,8 +6192,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.SurveyCategoryDescriptorAggregate.EdFi.SurveyCategoryDescriptor" table="SurveyCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.SurveyCategoryDescriptorAggregate.EdFi.SurveyCategoryDescriptor" lazy="false" discriminator-value="edfi.SurveyCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SurveyCategoryDescriptor" >
           <key>
             <column name="SurveyCategoryDescriptorId" />
           </key>
@@ -5822,8 +6208,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.SurveyLevelDescriptorAggregate.EdFi.SurveyLevelDescriptor" table="SurveyLevelDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.SurveyLevelDescriptorAggregate.EdFi.SurveyLevelDescriptor" lazy="false" discriminator-value="edfi.SurveyLevelDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SurveyLevelDescriptor" >
           <key>
             <column name="SurveyLevelDescriptorId" />
           </key>
@@ -5836,8 +6224,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.TeachingCredentialBasisDescriptorAggregate.EdFi.TeachingCredentialBasisDescriptor" table="TeachingCredentialBasisDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.TeachingCredentialBasisDescriptorAggregate.EdFi.TeachingCredentialBasisDescriptor" lazy="false" discriminator-value="edfi.TeachingCredentialBasisDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="TeachingCredentialBasisDescriptor" >
           <key>
             <column name="TeachingCredentialBasisDescriptorId" />
           </key>
@@ -5850,8 +6240,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.TeachingCredentialDescriptorAggregate.EdFi.TeachingCredentialDescriptor" table="TeachingCredentialDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.TeachingCredentialDescriptorAggregate.EdFi.TeachingCredentialDescriptor" lazy="false" discriminator-value="edfi.TeachingCredentialDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="TeachingCredentialDescriptor" >
           <key>
             <column name="TeachingCredentialDescriptorId" />
           </key>
@@ -5864,8 +6256,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.TechnicalSkillsAssessmentDescriptorAggregate.EdFi.TechnicalSkillsAssessmentDescriptor" table="TechnicalSkillsAssessmentDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.TechnicalSkillsAssessmentDescriptorAggregate.EdFi.TechnicalSkillsAssessmentDescriptor" lazy="false" discriminator-value="edfi.TechnicalSkillsAssessmentDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="TechnicalSkillsAssessmentDescriptor" >
           <key>
             <column name="TechnicalSkillsAssessmentDescriptorId" />
           </key>
@@ -5878,8 +6272,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.TelephoneNumberTypeDescriptorAggregate.EdFi.TelephoneNumberTypeDescriptor" table="TelephoneNumberTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.TelephoneNumberTypeDescriptorAggregate.EdFi.TelephoneNumberTypeDescriptor" lazy="false" discriminator-value="edfi.TelephoneNumberTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="TelephoneNumberTypeDescriptor" >
           <key>
             <column name="TelephoneNumberTypeDescriptorId" />
           </key>
@@ -5892,8 +6288,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.TermDescriptorAggregate.EdFi.TermDescriptor" table="TermDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.TermDescriptorAggregate.EdFi.TermDescriptor" lazy="false" discriminator-value="edfi.TermDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="TermDescriptor" >
           <key>
             <column name="TermDescriptorId" />
           </key>
@@ -5906,8 +6304,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.TitleIPartAParticipantDescriptorAggregate.EdFi.TitleIPartAParticipantDescriptor" table="TitleIPartAParticipantDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.TitleIPartAParticipantDescriptorAggregate.EdFi.TitleIPartAParticipantDescriptor" lazy="false" discriminator-value="edfi.TitleIPartAParticipantDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="TitleIPartAParticipantDescriptor" >
           <key>
             <column name="TitleIPartAParticipantDescriptorId" />
           </key>
@@ -5920,8 +6320,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.TitleIPartAProgramServiceDescriptorAggregate.EdFi.TitleIPartAProgramServiceDescriptor" table="TitleIPartAProgramServiceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.TitleIPartAProgramServiceDescriptorAggregate.EdFi.TitleIPartAProgramServiceDescriptor" lazy="false" discriminator-value="edfi.TitleIPartAProgramServiceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="TitleIPartAProgramServiceDescriptor" >
           <key>
             <column name="TitleIPartAProgramServiceDescriptorId" />
           </key>
@@ -5934,8 +6336,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.TitleIPartASchoolDesignationDescriptorAggregate.EdFi.TitleIPartASchoolDesignationDescriptor" table="TitleIPartASchoolDesignationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.TitleIPartASchoolDesignationDescriptorAggregate.EdFi.TitleIPartASchoolDesignationDescriptor" lazy="false" discriminator-value="edfi.TitleIPartASchoolDesignationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="TitleIPartASchoolDesignationDescriptor" >
           <key>
             <column name="TitleIPartASchoolDesignationDescriptorId" />
           </key>
@@ -5948,8 +6352,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.TransportationPublicExpenseEligibilityTypeDescriptorAggregate.EdFi.TransportationPublicExpenseEligibilityTypeDescriptor" table="TransportationPublicExpenseEligibilityTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.TransportationPublicExpenseEligibilityTypeDescriptorAggregate.EdFi.TransportationPublicExpenseEligibilityTypeDescriptor" lazy="false" discriminator-value="edfi.TransportationPublicExpenseEligibilityTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="TransportationPublicExpenseEligibilityTypeDescriptor" >
           <key>
             <column name="TransportationPublicExpenseEligibilityTypeDescriptorId" />
           </key>
@@ -5962,8 +6368,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.TransportationTypeDescriptorAggregate.EdFi.TransportationTypeDescriptor" table="TransportationTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.TransportationTypeDescriptorAggregate.EdFi.TransportationTypeDescriptor" lazy="false" discriminator-value="edfi.TransportationTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="TransportationTypeDescriptor" >
           <key>
             <column name="TransportationTypeDescriptorId" />
           </key>
@@ -5976,8 +6384,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.TravelDayofWeekDescriptorAggregate.EdFi.TravelDayofWeekDescriptor" table="TravelDayofWeekDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.TravelDayofWeekDescriptorAggregate.EdFi.TravelDayofWeekDescriptor" lazy="false" discriminator-value="edfi.TravelDayofWeekDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="TravelDayofWeekDescriptor" >
           <key>
             <column name="TravelDayofWeekDescriptorId" />
           </key>
@@ -5990,8 +6400,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.TravelDirectionDescriptorAggregate.EdFi.TravelDirectionDescriptor" table="TravelDirectionDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.TravelDirectionDescriptorAggregate.EdFi.TravelDirectionDescriptor" lazy="false" discriminator-value="edfi.TravelDirectionDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="TravelDirectionDescriptor" >
           <key>
             <column name="TravelDirectionDescriptorId" />
           </key>
@@ -6004,8 +6416,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.TribalAffiliationDescriptorAggregate.EdFi.TribalAffiliationDescriptor" table="TribalAffiliationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.TribalAffiliationDescriptorAggregate.EdFi.TribalAffiliationDescriptor" lazy="false" discriminator-value="edfi.TribalAffiliationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="TribalAffiliationDescriptor" >
           <key>
             <column name="TribalAffiliationDescriptorId" />
           </key>
@@ -6018,8 +6432,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.VisaDescriptorAggregate.EdFi.VisaDescriptor" table="VisaDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.VisaDescriptorAggregate.EdFi.VisaDescriptor" lazy="false" discriminator-value="edfi.VisaDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="VisaDescriptor" >
           <key>
             <column name="VisaDescriptorId" />
           </key>
@@ -6032,8 +6448,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.WeaponDescriptorAggregate.EdFi.WeaponDescriptor" table="WeaponDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.WeaponDescriptorAggregate.EdFi.WeaponDescriptor" lazy="false" discriminator-value="edfi.WeaponDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="WeaponDescriptor" >
           <key>
             <column name="WeaponDescriptorId" />
           </key>
@@ -6046,7 +6464,8 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
+      </join>
+    </subclass>
 </class>
 
 
diff --git a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/5.1.0/DataStandard_510_ApprovalTests.Verify.Standard_Std_5.1.0_EntityOrmMappings_MsSql_EntityOrmMappingsForQueries.generated.hbm.approved.xml b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/5.1.0/DataStandard_510_ApprovalTests.Verify.Standard_Std_5.1.0_EntityOrmMappings_MsSql_EntityOrmMappingsForQueries.generated.hbm.approved.xml
index 23cbccb3bd..bcf9b0c6e5 100644
--- a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/5.1.0/DataStandard_510_ApprovalTests.Verify.Standard_Std_5.1.0_EntityOrmMappings_MsSql_EntityOrmMappingsForQueries.generated.hbm.approved.xml
+++ b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/5.1.0/DataStandard_510_ApprovalTests.Verify.Standard_Std_5.1.0_EntityOrmMappings_MsSql_EntityOrmMappingsForQueries.generated.hbm.approved.xml
@@ -3342,12 +3342,13 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.DescriptorAggregate.EdFi.DescriptorQ" table="Descriptor" lazy="false" abstract="true">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.DescriptorAggregate.EdFi.DescriptorQ" table="Descriptor" lazy="false" abstract="true" discriminator-value="NULL">
     <id name="DescriptorId" column="DescriptorId" type="int">
       <generator class="identity" />
     </id>
 
     <!-- Discriminator -->
+    <discriminator column="Discriminator" type="string" />
 
     <!-- Optimistic locking for aggregate root -->
     <version name="LastModifiedDate" column="LastModifiedDate" type="UtcDateTime" />
@@ -3359,6 +3360,8 @@
     <property name="Id" column="Id" type="guid" not-null="true" />
 
     <!-- Properties -->
+    <!-- Readonly property to surface the discriminator value -->
+    <property name="Discriminator" column="Discriminator" type="string" insert="false" update="false" />
     <property name="CodeValue" column="CodeValue" type="string" length="50" not-null="true" />
     <property name="Description" column="Description" type="string" length="1024" />
     <property name="EffectiveBeginDate" column="EffectiveBeginDate" type="date" />
@@ -3372,7 +3375,8 @@
 
     <!-- Collections -->
     <!-- Derived classes -->
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AbsenceEventCategoryDescriptorAggregate.EdFi.AbsenceEventCategoryDescriptorQ" table="AbsenceEventCategoryDescriptor" lazy="false">
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AbsenceEventCategoryDescriptorAggregate.EdFi.AbsenceEventCategoryDescriptorQ" lazy="false" discriminator-value="edfi.AbsenceEventCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AbsenceEventCategoryDescriptor" >
           <key>
             <column name="AbsenceEventCategoryDescriptorId" />
           </key>
@@ -3392,8 +3396,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StaffAbsenceEventAggregate.EdFi.StaffAbsenceEventQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AcademicHonorCategoryDescriptorAggregate.EdFi.AcademicHonorCategoryDescriptorQ" table="AcademicHonorCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AcademicHonorCategoryDescriptorAggregate.EdFi.AcademicHonorCategoryDescriptorQ" lazy="false" discriminator-value="edfi.AcademicHonorCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AcademicHonorCategoryDescriptor" >
           <key>
             <column name="AcademicHonorCategoryDescriptorId" />
           </key>
@@ -3413,8 +3419,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAcademicRecordAggregate.EdFi.StudentAcademicRecordAcademicHonorQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AcademicSubjectDescriptorAggregate.EdFi.AcademicSubjectDescriptorQ" table="AcademicSubjectDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AcademicSubjectDescriptorAggregate.EdFi.AcademicSubjectDescriptorQ" lazy="false" discriminator-value="edfi.AcademicSubjectDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AcademicSubjectDescriptor" >
           <key>
             <column name="AcademicSubjectDescriptorId" />
           </key>
@@ -3504,8 +3512,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StaffSchoolAssociationAggregate.EdFi.StaffSchoolAssociationAcademicSubjectQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AccommodationDescriptorAggregate.EdFi.AccommodationDescriptorQ" table="AccommodationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AccommodationDescriptorAggregate.EdFi.AccommodationDescriptorQ" lazy="false" discriminator-value="edfi.AccommodationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AccommodationDescriptor" >
           <key>
             <column name="AccommodationDescriptorId" />
           </key>
@@ -3525,8 +3535,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAssessmentAggregate.EdFi.StudentAssessmentAccommodationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AccountTypeDescriptorAggregate.EdFi.AccountTypeDescriptorQ" table="AccountTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AccountTypeDescriptorAggregate.EdFi.AccountTypeDescriptorQ" lazy="false" discriminator-value="edfi.AccountTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AccountTypeDescriptor" >
           <key>
             <column name="AccountTypeDescriptorId" />
           </key>
@@ -3546,8 +3558,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.ChartOfAccountAggregate.EdFi.ChartOfAccountQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AchievementCategoryDescriptorAggregate.EdFi.AchievementCategoryDescriptorQ" table="AchievementCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AchievementCategoryDescriptorAggregate.EdFi.AchievementCategoryDescriptorQ" lazy="false" discriminator-value="edfi.AchievementCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AchievementCategoryDescriptor" >
           <key>
             <column name="AchievementCategoryDescriptorId" />
           </key>
@@ -3588,8 +3602,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAcademicRecordAggregate.EdFi.StudentAcademicRecordRecognitionQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AdditionalCreditTypeDescriptorAggregate.EdFi.AdditionalCreditTypeDescriptorQ" table="AdditionalCreditTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AdditionalCreditTypeDescriptorAggregate.EdFi.AdditionalCreditTypeDescriptorQ" lazy="false" discriminator-value="edfi.AdditionalCreditTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AdditionalCreditTypeDescriptor" >
           <key>
             <column name="AdditionalCreditTypeDescriptorId" />
           </key>
@@ -3609,8 +3625,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.CourseTranscriptAggregate.EdFi.CourseTranscriptEarnedAdditionalCreditsQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AddressTypeDescriptorAggregate.EdFi.AddressTypeDescriptorQ" table="AddressTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AddressTypeDescriptorAggregate.EdFi.AddressTypeDescriptorQ" lazy="false" discriminator-value="edfi.AddressTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AddressTypeDescriptor" >
           <key>
             <column name="AddressTypeDescriptorId" />
           </key>
@@ -3686,8 +3704,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationInternationalAddressQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AdministrationEnvironmentDescriptorAggregate.EdFi.AdministrationEnvironmentDescriptorQ" table="AdministrationEnvironmentDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AdministrationEnvironmentDescriptorAggregate.EdFi.AdministrationEnvironmentDescriptorQ" lazy="false" discriminator-value="edfi.AdministrationEnvironmentDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AdministrationEnvironmentDescriptor" >
           <key>
             <column name="AdministrationEnvironmentDescriptorId" />
           </key>
@@ -3707,8 +3727,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAssessmentAggregate.EdFi.StudentAssessmentQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AdministrativeFundingControlDescriptorAggregate.EdFi.AdministrativeFundingControlDescriptorQ" table="AdministrativeFundingControlDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AdministrativeFundingControlDescriptorAggregate.EdFi.AdministrativeFundingControlDescriptorQ" lazy="false" discriminator-value="edfi.AdministrativeFundingControlDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AdministrativeFundingControlDescriptor" >
           <key>
             <column name="AdministrativeFundingControlDescriptorId" />
           </key>
@@ -3735,8 +3757,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.SchoolAggregate.EdFi.SchoolQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AncestryEthnicOriginDescriptorAggregate.EdFi.AncestryEthnicOriginDescriptorQ" table="AncestryEthnicOriginDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AncestryEthnicOriginDescriptorAggregate.EdFi.AncestryEthnicOriginDescriptorQ" lazy="false" discriminator-value="edfi.AncestryEthnicOriginDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AncestryEthnicOriginDescriptor" >
           <key>
             <column name="AncestryEthnicOriginDescriptorId" />
           </key>
@@ -3763,8 +3787,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationAncestryEthnicOriginQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AssessmentCategoryDescriptorAggregate.EdFi.AssessmentCategoryDescriptorQ" table="AssessmentCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AssessmentCategoryDescriptorAggregate.EdFi.AssessmentCategoryDescriptorQ" lazy="false" discriminator-value="edfi.AssessmentCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AssessmentCategoryDescriptor" >
           <key>
             <column name="AssessmentCategoryDescriptorId" />
           </key>
@@ -3784,8 +3810,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.AssessmentAggregate.EdFi.AssessmentQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AssessmentIdentificationSystemDescriptorAggregate.EdFi.AssessmentIdentificationSystemDescriptorQ" table="AssessmentIdentificationSystemDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AssessmentIdentificationSystemDescriptorAggregate.EdFi.AssessmentIdentificationSystemDescriptorQ" lazy="false" discriminator-value="edfi.AssessmentIdentificationSystemDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AssessmentIdentificationSystemDescriptor" >
           <key>
             <column name="AssessmentIdentificationSystemDescriptorId" />
           </key>
@@ -3805,8 +3833,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.AssessmentAggregate.EdFi.AssessmentIdentificationCodeQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AssessmentItemCategoryDescriptorAggregate.EdFi.AssessmentItemCategoryDescriptorQ" table="AssessmentItemCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AssessmentItemCategoryDescriptorAggregate.EdFi.AssessmentItemCategoryDescriptorQ" lazy="false" discriminator-value="edfi.AssessmentItemCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AssessmentItemCategoryDescriptor" >
           <key>
             <column name="AssessmentItemCategoryDescriptorId" />
           </key>
@@ -3826,8 +3856,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.AssessmentItemAggregate.EdFi.AssessmentItemQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AssessmentItemResultDescriptorAggregate.EdFi.AssessmentItemResultDescriptorQ" table="AssessmentItemResultDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AssessmentItemResultDescriptorAggregate.EdFi.AssessmentItemResultDescriptorQ" lazy="false" discriminator-value="edfi.AssessmentItemResultDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AssessmentItemResultDescriptor" >
           <key>
             <column name="AssessmentItemResultDescriptorId" />
           </key>
@@ -3847,8 +3879,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAssessmentAggregate.EdFi.StudentAssessmentItemQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AssessmentPeriodDescriptorAggregate.EdFi.AssessmentPeriodDescriptorQ" table="AssessmentPeriodDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AssessmentPeriodDescriptorAggregate.EdFi.AssessmentPeriodDescriptorQ" lazy="false" discriminator-value="edfi.AssessmentPeriodDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AssessmentPeriodDescriptor" >
           <key>
             <column name="AssessmentPeriodDescriptorId" />
           </key>
@@ -3875,8 +3909,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAssessmentAggregate.EdFi.StudentAssessmentPeriodQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AssessmentReportingMethodDescriptorAggregate.EdFi.AssessmentReportingMethodDescriptorQ" table="AssessmentReportingMethodDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AssessmentReportingMethodDescriptorAggregate.EdFi.AssessmentReportingMethodDescriptorQ" lazy="false" discriminator-value="edfi.AssessmentReportingMethodDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AssessmentReportingMethodDescriptor" >
           <key>
             <column name="AssessmentReportingMethodDescriptorId" />
           </key>
@@ -3966,8 +4002,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAssessmentAggregate.EdFi.StudentAssessmentStudentObjectiveAssessmentScoreResultQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AssignmentLateStatusDescriptorAggregate.EdFi.AssignmentLateStatusDescriptorQ" table="AssignmentLateStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AssignmentLateStatusDescriptorAggregate.EdFi.AssignmentLateStatusDescriptorQ" lazy="false" discriminator-value="edfi.AssignmentLateStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AssignmentLateStatusDescriptor" >
           <key>
             <column name="AssignmentLateStatusDescriptorId" />
           </key>
@@ -3987,8 +4025,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentGradebookEntryAggregate.EdFi.StudentGradebookEntryQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AttemptStatusDescriptorAggregate.EdFi.AttemptStatusDescriptorQ" table="AttemptStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AttemptStatusDescriptorAggregate.EdFi.AttemptStatusDescriptorQ" lazy="false" discriminator-value="edfi.AttemptStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AttemptStatusDescriptor" >
           <key>
             <column name="AttemptStatusDescriptorId" />
           </key>
@@ -4008,8 +4048,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSectionAssociationAggregate.EdFi.StudentSectionAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AttendanceEventCategoryDescriptorAggregate.EdFi.AttendanceEventCategoryDescriptorQ" table="AttendanceEventCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AttendanceEventCategoryDescriptorAggregate.EdFi.AttendanceEventCategoryDescriptorQ" lazy="false" discriminator-value="edfi.AttendanceEventCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AttendanceEventCategoryDescriptor" >
           <key>
             <column name="AttendanceEventCategoryDescriptorId" />
           </key>
@@ -4050,8 +4092,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSectionAttendanceEventAggregate.EdFi.StudentSectionAttendanceEventQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.BarrierToInternetAccessInResidenceDescriptorAggregate.EdFi.BarrierToInternetAccessInResidenceDescriptorQ" table="BarrierToInternetAccessInResidenceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.BarrierToInternetAccessInResidenceDescriptorAggregate.EdFi.BarrierToInternetAccessInResidenceDescriptorQ" lazy="false" discriminator-value="edfi.BarrierToInternetAccessInResidenceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="BarrierToInternetAccessInResidenceDescriptor" >
           <key>
             <column name="BarrierToInternetAccessInResidenceDescriptorId" />
           </key>
@@ -4071,8 +4115,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.BehaviorDescriptorAggregate.EdFi.BehaviorDescriptorQ" table="BehaviorDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.BehaviorDescriptorAggregate.EdFi.BehaviorDescriptorQ" lazy="false" discriminator-value="edfi.BehaviorDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="BehaviorDescriptor" >
           <key>
             <column name="BehaviorDescriptorId" />
           </key>
@@ -4099,8 +4145,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentDisciplineIncidentBehaviorAssociationAggregate.EdFi.StudentDisciplineIncidentBehaviorAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.BusRouteDescriptorAggregate.EdFi.BusRouteDescriptorQ" table="BusRouteDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.BusRouteDescriptorAggregate.EdFi.BusRouteDescriptorQ" lazy="false" discriminator-value="edfi.BusRouteDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="BusRouteDescriptor" >
           <key>
             <column name="BusRouteDescriptorId" />
           </key>
@@ -4120,8 +4168,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentTransportationAggregate.EdFi.StudentTransportationStudentBusDetailsQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CalendarEventDescriptorAggregate.EdFi.CalendarEventDescriptorQ" table="CalendarEventDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CalendarEventDescriptorAggregate.EdFi.CalendarEventDescriptorQ" lazy="false" discriminator-value="edfi.CalendarEventDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CalendarEventDescriptor" >
           <key>
             <column name="CalendarEventDescriptorId" />
           </key>
@@ -4141,8 +4191,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.CalendarDateAggregate.EdFi.CalendarDateCalendarEventQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CalendarTypeDescriptorAggregate.EdFi.CalendarTypeDescriptorQ" table="CalendarTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CalendarTypeDescriptorAggregate.EdFi.CalendarTypeDescriptorQ" lazy="false" discriminator-value="edfi.CalendarTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CalendarTypeDescriptor" >
           <key>
             <column name="CalendarTypeDescriptorId" />
           </key>
@@ -4162,8 +4214,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.CalendarAggregate.EdFi.CalendarQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CareerPathwayDescriptorAggregate.EdFi.CareerPathwayDescriptorQ" table="CareerPathwayDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CareerPathwayDescriptorAggregate.EdFi.CareerPathwayDescriptorQ" lazy="false" discriminator-value="edfi.CareerPathwayDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CareerPathwayDescriptor" >
           <key>
             <column name="CareerPathwayDescriptorId" />
           </key>
@@ -4183,8 +4237,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.CourseAggregate.EdFi.CourseQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CharterApprovalAgencyTypeDescriptorAggregate.EdFi.CharterApprovalAgencyTypeDescriptorQ" table="CharterApprovalAgencyTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CharterApprovalAgencyTypeDescriptorAggregate.EdFi.CharterApprovalAgencyTypeDescriptorQ" lazy="false" discriminator-value="edfi.CharterApprovalAgencyTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CharterApprovalAgencyTypeDescriptor" >
           <key>
             <column name="CharterApprovalAgencyTypeDescriptorId" />
           </key>
@@ -4204,8 +4260,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.SchoolAggregate.EdFi.SchoolQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CharterStatusDescriptorAggregate.EdFi.CharterStatusDescriptorQ" table="CharterStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CharterStatusDescriptorAggregate.EdFi.CharterStatusDescriptorQ" lazy="false" discriminator-value="edfi.CharterStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CharterStatusDescriptor" >
           <key>
             <column name="CharterStatusDescriptorId" />
           </key>
@@ -4232,8 +4290,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.SchoolAggregate.EdFi.SchoolQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CitizenshipStatusDescriptorAggregate.EdFi.CitizenshipStatusDescriptorQ" table="CitizenshipStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CitizenshipStatusDescriptorAggregate.EdFi.CitizenshipStatusDescriptorQ" lazy="false" discriminator-value="edfi.CitizenshipStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CitizenshipStatusDescriptor" >
           <key>
             <column name="CitizenshipStatusDescriptorId" />
           </key>
@@ -4260,8 +4320,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAggregate.EdFi.StudentQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ClassroomPositionDescriptorAggregate.EdFi.ClassroomPositionDescriptorQ" table="ClassroomPositionDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ClassroomPositionDescriptorAggregate.EdFi.ClassroomPositionDescriptorQ" lazy="false" discriminator-value="edfi.ClassroomPositionDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ClassroomPositionDescriptor" >
           <key>
             <column name="ClassroomPositionDescriptorId" />
           </key>
@@ -4281,8 +4343,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StaffSectionAssociationAggregate.EdFi.StaffSectionAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CohortScopeDescriptorAggregate.EdFi.CohortScopeDescriptorQ" table="CohortScopeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CohortScopeDescriptorAggregate.EdFi.CohortScopeDescriptorQ" lazy="false" discriminator-value="edfi.CohortScopeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CohortScopeDescriptor" >
           <key>
             <column name="CohortScopeDescriptorId" />
           </key>
@@ -4302,8 +4366,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.CohortAggregate.EdFi.CohortQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CohortTypeDescriptorAggregate.EdFi.CohortTypeDescriptorQ" table="CohortTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CohortTypeDescriptorAggregate.EdFi.CohortTypeDescriptorQ" lazy="false" discriminator-value="edfi.CohortTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CohortTypeDescriptor" >
           <key>
             <column name="CohortTypeDescriptorId" />
           </key>
@@ -4323,8 +4389,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.CohortAggregate.EdFi.CohortQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CohortYearTypeDescriptorAggregate.EdFi.CohortYearTypeDescriptorQ" table="CohortYearTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CohortYearTypeDescriptorAggregate.EdFi.CohortYearTypeDescriptorQ" lazy="false" discriminator-value="edfi.CohortYearTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CohortYearTypeDescriptor" >
           <key>
             <column name="CohortYearTypeDescriptorId" />
           </key>
@@ -4344,8 +4412,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationCohortYearQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CompetencyLevelDescriptorAggregate.EdFi.CompetencyLevelDescriptorQ" table="CompetencyLevelDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CompetencyLevelDescriptorAggregate.EdFi.CompetencyLevelDescriptorQ" lazy="false" discriminator-value="edfi.CompetencyLevelDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CompetencyLevelDescriptor" >
           <key>
             <column name="CompetencyLevelDescriptorId" />
           </key>
@@ -4379,8 +4449,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentGradebookEntryAggregate.EdFi.StudentGradebookEntryQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ContactTypeDescriptorAggregate.EdFi.ContactTypeDescriptorQ" table="ContactTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ContactTypeDescriptorAggregate.EdFi.ContactTypeDescriptorQ" lazy="false" discriminator-value="edfi.ContactTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ContactTypeDescriptor" >
           <key>
             <column name="ContactTypeDescriptorId" />
           </key>
@@ -4400,8 +4472,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StaffEducationOrganizationContactAssociationAggregate.EdFi.StaffEducationOrganizationContactAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ContentClassDescriptorAggregate.EdFi.ContentClassDescriptorQ" table="ContentClassDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ContentClassDescriptorAggregate.EdFi.ContentClassDescriptorQ" lazy="false" discriminator-value="edfi.ContentClassDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ContentClassDescriptor" >
           <key>
             <column name="ContentClassDescriptorId" />
           </key>
@@ -4421,8 +4495,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.EducationContentAggregate.EdFi.EducationContentQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ContinuationOfServicesReasonDescriptorAggregate.EdFi.ContinuationOfServicesReasonDescriptorQ" table="ContinuationOfServicesReasonDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ContinuationOfServicesReasonDescriptorAggregate.EdFi.ContinuationOfServicesReasonDescriptorQ" lazy="false" discriminator-value="edfi.ContinuationOfServicesReasonDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ContinuationOfServicesReasonDescriptor" >
           <key>
             <column name="ContinuationOfServicesReasonDescriptorId" />
           </key>
@@ -4442,8 +4518,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentMigrantEducationProgramAssociationAggregate.EdFi.StudentMigrantEducationProgramAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CostRateDescriptorAggregate.EdFi.CostRateDescriptorQ" table="CostRateDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CostRateDescriptorAggregate.EdFi.CostRateDescriptorQ" lazy="false" discriminator-value="edfi.CostRateDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CostRateDescriptor" >
           <key>
             <column name="CostRateDescriptorId" />
           </key>
@@ -4463,8 +4541,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.EducationContentAggregate.EdFi.EducationContentQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CountryDescriptorAggregate.EdFi.CountryDescriptorQ" table="CountryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CountryDescriptorAggregate.EdFi.CountryDescriptorQ" lazy="false" discriminator-value="edfi.CountryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CountryDescriptor" >
           <key>
             <column name="CountryDescriptorId" />
           </key>
@@ -4547,8 +4627,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAggregate.EdFi.StudentPersonalIdentificationDocumentQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CourseAttemptResultDescriptorAggregate.EdFi.CourseAttemptResultDescriptorQ" table="CourseAttemptResultDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CourseAttemptResultDescriptorAggregate.EdFi.CourseAttemptResultDescriptorQ" lazy="false" discriminator-value="edfi.CourseAttemptResultDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CourseAttemptResultDescriptor" >
           <key>
             <column name="CourseAttemptResultDescriptorId" />
           </key>
@@ -4568,8 +4650,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.CourseTranscriptAggregate.EdFi.CourseTranscriptQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CourseDefinedByDescriptorAggregate.EdFi.CourseDefinedByDescriptorQ" table="CourseDefinedByDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CourseDefinedByDescriptorAggregate.EdFi.CourseDefinedByDescriptorQ" lazy="false" discriminator-value="edfi.CourseDefinedByDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CourseDefinedByDescriptor" >
           <key>
             <column name="CourseDefinedByDescriptorId" />
           </key>
@@ -4589,8 +4673,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.CourseAggregate.EdFi.CourseQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CourseGPAApplicabilityDescriptorAggregate.EdFi.CourseGPAApplicabilityDescriptorQ" table="CourseGPAApplicabilityDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CourseGPAApplicabilityDescriptorAggregate.EdFi.CourseGPAApplicabilityDescriptorQ" lazy="false" discriminator-value="edfi.CourseGPAApplicabilityDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CourseGPAApplicabilityDescriptor" >
           <key>
             <column name="CourseGPAApplicabilityDescriptorId" />
           </key>
@@ -4610,8 +4696,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.CourseAggregate.EdFi.CourseQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CourseIdentificationSystemDescriptorAggregate.EdFi.CourseIdentificationSystemDescriptorQ" table="CourseIdentificationSystemDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CourseIdentificationSystemDescriptorAggregate.EdFi.CourseIdentificationSystemDescriptorQ" lazy="false" discriminator-value="edfi.CourseIdentificationSystemDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CourseIdentificationSystemDescriptor" >
           <key>
             <column name="CourseIdentificationSystemDescriptorId" />
           </key>
@@ -4638,8 +4726,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.CourseTranscriptAggregate.EdFi.CourseTranscriptAlternativeCourseIdentificationCodeQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CourseLevelCharacteristicDescriptorAggregate.EdFi.CourseLevelCharacteristicDescriptorQ" table="CourseLevelCharacteristicDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CourseLevelCharacteristicDescriptorAggregate.EdFi.CourseLevelCharacteristicDescriptorQ" lazy="false" discriminator-value="edfi.CourseLevelCharacteristicDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CourseLevelCharacteristicDescriptor" >
           <key>
             <column name="CourseLevelCharacteristicDescriptorId" />
           </key>
@@ -4673,8 +4763,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.SectionAggregate.EdFi.SectionCourseLevelCharacteristicQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CourseRepeatCodeDescriptorAggregate.EdFi.CourseRepeatCodeDescriptorQ" table="CourseRepeatCodeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CourseRepeatCodeDescriptorAggregate.EdFi.CourseRepeatCodeDescriptorQ" lazy="false" discriminator-value="edfi.CourseRepeatCodeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CourseRepeatCodeDescriptor" >
           <key>
             <column name="CourseRepeatCodeDescriptorId" />
           </key>
@@ -4694,8 +4786,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.CourseTranscriptAggregate.EdFi.CourseTranscriptQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CredentialFieldDescriptorAggregate.EdFi.CredentialFieldDescriptorQ" table="CredentialFieldDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CredentialFieldDescriptorAggregate.EdFi.CredentialFieldDescriptorQ" lazy="false" discriminator-value="edfi.CredentialFieldDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CredentialFieldDescriptor" >
           <key>
             <column name="CredentialFieldDescriptorId" />
           </key>
@@ -4715,8 +4809,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.CredentialAggregate.EdFi.CredentialQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CredentialTypeDescriptorAggregate.EdFi.CredentialTypeDescriptorQ" table="CredentialTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CredentialTypeDescriptorAggregate.EdFi.CredentialTypeDescriptorQ" lazy="false" discriminator-value="edfi.CredentialTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CredentialTypeDescriptor" >
           <key>
             <column name="CredentialTypeDescriptorId" />
           </key>
@@ -4736,8 +4832,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.CredentialAggregate.EdFi.CredentialQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CreditCategoryDescriptorAggregate.EdFi.CreditCategoryDescriptorQ" table="CreditCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CreditCategoryDescriptorAggregate.EdFi.CreditCategoryDescriptorQ" lazy="false" discriminator-value="edfi.CreditCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CreditCategoryDescriptor" >
           <key>
             <column name="CreditCategoryDescriptorId" />
           </key>
@@ -4764,8 +4862,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.GraduationPlanAggregate.EdFi.GraduationPlanCreditsByCreditCategoryQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CreditTypeDescriptorAggregate.EdFi.CreditTypeDescriptorQ" table="CreditTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CreditTypeDescriptorAggregate.EdFi.CreditTypeDescriptorQ" lazy="false" discriminator-value="edfi.CreditTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CreditTypeDescriptor" >
           <key>
             <column name="CreditTypeDescriptorId" />
           </key>
@@ -4869,8 +4969,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAcademicRecordAggregate.EdFi.StudentAcademicRecordQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CrisisTypeDescriptorAggregate.EdFi.CrisisTypeDescriptorQ" table="CrisisTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CrisisTypeDescriptorAggregate.EdFi.CrisisTypeDescriptorQ" lazy="false" discriminator-value="edfi.CrisisTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CrisisTypeDescriptor" >
           <key>
             <column name="CrisisTypeDescriptorId" />
           </key>
@@ -4890,8 +4992,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.CrisisEventAggregate.EdFi.CrisisEventQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CTEProgramServiceDescriptorAggregate.EdFi.CTEProgramServiceDescriptorQ" table="CTEProgramServiceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CTEProgramServiceDescriptorAggregate.EdFi.CTEProgramServiceDescriptorQ" lazy="false" discriminator-value="edfi.CTEProgramServiceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CTEProgramServiceDescriptor" >
           <key>
             <column name="CTEProgramServiceDescriptorId" />
           </key>
@@ -4911,8 +5015,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentCTEProgramAssociationAggregate.EdFi.StudentCTEProgramAssociationCTEProgramServiceQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CurriculumUsedDescriptorAggregate.EdFi.CurriculumUsedDescriptorQ" table="CurriculumUsedDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CurriculumUsedDescriptorAggregate.EdFi.CurriculumUsedDescriptorQ" lazy="false" discriminator-value="edfi.CurriculumUsedDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CurriculumUsedDescriptor" >
           <key>
             <column name="CurriculumUsedDescriptorId" />
           </key>
@@ -4932,8 +5038,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.CourseOfferingAggregate.EdFi.CourseOfferingCurriculumUsedQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.DeliveryMethodDescriptorAggregate.EdFi.DeliveryMethodDescriptorQ" table="DeliveryMethodDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.DeliveryMethodDescriptorAggregate.EdFi.DeliveryMethodDescriptorQ" lazy="false" discriminator-value="edfi.DeliveryMethodDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="DeliveryMethodDescriptor" >
           <key>
             <column name="DeliveryMethodDescriptorId" />
           </key>
@@ -4967,8 +5075,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.InterventionStudyAggregate.EdFi.InterventionStudyQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.DiagnosisDescriptorAggregate.EdFi.DiagnosisDescriptorQ" table="DiagnosisDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.DiagnosisDescriptorAggregate.EdFi.DiagnosisDescriptorQ" lazy="false" discriminator-value="edfi.DiagnosisDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="DiagnosisDescriptor" >
           <key>
             <column name="DiagnosisDescriptorId" />
           </key>
@@ -5009,8 +5119,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentInterventionAssociationAggregate.EdFi.StudentInterventionAssociationInterventionEffectivenessQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.DiplomaLevelDescriptorAggregate.EdFi.DiplomaLevelDescriptorQ" table="DiplomaLevelDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.DiplomaLevelDescriptorAggregate.EdFi.DiplomaLevelDescriptorQ" lazy="false" discriminator-value="edfi.DiplomaLevelDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="DiplomaLevelDescriptor" >
           <key>
             <column name="DiplomaLevelDescriptorId" />
           </key>
@@ -5030,8 +5142,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAcademicRecordAggregate.EdFi.StudentAcademicRecordDiplomaQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.DiplomaTypeDescriptorAggregate.EdFi.DiplomaTypeDescriptorQ" table="DiplomaTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.DiplomaTypeDescriptorAggregate.EdFi.DiplomaTypeDescriptorQ" lazy="false" discriminator-value="edfi.DiplomaTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="DiplomaTypeDescriptor" >
           <key>
             <column name="DiplomaTypeDescriptorId" />
           </key>
@@ -5051,8 +5165,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAcademicRecordAggregate.EdFi.StudentAcademicRecordDiplomaQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.DisabilityDescriptorAggregate.EdFi.DisabilityDescriptorQ" table="DisabilityDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.DisabilityDescriptorAggregate.EdFi.DisabilityDescriptorQ" lazy="false" discriminator-value="edfi.DisabilityDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="DisabilityDescriptor" >
           <key>
             <column name="DisabilityDescriptorId" />
           </key>
@@ -5079,8 +5195,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSpecialEducationProgramAssociationAggregate.EdFi.StudentSpecialEducationProgramAssociationDisabilityQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.DisabilityDesignationDescriptorAggregate.EdFi.DisabilityDesignationDescriptorQ" table="DisabilityDesignationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.DisabilityDesignationDescriptorAggregate.EdFi.DisabilityDesignationDescriptorQ" lazy="false" discriminator-value="edfi.DisabilityDesignationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="DisabilityDesignationDescriptor" >
           <key>
             <column name="DisabilityDesignationDescriptorId" />
           </key>
@@ -5107,8 +5225,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSpecialEducationProgramAssociationAggregate.EdFi.StudentSpecialEducationProgramAssociationDisabilityDesignationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.DisabilityDeterminationSourceTypeDescriptorAggregate.EdFi.DisabilityDeterminationSourceTypeDescriptorQ" table="DisabilityDeterminationSourceTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.DisabilityDeterminationSourceTypeDescriptorAggregate.EdFi.DisabilityDeterminationSourceTypeDescriptorQ" lazy="false" discriminator-value="edfi.DisabilityDeterminationSourceTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="DisabilityDeterminationSourceTypeDescriptor" >
           <key>
             <column name="DisabilityDeterminationSourceTypeDescriptorId" />
           </key>
@@ -5135,8 +5255,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSpecialEducationProgramAssociationAggregate.EdFi.StudentSpecialEducationProgramAssociationDisabilityQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.DisciplineActionLengthDifferenceReasonDescriptorAggregate.EdFi.DisciplineActionLengthDifferenceReasonDescriptorQ" table="DisciplineActionLengthDifferenceReasonDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.DisciplineActionLengthDifferenceReasonDescriptorAggregate.EdFi.DisciplineActionLengthDifferenceReasonDescriptorQ" lazy="false" discriminator-value="edfi.DisciplineActionLengthDifferenceReasonDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="DisciplineActionLengthDifferenceReasonDescriptor" >
           <key>
             <column name="DisciplineActionLengthDifferenceReasonDescriptorId" />
           </key>
@@ -5156,8 +5278,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.DisciplineActionAggregate.EdFi.DisciplineActionQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.DisciplineDescriptorAggregate.EdFi.DisciplineDescriptorQ" table="DisciplineDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.DisciplineDescriptorAggregate.EdFi.DisciplineDescriptorQ" lazy="false" discriminator-value="edfi.DisciplineDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="DisciplineDescriptor" >
           <key>
             <column name="DisciplineDescriptorId" />
           </key>
@@ -5177,8 +5301,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.DisciplineActionAggregate.EdFi.DisciplineActionDisciplineQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.DisciplineIncidentParticipationCodeDescriptorAggregate.EdFi.DisciplineIncidentParticipationCodeDescriptorQ" table="DisciplineIncidentParticipationCodeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.DisciplineIncidentParticipationCodeDescriptorAggregate.EdFi.DisciplineIncidentParticipationCodeDescriptorQ" lazy="false" discriminator-value="edfi.DisciplineIncidentParticipationCodeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="DisciplineIncidentParticipationCodeDescriptor" >
           <key>
             <column name="DisciplineIncidentParticipationCodeDescriptorId" />
           </key>
@@ -5219,8 +5345,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentDisciplineIncidentNonOffenderAssociationAggregate.EdFi.StudentDisciplineIncidentNonOffenderAssociationDisciplineIncidentParticipationCodeQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.DisplacedStudentStatusDescriptorAggregate.EdFi.DisplacedStudentStatusDescriptorQ" table="DisplacedStudentStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.DisplacedStudentStatusDescriptorAggregate.EdFi.DisplacedStudentStatusDescriptorQ" lazy="false" discriminator-value="edfi.DisplacedStudentStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="DisplacedStudentStatusDescriptor" >
           <key>
             <column name="DisplacedStudentStatusDescriptorId" />
           </key>
@@ -5240,8 +5368,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationDisplacedStudentQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.EducationalEnvironmentDescriptorAggregate.EdFi.EducationalEnvironmentDescriptorQ" table="EducationalEnvironmentDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.EducationalEnvironmentDescriptorAggregate.EdFi.EducationalEnvironmentDescriptorQ" lazy="false" discriminator-value="edfi.EducationalEnvironmentDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="EducationalEnvironmentDescriptor" >
           <key>
             <column name="EducationalEnvironmentDescriptorId" />
           </key>
@@ -5296,8 +5426,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSectionAttendanceEventAggregate.EdFi.StudentSectionAttendanceEventQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.EducationOrganizationAssociationTypeDescriptorAggregate.EdFi.EducationOrganizationAssociationTypeDescriptorQ" table="EducationOrganizationAssociationTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.EducationOrganizationAssociationTypeDescriptorAggregate.EdFi.EducationOrganizationAssociationTypeDescriptorQ" lazy="false" discriminator-value="edfi.EducationOrganizationAssociationTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="EducationOrganizationAssociationTypeDescriptor" >
           <key>
             <column name="EducationOrganizationAssociationTypeDescriptorId" />
           </key>
@@ -5317,8 +5449,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAssessmentEducationOrganizationAssociationAggregate.EdFi.StudentAssessmentEducationOrganizationAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.EducationOrganizationCategoryDescriptorAggregate.EdFi.EducationOrganizationCategoryDescriptorQ" table="EducationOrganizationCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.EducationOrganizationCategoryDescriptorAggregate.EdFi.EducationOrganizationCategoryDescriptorQ" lazy="false" discriminator-value="edfi.EducationOrganizationCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="EducationOrganizationCategoryDescriptor" >
           <key>
             <column name="EducationOrganizationCategoryDescriptorId" />
           </key>
@@ -5338,8 +5472,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.EducationOrganizationAggregate.EdFi.EducationOrganizationCategoryQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.EducationOrganizationIdentificationSystemDescriptorAggregate.EdFi.EducationOrganizationIdentificationSystemDescriptorQ" table="EducationOrganizationIdentificationSystemDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.EducationOrganizationIdentificationSystemDescriptorAggregate.EdFi.EducationOrganizationIdentificationSystemDescriptorQ" lazy="false" discriminator-value="edfi.EducationOrganizationIdentificationSystemDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="EducationOrganizationIdentificationSystemDescriptor" >
           <key>
             <column name="EducationOrganizationIdentificationSystemDescriptorId" />
           </key>
@@ -5359,8 +5495,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.EducationOrganizationAggregate.EdFi.EducationOrganizationIdentificationCodeQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.EducationPlanDescriptorAggregate.EdFi.EducationPlanDescriptorQ" table="EducationPlanDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.EducationPlanDescriptorAggregate.EdFi.EducationPlanDescriptorQ" lazy="false" discriminator-value="edfi.EducationPlanDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="EducationPlanDescriptor" >
           <key>
             <column name="EducationPlanDescriptorId" />
           </key>
@@ -5380,8 +5518,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSchoolAssociationAggregate.EdFi.StudentSchoolAssociationEducationPlanQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ElectronicMailTypeDescriptorAggregate.EdFi.ElectronicMailTypeDescriptorQ" table="ElectronicMailTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ElectronicMailTypeDescriptorAggregate.EdFi.ElectronicMailTypeDescriptorQ" lazy="false" discriminator-value="edfi.ElectronicMailTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ElectronicMailTypeDescriptor" >
           <key>
             <column name="ElectronicMailTypeDescriptorId" />
           </key>
@@ -5415,8 +5555,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationElectronicMailQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.EligibilityDelayReasonDescriptorAggregate.EdFi.EligibilityDelayReasonDescriptorQ" table="EligibilityDelayReasonDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.EligibilityDelayReasonDescriptorAggregate.EdFi.EligibilityDelayReasonDescriptorQ" lazy="false" discriminator-value="edfi.EligibilityDelayReasonDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="EligibilityDelayReasonDescriptor" >
           <key>
             <column name="EligibilityDelayReasonDescriptorId" />
           </key>
@@ -5436,8 +5578,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSpecialEducationProgramEligibilityAssociationAggregate.EdFi.StudentSpecialEducationProgramEligibilityAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.EligibilityEvaluationTypeDescriptorAggregate.EdFi.EligibilityEvaluationTypeDescriptorQ" table="EligibilityEvaluationTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.EligibilityEvaluationTypeDescriptorAggregate.EdFi.EligibilityEvaluationTypeDescriptorQ" lazy="false" discriminator-value="edfi.EligibilityEvaluationTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="EligibilityEvaluationTypeDescriptor" >
           <key>
             <column name="EligibilityEvaluationTypeDescriptorId" />
           </key>
@@ -5457,8 +5601,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSpecialEducationProgramEligibilityAssociationAggregate.EdFi.StudentSpecialEducationProgramEligibilityAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.EmploymentStatusDescriptorAggregate.EdFi.EmploymentStatusDescriptorQ" table="EmploymentStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.EmploymentStatusDescriptorAggregate.EdFi.EmploymentStatusDescriptorQ" lazy="false" discriminator-value="edfi.EmploymentStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="EmploymentStatusDescriptor" >
           <key>
             <column name="EmploymentStatusDescriptorId" />
           </key>
@@ -5485,8 +5631,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StaffEducationOrganizationEmploymentAssociationAggregate.EdFi.StaffEducationOrganizationEmploymentAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.EnrollmentTypeDescriptorAggregate.EdFi.EnrollmentTypeDescriptorQ" table="EnrollmentTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.EnrollmentTypeDescriptorAggregate.EdFi.EnrollmentTypeDescriptorQ" lazy="false" discriminator-value="edfi.EnrollmentTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="EnrollmentTypeDescriptor" >
           <key>
             <column name="EnrollmentTypeDescriptorId" />
           </key>
@@ -5506,8 +5654,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSchoolAssociationAggregate.EdFi.StudentSchoolAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.EntryGradeLevelReasonDescriptorAggregate.EdFi.EntryGradeLevelReasonDescriptorQ" table="EntryGradeLevelReasonDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.EntryGradeLevelReasonDescriptorAggregate.EdFi.EntryGradeLevelReasonDescriptorQ" lazy="false" discriminator-value="edfi.EntryGradeLevelReasonDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="EntryGradeLevelReasonDescriptor" >
           <key>
             <column name="EntryGradeLevelReasonDescriptorId" />
           </key>
@@ -5527,8 +5677,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSchoolAssociationAggregate.EdFi.StudentSchoolAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.EntryTypeDescriptorAggregate.EdFi.EntryTypeDescriptorQ" table="EntryTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.EntryTypeDescriptorAggregate.EdFi.EntryTypeDescriptorQ" lazy="false" discriminator-value="edfi.EntryTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="EntryTypeDescriptor" >
           <key>
             <column name="EntryTypeDescriptorId" />
           </key>
@@ -5548,8 +5700,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSchoolAssociationAggregate.EdFi.StudentSchoolAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.EvaluationDelayReasonDescriptorAggregate.EdFi.EvaluationDelayReasonDescriptorQ" table="EvaluationDelayReasonDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.EvaluationDelayReasonDescriptorAggregate.EdFi.EvaluationDelayReasonDescriptorQ" lazy="false" discriminator-value="edfi.EvaluationDelayReasonDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="EvaluationDelayReasonDescriptor" >
           <key>
             <column name="EvaluationDelayReasonDescriptorId" />
           </key>
@@ -5569,8 +5723,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSpecialEducationProgramEligibilityAssociationAggregate.EdFi.StudentSpecialEducationProgramEligibilityAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.EventCircumstanceDescriptorAggregate.EdFi.EventCircumstanceDescriptorQ" table="EventCircumstanceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.EventCircumstanceDescriptorAggregate.EdFi.EventCircumstanceDescriptorQ" lazy="false" discriminator-value="edfi.EventCircumstanceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="EventCircumstanceDescriptor" >
           <key>
             <column name="EventCircumstanceDescriptorId" />
           </key>
@@ -5590,8 +5746,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAssessmentAggregate.EdFi.StudentAssessmentQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ExitWithdrawTypeDescriptorAggregate.EdFi.ExitWithdrawTypeDescriptorQ" table="ExitWithdrawTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ExitWithdrawTypeDescriptorAggregate.EdFi.ExitWithdrawTypeDescriptorQ" lazy="false" discriminator-value="edfi.ExitWithdrawTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ExitWithdrawTypeDescriptor" >
           <key>
             <column name="ExitWithdrawTypeDescriptorId" />
           </key>
@@ -5611,8 +5769,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSchoolAssociationAggregate.EdFi.StudentSchoolAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.FinancialCollectionDescriptorAggregate.EdFi.FinancialCollectionDescriptorQ" table="FinancialCollectionDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.FinancialCollectionDescriptorAggregate.EdFi.FinancialCollectionDescriptorQ" lazy="false" discriminator-value="edfi.FinancialCollectionDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="FinancialCollectionDescriptor" >
           <key>
             <column name="FinancialCollectionDescriptorId" />
           </key>
@@ -5660,8 +5820,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.LocalPayrollAggregate.EdFi.LocalPayrollQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.GradebookEntryTypeDescriptorAggregate.EdFi.GradebookEntryTypeDescriptorQ" table="GradebookEntryTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.GradebookEntryTypeDescriptorAggregate.EdFi.GradebookEntryTypeDescriptorQ" lazy="false" discriminator-value="edfi.GradebookEntryTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="GradebookEntryTypeDescriptor" >
           <key>
             <column name="GradebookEntryTypeDescriptorId" />
           </key>
@@ -5681,8 +5843,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.GradebookEntryAggregate.EdFi.GradebookEntryQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.GradeLevelDescriptorAggregate.EdFi.GradeLevelDescriptorQ" table="GradeLevelDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.GradeLevelDescriptorAggregate.EdFi.GradeLevelDescriptorQ" lazy="false" discriminator-value="edfi.GradeLevelDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="GradeLevelDescriptor" >
           <key>
             <column name="GradeLevelDescriptorId" />
           </key>
@@ -5856,8 +6020,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSchoolAssociationAggregate.EdFi.StudentSchoolAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.GradePointAverageTypeDescriptorAggregate.EdFi.GradePointAverageTypeDescriptorQ" table="GradePointAverageTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.GradePointAverageTypeDescriptorAggregate.EdFi.GradePointAverageTypeDescriptorQ" lazy="false" discriminator-value="edfi.GradePointAverageTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="GradePointAverageTypeDescriptor" >
           <key>
             <column name="GradePointAverageTypeDescriptorId" />
           </key>
@@ -5884,8 +6050,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAcademicRecordAggregate.EdFi.StudentAcademicRecordGradePointAverageQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.GradeTypeDescriptorAggregate.EdFi.GradeTypeDescriptorQ" table="GradeTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.GradeTypeDescriptorAggregate.EdFi.GradeTypeDescriptorQ" lazy="false" discriminator-value="edfi.GradeTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="GradeTypeDescriptor" >
           <key>
             <column name="GradeTypeDescriptorId" />
           </key>
@@ -5905,8 +6073,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.GradeAggregate.EdFi.GradeQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.GradingPeriodDescriptorAggregate.EdFi.GradingPeriodDescriptorQ" table="GradingPeriodDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.GradingPeriodDescriptorAggregate.EdFi.GradingPeriodDescriptorQ" lazy="false" discriminator-value="edfi.GradingPeriodDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="GradingPeriodDescriptor" >
           <key>
             <column name="GradingPeriodDescriptorId" />
           </key>
@@ -5926,8 +6096,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.GradingPeriodAggregate.EdFi.GradingPeriodQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.GraduationPlanTypeDescriptorAggregate.EdFi.GraduationPlanTypeDescriptorQ" table="GraduationPlanTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.GraduationPlanTypeDescriptorAggregate.EdFi.GraduationPlanTypeDescriptorQ" lazy="false" discriminator-value="edfi.GraduationPlanTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="GraduationPlanTypeDescriptor" >
           <key>
             <column name="GraduationPlanTypeDescriptorId" />
           </key>
@@ -5947,8 +6119,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.GraduationPlanAggregate.EdFi.GraduationPlanQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.GunFreeSchoolsActReportingStatusDescriptorAggregate.EdFi.GunFreeSchoolsActReportingStatusDescriptorQ" table="GunFreeSchoolsActReportingStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.GunFreeSchoolsActReportingStatusDescriptorAggregate.EdFi.GunFreeSchoolsActReportingStatusDescriptorQ" lazy="false" discriminator-value="edfi.GunFreeSchoolsActReportingStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="GunFreeSchoolsActReportingStatusDescriptor" >
           <key>
             <column name="GunFreeSchoolsActReportingStatusDescriptorId" />
           </key>
@@ -5968,8 +6142,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.LocalEducationAgencyAggregate.EdFi.LocalEducationAgencyAccountabilityQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.HomelessPrimaryNighttimeResidenceDescriptorAggregate.EdFi.HomelessPrimaryNighttimeResidenceDescriptorQ" table="HomelessPrimaryNighttimeResidenceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.HomelessPrimaryNighttimeResidenceDescriptorAggregate.EdFi.HomelessPrimaryNighttimeResidenceDescriptorQ" lazy="false" discriminator-value="edfi.HomelessPrimaryNighttimeResidenceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="HomelessPrimaryNighttimeResidenceDescriptor" >
           <key>
             <column name="HomelessPrimaryNighttimeResidenceDescriptorId" />
           </key>
@@ -5989,8 +6165,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentHomelessProgramAssociationAggregate.EdFi.StudentHomelessProgramAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.HomelessProgramServiceDescriptorAggregate.EdFi.HomelessProgramServiceDescriptorQ" table="HomelessProgramServiceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.HomelessProgramServiceDescriptorAggregate.EdFi.HomelessProgramServiceDescriptorQ" lazy="false" discriminator-value="edfi.HomelessProgramServiceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="HomelessProgramServiceDescriptor" >
           <key>
             <column name="HomelessProgramServiceDescriptorId" />
           </key>
@@ -6010,8 +6188,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentHomelessProgramAssociationAggregate.EdFi.StudentHomelessProgramAssociationHomelessProgramServiceQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.IDEAPartDescriptorAggregate.EdFi.IDEAPartDescriptorQ" table="IDEAPartDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.IDEAPartDescriptorAggregate.EdFi.IDEAPartDescriptorQ" lazy="false" discriminator-value="edfi.IDEAPartDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="IDEAPartDescriptor" >
           <key>
             <column name="IDEAPartDescriptorId" />
           </key>
@@ -6031,8 +6211,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSpecialEducationProgramEligibilityAssociationAggregate.EdFi.StudentSpecialEducationProgramEligibilityAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.IdentificationDocumentUseDescriptorAggregate.EdFi.IdentificationDocumentUseDescriptorQ" table="IdentificationDocumentUseDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.IdentificationDocumentUseDescriptorAggregate.EdFi.IdentificationDocumentUseDescriptorQ" lazy="false" discriminator-value="edfi.IdentificationDocumentUseDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="IdentificationDocumentUseDescriptor" >
           <key>
             <column name="IdentificationDocumentUseDescriptorId" />
           </key>
@@ -6080,8 +6262,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAggregate.EdFi.StudentPersonalIdentificationDocumentQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ImmunizationTypeDescriptorAggregate.EdFi.ImmunizationTypeDescriptorQ" table="ImmunizationTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ImmunizationTypeDescriptorAggregate.EdFi.ImmunizationTypeDescriptorQ" lazy="false" discriminator-value="edfi.ImmunizationTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ImmunizationTypeDescriptor" >
           <key>
             <column name="ImmunizationTypeDescriptorId" />
           </key>
@@ -6101,8 +6285,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentHealthAggregate.EdFi.StudentHealthRequiredImmunizationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.IncidentLocationDescriptorAggregate.EdFi.IncidentLocationDescriptorQ" table="IncidentLocationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.IncidentLocationDescriptorAggregate.EdFi.IncidentLocationDescriptorQ" lazy="false" discriminator-value="edfi.IncidentLocationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="IncidentLocationDescriptor" >
           <key>
             <column name="IncidentLocationDescriptorId" />
           </key>
@@ -6122,8 +6308,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.DisciplineIncidentAggregate.EdFi.DisciplineIncidentQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.IndicatorDescriptorAggregate.EdFi.IndicatorDescriptorQ" table="IndicatorDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.IndicatorDescriptorAggregate.EdFi.IndicatorDescriptorQ" lazy="false" discriminator-value="edfi.IndicatorDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="IndicatorDescriptor" >
           <key>
             <column name="IndicatorDescriptorId" />
           </key>
@@ -6143,8 +6331,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.EducationOrganizationAggregate.EdFi.EducationOrganizationIndicatorQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.IndicatorGroupDescriptorAggregate.EdFi.IndicatorGroupDescriptorQ" table="IndicatorGroupDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.IndicatorGroupDescriptorAggregate.EdFi.IndicatorGroupDescriptorQ" lazy="false" discriminator-value="edfi.IndicatorGroupDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="IndicatorGroupDescriptor" >
           <key>
             <column name="IndicatorGroupDescriptorId" />
           </key>
@@ -6164,8 +6354,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.EducationOrganizationAggregate.EdFi.EducationOrganizationIndicatorQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.IndicatorLevelDescriptorAggregate.EdFi.IndicatorLevelDescriptorQ" table="IndicatorLevelDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.IndicatorLevelDescriptorAggregate.EdFi.IndicatorLevelDescriptorQ" lazy="false" discriminator-value="edfi.IndicatorLevelDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="IndicatorLevelDescriptor" >
           <key>
             <column name="IndicatorLevelDescriptorId" />
           </key>
@@ -6185,8 +6377,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.EducationOrganizationAggregate.EdFi.EducationOrganizationIndicatorQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.InstitutionTelephoneNumberTypeDescriptorAggregate.EdFi.InstitutionTelephoneNumberTypeDescriptorQ" table="InstitutionTelephoneNumberTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.InstitutionTelephoneNumberTypeDescriptorAggregate.EdFi.InstitutionTelephoneNumberTypeDescriptorQ" lazy="false" discriminator-value="edfi.InstitutionTelephoneNumberTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="InstitutionTelephoneNumberTypeDescriptor" >
           <key>
             <column name="InstitutionTelephoneNumberTypeDescriptorId" />
           </key>
@@ -6206,8 +6400,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.EducationOrganizationAggregate.EdFi.EducationOrganizationInstitutionTelephoneQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.InteractivityStyleDescriptorAggregate.EdFi.InteractivityStyleDescriptorQ" table="InteractivityStyleDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.InteractivityStyleDescriptorAggregate.EdFi.InteractivityStyleDescriptorQ" lazy="false" discriminator-value="edfi.InteractivityStyleDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="InteractivityStyleDescriptor" >
           <key>
             <column name="InteractivityStyleDescriptorId" />
           </key>
@@ -6227,8 +6423,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.EducationContentAggregate.EdFi.EducationContentQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.InternetAccessDescriptorAggregate.EdFi.InternetAccessDescriptorQ" table="InternetAccessDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.InternetAccessDescriptorAggregate.EdFi.InternetAccessDescriptorQ" lazy="false" discriminator-value="edfi.InternetAccessDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="InternetAccessDescriptor" >
           <key>
             <column name="InternetAccessDescriptorId" />
           </key>
@@ -6248,8 +6446,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.SchoolAggregate.EdFi.SchoolQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.InternetAccessTypeInResidenceDescriptorAggregate.EdFi.InternetAccessTypeInResidenceDescriptorQ" table="InternetAccessTypeInResidenceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.InternetAccessTypeInResidenceDescriptorAggregate.EdFi.InternetAccessTypeInResidenceDescriptorQ" lazy="false" discriminator-value="edfi.InternetAccessTypeInResidenceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="InternetAccessTypeInResidenceDescriptor" >
           <key>
             <column name="InternetAccessTypeInResidenceDescriptorId" />
           </key>
@@ -6269,8 +6469,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.InternetPerformanceInResidenceDescriptorAggregate.EdFi.InternetPerformanceInResidenceDescriptorQ" table="InternetPerformanceInResidenceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.InternetPerformanceInResidenceDescriptorAggregate.EdFi.InternetPerformanceInResidenceDescriptorQ" lazy="false" discriminator-value="edfi.InternetPerformanceInResidenceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="InternetPerformanceInResidenceDescriptor" >
           <key>
             <column name="InternetPerformanceInResidenceDescriptorId" />
           </key>
@@ -6290,8 +6492,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.InterventionClassDescriptorAggregate.EdFi.InterventionClassDescriptorQ" table="InterventionClassDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.InterventionClassDescriptorAggregate.EdFi.InterventionClassDescriptorQ" lazy="false" discriminator-value="edfi.InterventionClassDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="InterventionClassDescriptor" >
           <key>
             <column name="InterventionClassDescriptorId" />
           </key>
@@ -6325,8 +6529,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.InterventionStudyAggregate.EdFi.InterventionStudyQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.InterventionEffectivenessRatingDescriptorAggregate.EdFi.InterventionEffectivenessRatingDescriptorQ" table="InterventionEffectivenessRatingDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.InterventionEffectivenessRatingDescriptorAggregate.EdFi.InterventionEffectivenessRatingDescriptorQ" lazy="false" discriminator-value="edfi.InterventionEffectivenessRatingDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="InterventionEffectivenessRatingDescriptor" >
           <key>
             <column name="InterventionEffectivenessRatingDescriptorId" />
           </key>
@@ -6353,8 +6559,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentInterventionAssociationAggregate.EdFi.StudentInterventionAssociationInterventionEffectivenessQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LanguageDescriptorAggregate.EdFi.LanguageDescriptorQ" table="LanguageDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LanguageDescriptorAggregate.EdFi.LanguageDescriptorQ" lazy="false" discriminator-value="edfi.LanguageDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LanguageDescriptor" >
           <key>
             <column name="LanguageDescriptorId" />
           </key>
@@ -6416,8 +6624,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationLanguageQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LanguageInstructionProgramServiceDescriptorAggregate.EdFi.LanguageInstructionProgramServiceDescriptorQ" table="LanguageInstructionProgramServiceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LanguageInstructionProgramServiceDescriptorAggregate.EdFi.LanguageInstructionProgramServiceDescriptorQ" lazy="false" discriminator-value="edfi.LanguageInstructionProgramServiceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LanguageInstructionProgramServiceDescriptor" >
           <key>
             <column name="LanguageInstructionProgramServiceDescriptorId" />
           </key>
@@ -6437,8 +6647,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentLanguageInstructionProgramAssociationAggregate.EdFi.StudentLanguageInstructionProgramAssociationLanguageInstructionProgramServiceQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LanguageUseDescriptorAggregate.EdFi.LanguageUseDescriptorQ" table="LanguageUseDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LanguageUseDescriptorAggregate.EdFi.LanguageUseDescriptorQ" lazy="false" discriminator-value="edfi.LanguageUseDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LanguageUseDescriptor" >
           <key>
             <column name="LanguageUseDescriptorId" />
           </key>
@@ -6472,8 +6684,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationLanguageUseQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LearningStandardCategoryDescriptorAggregate.EdFi.LearningStandardCategoryDescriptorQ" table="LearningStandardCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LearningStandardCategoryDescriptorAggregate.EdFi.LearningStandardCategoryDescriptorQ" lazy="false" discriminator-value="edfi.LearningStandardCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LearningStandardCategoryDescriptor" >
           <key>
             <column name="LearningStandardCategoryDescriptorId" />
           </key>
@@ -6493,8 +6707,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.LearningStandardAggregate.EdFi.LearningStandardQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LearningStandardEquivalenceStrengthDescriptorAggregate.EdFi.LearningStandardEquivalenceStrengthDescriptorQ" table="LearningStandardEquivalenceStrengthDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LearningStandardEquivalenceStrengthDescriptorAggregate.EdFi.LearningStandardEquivalenceStrengthDescriptorQ" lazy="false" discriminator-value="edfi.LearningStandardEquivalenceStrengthDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LearningStandardEquivalenceStrengthDescriptor" >
           <key>
             <column name="LearningStandardEquivalenceStrengthDescriptorId" />
           </key>
@@ -6514,8 +6730,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.LearningStandardEquivalenceAssociationAggregate.EdFi.LearningStandardEquivalenceAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LearningStandardScopeDescriptorAggregate.EdFi.LearningStandardScopeDescriptorQ" table="LearningStandardScopeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LearningStandardScopeDescriptorAggregate.EdFi.LearningStandardScopeDescriptorQ" lazy="false" discriminator-value="edfi.LearningStandardScopeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LearningStandardScopeDescriptor" >
           <key>
             <column name="LearningStandardScopeDescriptorId" />
           </key>
@@ -6535,8 +6753,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.LearningStandardAggregate.EdFi.LearningStandardQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LevelOfEducationDescriptorAggregate.EdFi.LevelOfEducationDescriptorQ" table="LevelOfEducationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LevelOfEducationDescriptorAggregate.EdFi.LevelOfEducationDescriptorQ" lazy="false" discriminator-value="edfi.LevelOfEducationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LevelOfEducationDescriptor" >
           <key>
             <column name="LevelOfEducationDescriptorId" />
           </key>
@@ -6563,8 +6783,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StaffAggregate.EdFi.StaffQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LicenseStatusDescriptorAggregate.EdFi.LicenseStatusDescriptorQ" table="LicenseStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LicenseStatusDescriptorAggregate.EdFi.LicenseStatusDescriptorQ" lazy="false" discriminator-value="edfi.LicenseStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LicenseStatusDescriptor" >
           <key>
             <column name="LicenseStatusDescriptorId" />
           </key>
@@ -6584,8 +6806,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.CommunityProviderLicenseAggregate.EdFi.CommunityProviderLicenseQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LicenseTypeDescriptorAggregate.EdFi.LicenseTypeDescriptorQ" table="LicenseTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LicenseTypeDescriptorAggregate.EdFi.LicenseTypeDescriptorQ" lazy="false" discriminator-value="edfi.LicenseTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LicenseTypeDescriptor" >
           <key>
             <column name="LicenseTypeDescriptorId" />
           </key>
@@ -6605,8 +6829,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.CommunityProviderLicenseAggregate.EdFi.CommunityProviderLicenseQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LimitedEnglishProficiencyDescriptorAggregate.EdFi.LimitedEnglishProficiencyDescriptorQ" table="LimitedEnglishProficiencyDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LimitedEnglishProficiencyDescriptorAggregate.EdFi.LimitedEnglishProficiencyDescriptorQ" lazy="false" discriminator-value="edfi.LimitedEnglishProficiencyDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LimitedEnglishProficiencyDescriptor" >
           <key>
             <column name="LimitedEnglishProficiencyDescriptorId" />
           </key>
@@ -6626,8 +6852,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LocaleDescriptorAggregate.EdFi.LocaleDescriptorQ" table="LocaleDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LocaleDescriptorAggregate.EdFi.LocaleDescriptorQ" lazy="false" discriminator-value="edfi.LocaleDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LocaleDescriptor" >
           <key>
             <column name="LocaleDescriptorId" />
           </key>
@@ -6675,8 +6903,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationAddressQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LocalEducationAgencyCategoryDescriptorAggregate.EdFi.LocalEducationAgencyCategoryDescriptorQ" table="LocalEducationAgencyCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LocalEducationAgencyCategoryDescriptorAggregate.EdFi.LocalEducationAgencyCategoryDescriptorQ" lazy="false" discriminator-value="edfi.LocalEducationAgencyCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LocalEducationAgencyCategoryDescriptor" >
           <key>
             <column name="LocalEducationAgencyCategoryDescriptorId" />
           </key>
@@ -6696,8 +6926,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.LocalEducationAgencyAggregate.EdFi.LocalEducationAgencyQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.MagnetSpecialProgramEmphasisSchoolDescriptorAggregate.EdFi.MagnetSpecialProgramEmphasisSchoolDescriptorQ" table="MagnetSpecialProgramEmphasisSchoolDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.MagnetSpecialProgramEmphasisSchoolDescriptorAggregate.EdFi.MagnetSpecialProgramEmphasisSchoolDescriptorQ" lazy="false" discriminator-value="edfi.MagnetSpecialProgramEmphasisSchoolDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="MagnetSpecialProgramEmphasisSchoolDescriptor" >
           <key>
             <column name="MagnetSpecialProgramEmphasisSchoolDescriptorId" />
           </key>
@@ -6717,8 +6949,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.SchoolAggregate.EdFi.SchoolQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.MediumOfInstructionDescriptorAggregate.EdFi.MediumOfInstructionDescriptorQ" table="MediumOfInstructionDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.MediumOfInstructionDescriptorAggregate.EdFi.MediumOfInstructionDescriptorQ" lazy="false" discriminator-value="edfi.MediumOfInstructionDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="MediumOfInstructionDescriptor" >
           <key>
             <column name="MediumOfInstructionDescriptorId" />
           </key>
@@ -6745,8 +6979,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.SectionAggregate.EdFi.SectionQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.MethodCreditEarnedDescriptorAggregate.EdFi.MethodCreditEarnedDescriptorQ" table="MethodCreditEarnedDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.MethodCreditEarnedDescriptorAggregate.EdFi.MethodCreditEarnedDescriptorQ" lazy="false" discriminator-value="edfi.MethodCreditEarnedDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="MethodCreditEarnedDescriptor" >
           <key>
             <column name="MethodCreditEarnedDescriptorId" />
           </key>
@@ -6773,8 +7009,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.CourseTranscriptAggregate.EdFi.CourseTranscriptPartialCourseTranscriptAwardsQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.MigrantEducationProgramServiceDescriptorAggregate.EdFi.MigrantEducationProgramServiceDescriptorQ" table="MigrantEducationProgramServiceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.MigrantEducationProgramServiceDescriptorAggregate.EdFi.MigrantEducationProgramServiceDescriptorQ" lazy="false" discriminator-value="edfi.MigrantEducationProgramServiceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="MigrantEducationProgramServiceDescriptor" >
           <key>
             <column name="MigrantEducationProgramServiceDescriptorId" />
           </key>
@@ -6794,8 +7032,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentMigrantEducationProgramAssociationAggregate.EdFi.StudentMigrantEducationProgramAssociationMigrantEducationProgramServiceQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ModelEntityDescriptorAggregate.EdFi.ModelEntityDescriptorQ" table="ModelEntityDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ModelEntityDescriptorAggregate.EdFi.ModelEntityDescriptorQ" lazy="false" discriminator-value="edfi.ModelEntityDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ModelEntityDescriptor" >
           <key>
             <column name="ModelEntityDescriptorId" />
           </key>
@@ -6815,8 +7055,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.DescriptorMappingAggregate.EdFi.DescriptorMappingModelEntityQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.MonitoredDescriptorAggregate.EdFi.MonitoredDescriptorQ" table="MonitoredDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.MonitoredDescriptorAggregate.EdFi.MonitoredDescriptorQ" lazy="false" discriminator-value="edfi.MonitoredDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="MonitoredDescriptor" >
           <key>
             <column name="MonitoredDescriptorId" />
           </key>
@@ -6836,8 +7078,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentLanguageInstructionProgramAssociationAggregate.EdFi.StudentLanguageInstructionProgramAssociationEnglishLanguageProficiencyAssessmentQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.NeglectedOrDelinquentProgramDescriptorAggregate.EdFi.NeglectedOrDelinquentProgramDescriptorQ" table="NeglectedOrDelinquentProgramDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.NeglectedOrDelinquentProgramDescriptorAggregate.EdFi.NeglectedOrDelinquentProgramDescriptorQ" lazy="false" discriminator-value="edfi.NeglectedOrDelinquentProgramDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="NeglectedOrDelinquentProgramDescriptor" >
           <key>
             <column name="NeglectedOrDelinquentProgramDescriptorId" />
           </key>
@@ -6857,8 +7101,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentNeglectedOrDelinquentProgramAssociationAggregate.EdFi.StudentNeglectedOrDelinquentProgramAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.NeglectedOrDelinquentProgramServiceDescriptorAggregate.EdFi.NeglectedOrDelinquentProgramServiceDescriptorQ" table="NeglectedOrDelinquentProgramServiceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.NeglectedOrDelinquentProgramServiceDescriptorAggregate.EdFi.NeglectedOrDelinquentProgramServiceDescriptorQ" lazy="false" discriminator-value="edfi.NeglectedOrDelinquentProgramServiceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="NeglectedOrDelinquentProgramServiceDescriptor" >
           <key>
             <column name="NeglectedOrDelinquentProgramServiceDescriptorId" />
           </key>
@@ -6878,8 +7124,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentNeglectedOrDelinquentProgramAssociationAggregate.EdFi.StudentNeglectedOrDelinquentProgramAssociationNeglectedOrDelinquentProgramServiceQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.NetworkPurposeDescriptorAggregate.EdFi.NetworkPurposeDescriptorQ" table="NetworkPurposeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.NetworkPurposeDescriptorAggregate.EdFi.NetworkPurposeDescriptorQ" lazy="false" discriminator-value="edfi.NetworkPurposeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="NetworkPurposeDescriptor" >
           <key>
             <column name="NetworkPurposeDescriptorId" />
           </key>
@@ -6899,8 +7147,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.EducationOrganizationNetworkAggregate.EdFi.EducationOrganizationNetworkQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.NonMedicalImmunizationExemptionDescriptorAggregate.EdFi.NonMedicalImmunizationExemptionDescriptorQ" table="NonMedicalImmunizationExemptionDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.NonMedicalImmunizationExemptionDescriptorAggregate.EdFi.NonMedicalImmunizationExemptionDescriptorQ" lazy="false" discriminator-value="edfi.NonMedicalImmunizationExemptionDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="NonMedicalImmunizationExemptionDescriptor" >
           <key>
             <column name="NonMedicalImmunizationExemptionDescriptorId" />
           </key>
@@ -6920,8 +7170,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentHealthAggregate.EdFi.StudentHealthQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.OperationalStatusDescriptorAggregate.EdFi.OperationalStatusDescriptorQ" table="OperationalStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.OperationalStatusDescriptorAggregate.EdFi.OperationalStatusDescriptorQ" lazy="false" discriminator-value="edfi.OperationalStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="OperationalStatusDescriptor" >
           <key>
             <column name="OperationalStatusDescriptorId" />
           </key>
@@ -6941,8 +7193,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.EducationOrganizationAggregate.EdFi.EducationOrganizationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.OtherNameTypeDescriptorAggregate.EdFi.OtherNameTypeDescriptorQ" table="OtherNameTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.OtherNameTypeDescriptorAggregate.EdFi.OtherNameTypeDescriptorQ" lazy="false" discriminator-value="edfi.OtherNameTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="OtherNameTypeDescriptor" >
           <key>
             <column name="OtherNameTypeDescriptorId" />
           </key>
@@ -6976,8 +7230,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAggregate.EdFi.StudentOtherNameQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ParticipationDescriptorAggregate.EdFi.ParticipationDescriptorQ" table="ParticipationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ParticipationDescriptorAggregate.EdFi.ParticipationDescriptorQ" lazy="false" discriminator-value="edfi.ParticipationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ParticipationDescriptor" >
           <key>
             <column name="ParticipationDescriptorId" />
           </key>
@@ -6997,8 +7253,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentLanguageInstructionProgramAssociationAggregate.EdFi.StudentLanguageInstructionProgramAssociationEnglishLanguageProficiencyAssessmentQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ParticipationStatusDescriptorAggregate.EdFi.ParticipationStatusDescriptorQ" table="ParticipationStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ParticipationStatusDescriptorAggregate.EdFi.ParticipationStatusDescriptorQ" lazy="false" discriminator-value="edfi.ParticipationStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ParticipationStatusDescriptor" >
           <key>
             <column name="ParticipationStatusDescriptorId" />
           </key>
@@ -7018,8 +7276,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.GeneralStudentProgramAssociationAggregate.EdFi.GeneralStudentProgramAssociationProgramParticipationStatusQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PerformanceBaseConversionDescriptorAggregate.EdFi.PerformanceBaseConversionDescriptorQ" table="PerformanceBaseConversionDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PerformanceBaseConversionDescriptorAggregate.EdFi.PerformanceBaseConversionDescriptorQ" lazy="false" discriminator-value="edfi.PerformanceBaseConversionDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PerformanceBaseConversionDescriptor" >
           <key>
             <column name="PerformanceBaseConversionDescriptorId" />
           </key>
@@ -7046,8 +7306,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.GradeAggregate.EdFi.GradeLearningStandardGradeQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PerformanceLevelDescriptorAggregate.EdFi.PerformanceLevelDescriptorQ" table="PerformanceLevelDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PerformanceLevelDescriptorAggregate.EdFi.PerformanceLevelDescriptorQ" lazy="false" discriminator-value="edfi.PerformanceLevelDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PerformanceLevelDescriptor" >
           <key>
             <column name="PerformanceLevelDescriptorId" />
           </key>
@@ -7095,8 +7357,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAssessmentAggregate.EdFi.StudentAssessmentStudentObjectiveAssessmentPerformanceLevelQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PersonalInformationVerificationDescriptorAggregate.EdFi.PersonalInformationVerificationDescriptorQ" table="PersonalInformationVerificationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PersonalInformationVerificationDescriptorAggregate.EdFi.PersonalInformationVerificationDescriptorQ" lazy="false" discriminator-value="edfi.PersonalInformationVerificationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PersonalInformationVerificationDescriptor" >
           <key>
             <column name="PersonalInformationVerificationDescriptorId" />
           </key>
@@ -7144,8 +7408,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAggregate.EdFi.StudentPersonalIdentificationDocumentQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PlatformTypeDescriptorAggregate.EdFi.PlatformTypeDescriptorQ" table="PlatformTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PlatformTypeDescriptorAggregate.EdFi.PlatformTypeDescriptorQ" lazy="false" discriminator-value="edfi.PlatformTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PlatformTypeDescriptor" >
           <key>
             <column name="PlatformTypeDescriptorId" />
           </key>
@@ -7172,8 +7438,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAssessmentAggregate.EdFi.StudentAssessmentQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PopulationServedDescriptorAggregate.EdFi.PopulationServedDescriptorQ" table="PopulationServedDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PopulationServedDescriptorAggregate.EdFi.PopulationServedDescriptorQ" lazy="false" discriminator-value="edfi.PopulationServedDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PopulationServedDescriptor" >
           <key>
             <column name="PopulationServedDescriptorId" />
           </key>
@@ -7228,8 +7496,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentInterventionAssociationAggregate.EdFi.StudentInterventionAssociationInterventionEffectivenessQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PostingResultDescriptorAggregate.EdFi.PostingResultDescriptorQ" table="PostingResultDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PostingResultDescriptorAggregate.EdFi.PostingResultDescriptorQ" lazy="false" discriminator-value="edfi.PostingResultDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PostingResultDescriptor" >
           <key>
             <column name="PostingResultDescriptorId" />
           </key>
@@ -7249,8 +7519,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.OpenStaffPositionAggregate.EdFi.OpenStaffPositionQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PostSecondaryEventCategoryDescriptorAggregate.EdFi.PostSecondaryEventCategoryDescriptorQ" table="PostSecondaryEventCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PostSecondaryEventCategoryDescriptorAggregate.EdFi.PostSecondaryEventCategoryDescriptorQ" lazy="false" discriminator-value="edfi.PostSecondaryEventCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PostSecondaryEventCategoryDescriptor" >
           <key>
             <column name="PostSecondaryEventCategoryDescriptorId" />
           </key>
@@ -7270,8 +7542,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.PostSecondaryEventAggregate.EdFi.PostSecondaryEventQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PostSecondaryInstitutionLevelDescriptorAggregate.EdFi.PostSecondaryInstitutionLevelDescriptorQ" table="PostSecondaryInstitutionLevelDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PostSecondaryInstitutionLevelDescriptorAggregate.EdFi.PostSecondaryInstitutionLevelDescriptorQ" lazy="false" discriminator-value="edfi.PostSecondaryInstitutionLevelDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PostSecondaryInstitutionLevelDescriptor" >
           <key>
             <column name="PostSecondaryInstitutionLevelDescriptorId" />
           </key>
@@ -7291,8 +7565,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.PostSecondaryInstitutionAggregate.EdFi.PostSecondaryInstitutionQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PrimaryLearningDeviceAccessDescriptorAggregate.EdFi.PrimaryLearningDeviceAccessDescriptorQ" table="PrimaryLearningDeviceAccessDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PrimaryLearningDeviceAccessDescriptorAggregate.EdFi.PrimaryLearningDeviceAccessDescriptorQ" lazy="false" discriminator-value="edfi.PrimaryLearningDeviceAccessDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PrimaryLearningDeviceAccessDescriptor" >
           <key>
             <column name="PrimaryLearningDeviceAccessDescriptorId" />
           </key>
@@ -7312,8 +7588,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PrimaryLearningDeviceAwayFromSchoolDescriptorAggregate.EdFi.PrimaryLearningDeviceAwayFromSchoolDescriptorQ" table="PrimaryLearningDeviceAwayFromSchoolDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PrimaryLearningDeviceAwayFromSchoolDescriptorAggregate.EdFi.PrimaryLearningDeviceAwayFromSchoolDescriptorQ" lazy="false" discriminator-value="edfi.PrimaryLearningDeviceAwayFromSchoolDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PrimaryLearningDeviceAwayFromSchoolDescriptor" >
           <key>
             <column name="PrimaryLearningDeviceAwayFromSchoolDescriptorId" />
           </key>
@@ -7333,8 +7611,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PrimaryLearningDeviceProviderDescriptorAggregate.EdFi.PrimaryLearningDeviceProviderDescriptorQ" table="PrimaryLearningDeviceProviderDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PrimaryLearningDeviceProviderDescriptorAggregate.EdFi.PrimaryLearningDeviceProviderDescriptorQ" lazy="false" discriminator-value="edfi.PrimaryLearningDeviceProviderDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PrimaryLearningDeviceProviderDescriptor" >
           <key>
             <column name="PrimaryLearningDeviceProviderDescriptorId" />
           </key>
@@ -7354,8 +7634,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ProficiencyDescriptorAggregate.EdFi.ProficiencyDescriptorQ" table="ProficiencyDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ProficiencyDescriptorAggregate.EdFi.ProficiencyDescriptorQ" lazy="false" discriminator-value="edfi.ProficiencyDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ProficiencyDescriptor" >
           <key>
             <column name="ProficiencyDescriptorId" />
           </key>
@@ -7375,8 +7657,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentLanguageInstructionProgramAssociationAggregate.EdFi.StudentLanguageInstructionProgramAssociationEnglishLanguageProficiencyAssessmentQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ProgramAssignmentDescriptorAggregate.EdFi.ProgramAssignmentDescriptorQ" table="ProgramAssignmentDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ProgramAssignmentDescriptorAggregate.EdFi.ProgramAssignmentDescriptorQ" lazy="false" discriminator-value="edfi.ProgramAssignmentDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ProgramAssignmentDescriptor" >
           <key>
             <column name="ProgramAssignmentDescriptorId" />
           </key>
@@ -7403,8 +7687,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StaffSchoolAssociationAggregate.EdFi.StaffSchoolAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ProgramCharacteristicDescriptorAggregate.EdFi.ProgramCharacteristicDescriptorQ" table="ProgramCharacteristicDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ProgramCharacteristicDescriptorAggregate.EdFi.ProgramCharacteristicDescriptorQ" lazy="false" discriminator-value="edfi.ProgramCharacteristicDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ProgramCharacteristicDescriptor" >
           <key>
             <column name="ProgramCharacteristicDescriptorId" />
           </key>
@@ -7424,8 +7710,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.ProgramAggregate.EdFi.ProgramCharacteristicQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ProgramEvaluationPeriodDescriptorAggregate.EdFi.ProgramEvaluationPeriodDescriptorQ" table="ProgramEvaluationPeriodDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ProgramEvaluationPeriodDescriptorAggregate.EdFi.ProgramEvaluationPeriodDescriptorQ" lazy="false" discriminator-value="edfi.ProgramEvaluationPeriodDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ProgramEvaluationPeriodDescriptor" >
           <key>
             <column name="ProgramEvaluationPeriodDescriptorId" />
           </key>
@@ -7445,8 +7733,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.ProgramEvaluationAggregate.EdFi.ProgramEvaluationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ProgramEvaluationTypeDescriptorAggregate.EdFi.ProgramEvaluationTypeDescriptorQ" table="ProgramEvaluationTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ProgramEvaluationTypeDescriptorAggregate.EdFi.ProgramEvaluationTypeDescriptorQ" lazy="false" discriminator-value="edfi.ProgramEvaluationTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ProgramEvaluationTypeDescriptor" >
           <key>
             <column name="ProgramEvaluationTypeDescriptorId" />
           </key>
@@ -7466,8 +7756,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.ProgramEvaluationAggregate.EdFi.ProgramEvaluationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ProgramSponsorDescriptorAggregate.EdFi.ProgramSponsorDescriptorQ" table="ProgramSponsorDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ProgramSponsorDescriptorAggregate.EdFi.ProgramSponsorDescriptorQ" lazy="false" discriminator-value="edfi.ProgramSponsorDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ProgramSponsorDescriptor" >
           <key>
             <column name="ProgramSponsorDescriptorId" />
           </key>
@@ -7487,8 +7779,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.ProgramAggregate.EdFi.ProgramSponsorQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ProgramTypeDescriptorAggregate.EdFi.ProgramTypeDescriptorQ" table="ProgramTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ProgramTypeDescriptorAggregate.EdFi.ProgramTypeDescriptorQ" lazy="false" discriminator-value="edfi.ProgramTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ProgramTypeDescriptor" >
           <key>
             <column name="ProgramTypeDescriptorId" />
           </key>
@@ -7508,8 +7802,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.ProgramAggregate.EdFi.ProgramQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ProgressDescriptorAggregate.EdFi.ProgressDescriptorQ" table="ProgressDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ProgressDescriptorAggregate.EdFi.ProgressDescriptorQ" lazy="false" discriminator-value="edfi.ProgressDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ProgressDescriptor" >
           <key>
             <column name="ProgressDescriptorId" />
           </key>
@@ -7529,8 +7825,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentLanguageInstructionProgramAssociationAggregate.EdFi.StudentLanguageInstructionProgramAssociationEnglishLanguageProficiencyAssessmentQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ProgressLevelDescriptorAggregate.EdFi.ProgressLevelDescriptorQ" table="ProgressLevelDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ProgressLevelDescriptorAggregate.EdFi.ProgressLevelDescriptorQ" lazy="false" discriminator-value="edfi.ProgressLevelDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ProgressLevelDescriptor" >
           <key>
             <column name="ProgressLevelDescriptorId" />
           </key>
@@ -7557,8 +7855,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentNeglectedOrDelinquentProgramAssociationAggregate.EdFi.StudentNeglectedOrDelinquentProgramAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ProviderCategoryDescriptorAggregate.EdFi.ProviderCategoryDescriptorQ" table="ProviderCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ProviderCategoryDescriptorAggregate.EdFi.ProviderCategoryDescriptorQ" lazy="false" discriminator-value="edfi.ProviderCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ProviderCategoryDescriptor" >
           <key>
             <column name="ProviderCategoryDescriptorId" />
           </key>
@@ -7578,8 +7878,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.CommunityProviderAggregate.EdFi.CommunityProviderQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ProviderProfitabilityDescriptorAggregate.EdFi.ProviderProfitabilityDescriptorQ" table="ProviderProfitabilityDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ProviderProfitabilityDescriptorAggregate.EdFi.ProviderProfitabilityDescriptorQ" lazy="false" discriminator-value="edfi.ProviderProfitabilityDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ProviderProfitabilityDescriptor" >
           <key>
             <column name="ProviderProfitabilityDescriptorId" />
           </key>
@@ -7599,8 +7901,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.CommunityProviderAggregate.EdFi.CommunityProviderQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ProviderStatusDescriptorAggregate.EdFi.ProviderStatusDescriptorQ" table="ProviderStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ProviderStatusDescriptorAggregate.EdFi.ProviderStatusDescriptorQ" lazy="false" discriminator-value="edfi.ProviderStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ProviderStatusDescriptor" >
           <key>
             <column name="ProviderStatusDescriptorId" />
           </key>
@@ -7620,8 +7924,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.CommunityProviderAggregate.EdFi.CommunityProviderQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PublicationStatusDescriptorAggregate.EdFi.PublicationStatusDescriptorQ" table="PublicationStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PublicationStatusDescriptorAggregate.EdFi.PublicationStatusDescriptorQ" lazy="false" discriminator-value="edfi.PublicationStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PublicationStatusDescriptor" >
           <key>
             <column name="PublicationStatusDescriptorId" />
           </key>
@@ -7648,8 +7954,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.LearningStandardAggregate.EdFi.LearningStandardContentStandardQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.QuestionFormDescriptorAggregate.EdFi.QuestionFormDescriptorQ" table="QuestionFormDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.QuestionFormDescriptorAggregate.EdFi.QuestionFormDescriptorQ" lazy="false" discriminator-value="edfi.QuestionFormDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="QuestionFormDescriptor" >
           <key>
             <column name="QuestionFormDescriptorId" />
           </key>
@@ -7669,8 +7977,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyQuestionAggregate.EdFi.SurveyQuestionQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.RaceDescriptorAggregate.EdFi.RaceDescriptorQ" table="RaceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.RaceDescriptorAggregate.EdFi.RaceDescriptorQ" lazy="false" discriminator-value="edfi.RaceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="RaceDescriptor" >
           <key>
             <column name="RaceDescriptorId" />
           </key>
@@ -7697,8 +8007,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationRaceQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.RatingLevelDescriptorAggregate.EdFi.RatingLevelDescriptorQ" table="RatingLevelDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.RatingLevelDescriptorAggregate.EdFi.RatingLevelDescriptorQ" lazy="false" discriminator-value="edfi.RatingLevelDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="RatingLevelDescriptor" >
           <key>
             <column name="RatingLevelDescriptorId" />
           </key>
@@ -7760,8 +8072,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentProgramEvaluationAggregate.EdFi.StudentProgramEvaluationStudentEvaluationObjectiveQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ReasonExitedDescriptorAggregate.EdFi.ReasonExitedDescriptorQ" table="ReasonExitedDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ReasonExitedDescriptorAggregate.EdFi.ReasonExitedDescriptorQ" lazy="false" discriminator-value="edfi.ReasonExitedDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ReasonExitedDescriptor" >
           <key>
             <column name="ReasonExitedDescriptorId" />
           </key>
@@ -7781,8 +8095,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.GeneralStudentProgramAssociationAggregate.EdFi.GeneralStudentProgramAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ReasonNotTestedDescriptorAggregate.EdFi.ReasonNotTestedDescriptorQ" table="ReasonNotTestedDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ReasonNotTestedDescriptorAggregate.EdFi.ReasonNotTestedDescriptorQ" lazy="false" discriminator-value="edfi.ReasonNotTestedDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ReasonNotTestedDescriptor" >
           <key>
             <column name="ReasonNotTestedDescriptorId" />
           </key>
@@ -7802,8 +8118,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAssessmentAggregate.EdFi.StudentAssessmentQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.RecognitionTypeDescriptorAggregate.EdFi.RecognitionTypeDescriptorQ" table="RecognitionTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.RecognitionTypeDescriptorAggregate.EdFi.RecognitionTypeDescriptorQ" lazy="false" discriminator-value="edfi.RecognitionTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="RecognitionTypeDescriptor" >
           <key>
             <column name="RecognitionTypeDescriptorId" />
           </key>
@@ -7830,8 +8148,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAcademicRecordAggregate.EdFi.StudentAcademicRecordRecognitionQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.RelationDescriptorAggregate.EdFi.RelationDescriptorQ" table="RelationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.RelationDescriptorAggregate.EdFi.RelationDescriptorQ" lazy="false" discriminator-value="edfi.RelationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="RelationDescriptor" >
           <key>
             <column name="RelationDescriptorId" />
           </key>
@@ -7851,8 +8171,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentContactAssociationAggregate.EdFi.StudentContactAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.RepeatIdentifierDescriptorAggregate.EdFi.RepeatIdentifierDescriptorQ" table="RepeatIdentifierDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.RepeatIdentifierDescriptorAggregate.EdFi.RepeatIdentifierDescriptorQ" lazy="false" discriminator-value="edfi.RepeatIdentifierDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="RepeatIdentifierDescriptor" >
           <key>
             <column name="RepeatIdentifierDescriptorId" />
           </key>
@@ -7872,8 +8194,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSectionAssociationAggregate.EdFi.StudentSectionAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ReporterDescriptionDescriptorAggregate.EdFi.ReporterDescriptionDescriptorQ" table="ReporterDescriptionDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ReporterDescriptionDescriptorAggregate.EdFi.ReporterDescriptionDescriptorQ" lazy="false" discriminator-value="edfi.ReporterDescriptionDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ReporterDescriptionDescriptor" >
           <key>
             <column name="ReporterDescriptionDescriptorId" />
           </key>
@@ -7893,8 +8217,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.DisciplineIncidentAggregate.EdFi.DisciplineIncidentQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ReportingTagDescriptorAggregate.EdFi.ReportingTagDescriptorQ" table="ReportingTagDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ReportingTagDescriptorAggregate.EdFi.ReportingTagDescriptorQ" lazy="false" discriminator-value="edfi.ReportingTagDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ReportingTagDescriptor" >
           <key>
             <column name="ReportingTagDescriptorId" />
           </key>
@@ -7977,8 +8303,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.SourceDimensionAggregate.EdFi.SourceDimensionReportingTagQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ResidencyStatusDescriptorAggregate.EdFi.ResidencyStatusDescriptorQ" table="ResidencyStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ResidencyStatusDescriptorAggregate.EdFi.ResidencyStatusDescriptorQ" lazy="false" discriminator-value="edfi.ResidencyStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ResidencyStatusDescriptor" >
           <key>
             <column name="ResidencyStatusDescriptorId" />
           </key>
@@ -7998,8 +8326,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSchoolAssociationAggregate.EdFi.StudentSchoolAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ResponseIndicatorDescriptorAggregate.EdFi.ResponseIndicatorDescriptorQ" table="ResponseIndicatorDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ResponseIndicatorDescriptorAggregate.EdFi.ResponseIndicatorDescriptorQ" lazy="false" discriminator-value="edfi.ResponseIndicatorDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ResponseIndicatorDescriptor" >
           <key>
             <column name="ResponseIndicatorDescriptorId" />
           </key>
@@ -8019,8 +8349,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAssessmentAggregate.EdFi.StudentAssessmentItemQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ResponsibilityDescriptorAggregate.EdFi.ResponsibilityDescriptorQ" table="ResponsibilityDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ResponsibilityDescriptorAggregate.EdFi.ResponsibilityDescriptorQ" lazy="false" discriminator-value="edfi.ResponsibilityDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ResponsibilityDescriptor" >
           <key>
             <column name="ResponsibilityDescriptorId" />
           </key>
@@ -8040,8 +8372,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationResponsibilityAssociationAggregate.EdFi.StudentEducationOrganizationResponsibilityAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.RestraintEventReasonDescriptorAggregate.EdFi.RestraintEventReasonDescriptorQ" table="RestraintEventReasonDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.RestraintEventReasonDescriptorAggregate.EdFi.RestraintEventReasonDescriptorQ" lazy="false" discriminator-value="edfi.RestraintEventReasonDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="RestraintEventReasonDescriptor" >
           <key>
             <column name="RestraintEventReasonDescriptorId" />
           </key>
@@ -8061,8 +8395,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.RestraintEventAggregate.EdFi.RestraintEventReasonQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ResultDatatypeTypeDescriptorAggregate.EdFi.ResultDatatypeTypeDescriptorQ" table="ResultDatatypeTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ResultDatatypeTypeDescriptorAggregate.EdFi.ResultDatatypeTypeDescriptorQ" lazy="false" discriminator-value="edfi.ResultDatatypeTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ResultDatatypeTypeDescriptor" >
           <key>
             <column name="ResultDatatypeTypeDescriptorId" />
           </key>
@@ -8131,8 +8467,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAssessmentAggregate.EdFi.StudentAssessmentStudentObjectiveAssessmentScoreResultQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.RetestIndicatorDescriptorAggregate.EdFi.RetestIndicatorDescriptorQ" table="RetestIndicatorDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.RetestIndicatorDescriptorAggregate.EdFi.RetestIndicatorDescriptorQ" lazy="false" discriminator-value="edfi.RetestIndicatorDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="RetestIndicatorDescriptor" >
           <key>
             <column name="RetestIndicatorDescriptorId" />
           </key>
@@ -8152,8 +8490,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAssessmentAggregate.EdFi.StudentAssessmentQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SchoolCategoryDescriptorAggregate.EdFi.SchoolCategoryDescriptorQ" table="SchoolCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SchoolCategoryDescriptorAggregate.EdFi.SchoolCategoryDescriptorQ" lazy="false" discriminator-value="edfi.SchoolCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SchoolCategoryDescriptor" >
           <key>
             <column name="SchoolCategoryDescriptorId" />
           </key>
@@ -8173,8 +8513,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.SchoolAggregate.EdFi.SchoolCategoryQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SchoolChoiceBasisDescriptorAggregate.EdFi.SchoolChoiceBasisDescriptorQ" table="SchoolChoiceBasisDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SchoolChoiceBasisDescriptorAggregate.EdFi.SchoolChoiceBasisDescriptorQ" lazy="false" discriminator-value="edfi.SchoolChoiceBasisDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SchoolChoiceBasisDescriptor" >
           <key>
             <column name="SchoolChoiceBasisDescriptorId" />
           </key>
@@ -8194,8 +8536,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSchoolAssociationAggregate.EdFi.StudentSchoolAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SchoolChoiceImplementStatusDescriptorAggregate.EdFi.SchoolChoiceImplementStatusDescriptorQ" table="SchoolChoiceImplementStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SchoolChoiceImplementStatusDescriptorAggregate.EdFi.SchoolChoiceImplementStatusDescriptorQ" lazy="false" discriminator-value="edfi.SchoolChoiceImplementStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SchoolChoiceImplementStatusDescriptor" >
           <key>
             <column name="SchoolChoiceImplementStatusDescriptorId" />
           </key>
@@ -8215,8 +8559,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.LocalEducationAgencyAggregate.EdFi.LocalEducationAgencyAccountabilityQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SchoolFoodServiceProgramServiceDescriptorAggregate.EdFi.SchoolFoodServiceProgramServiceDescriptorQ" table="SchoolFoodServiceProgramServiceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SchoolFoodServiceProgramServiceDescriptorAggregate.EdFi.SchoolFoodServiceProgramServiceDescriptorQ" lazy="false" discriminator-value="edfi.SchoolFoodServiceProgramServiceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SchoolFoodServiceProgramServiceDescriptor" >
           <key>
             <column name="SchoolFoodServiceProgramServiceDescriptorId" />
           </key>
@@ -8236,8 +8582,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSchoolFoodServiceProgramAssociationAggregate.EdFi.StudentSchoolFoodServiceProgramAssociationSchoolFoodServiceProgramServiceQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SchoolTypeDescriptorAggregate.EdFi.SchoolTypeDescriptorQ" table="SchoolTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SchoolTypeDescriptorAggregate.EdFi.SchoolTypeDescriptorQ" lazy="false" discriminator-value="edfi.SchoolTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SchoolTypeDescriptor" >
           <key>
             <column name="SchoolTypeDescriptorId" />
           </key>
@@ -8257,8 +8605,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.SchoolAggregate.EdFi.SchoolQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SectionCharacteristicDescriptorAggregate.EdFi.SectionCharacteristicDescriptorQ" table="SectionCharacteristicDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SectionCharacteristicDescriptorAggregate.EdFi.SectionCharacteristicDescriptorQ" lazy="false" discriminator-value="edfi.SectionCharacteristicDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SectionCharacteristicDescriptor" >
           <key>
             <column name="SectionCharacteristicDescriptorId" />
           </key>
@@ -8278,8 +8628,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.SectionAggregate.EdFi.SectionCharacteristicQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SectionTypeDescriptorAggregate.EdFi.SectionTypeDescriptorQ" table="SectionTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SectionTypeDescriptorAggregate.EdFi.SectionTypeDescriptorQ" lazy="false" discriminator-value="edfi.SectionTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SectionTypeDescriptor" >
           <key>
             <column name="SectionTypeDescriptorId" />
           </key>
@@ -8299,8 +8651,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.SectionAggregate.EdFi.SectionQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SeparationDescriptorAggregate.EdFi.SeparationDescriptorQ" table="SeparationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SeparationDescriptorAggregate.EdFi.SeparationDescriptorQ" lazy="false" discriminator-value="edfi.SeparationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SeparationDescriptor" >
           <key>
             <column name="SeparationDescriptorId" />
           </key>
@@ -8320,8 +8674,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StaffEducationOrganizationEmploymentAssociationAggregate.EdFi.StaffEducationOrganizationEmploymentAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SeparationReasonDescriptorAggregate.EdFi.SeparationReasonDescriptorQ" table="SeparationReasonDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SeparationReasonDescriptorAggregate.EdFi.SeparationReasonDescriptorQ" lazy="false" discriminator-value="edfi.SeparationReasonDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SeparationReasonDescriptor" >
           <key>
             <column name="SeparationReasonDescriptorId" />
           </key>
@@ -8341,8 +8697,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StaffEducationOrganizationEmploymentAssociationAggregate.EdFi.StaffEducationOrganizationEmploymentAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ServiceDescriptorAggregate.EdFi.ServiceDescriptorQ" table="ServiceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ServiceDescriptorAggregate.EdFi.ServiceDescriptorQ" lazy="false" discriminator-value="edfi.ServiceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ServiceDescriptor" >
           <key>
             <column name="ServiceDescriptorId" />
           </key>
@@ -8362,8 +8720,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentProgramAssociationAggregate.EdFi.StudentProgramAssociationServiceQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SexDescriptorAggregate.EdFi.SexDescriptorQ" table="SexDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SexDescriptorAggregate.EdFi.SexDescriptorQ" lazy="false" discriminator-value="edfi.SexDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SexDescriptor" >
           <key>
             <column name="SexDescriptorId" />
           </key>
@@ -8432,8 +8792,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SourceSystemDescriptorAggregate.EdFi.SourceSystemDescriptorQ" table="SourceSystemDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SourceSystemDescriptorAggregate.EdFi.SourceSystemDescriptorQ" lazy="false" discriminator-value="edfi.SourceSystemDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SourceSystemDescriptor" >
           <key>
             <column name="SourceSystemDescriptorId" />
           </key>
@@ -8453,8 +8815,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.PersonAggregate.EdFi.PersonQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SpecialEducationExitReasonDescriptorAggregate.EdFi.SpecialEducationExitReasonDescriptorQ" table="SpecialEducationExitReasonDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SpecialEducationExitReasonDescriptorAggregate.EdFi.SpecialEducationExitReasonDescriptorQ" lazy="false" discriminator-value="edfi.SpecialEducationExitReasonDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SpecialEducationExitReasonDescriptor" >
           <key>
             <column name="SpecialEducationExitReasonDescriptorId" />
           </key>
@@ -8474,8 +8838,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSpecialEducationProgramAssociationAggregate.EdFi.StudentSpecialEducationProgramAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SpecialEducationProgramServiceDescriptorAggregate.EdFi.SpecialEducationProgramServiceDescriptorQ" table="SpecialEducationProgramServiceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SpecialEducationProgramServiceDescriptorAggregate.EdFi.SpecialEducationProgramServiceDescriptorQ" lazy="false" discriminator-value="edfi.SpecialEducationProgramServiceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SpecialEducationProgramServiceDescriptor" >
           <key>
             <column name="SpecialEducationProgramServiceDescriptorId" />
           </key>
@@ -8495,8 +8861,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSpecialEducationProgramAssociationAggregate.EdFi.StudentSpecialEducationProgramAssociationSpecialEducationProgramServiceQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SpecialEducationSettingDescriptorAggregate.EdFi.SpecialEducationSettingDescriptorQ" table="SpecialEducationSettingDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SpecialEducationSettingDescriptorAggregate.EdFi.SpecialEducationSettingDescriptorQ" lazy="false" discriminator-value="edfi.SpecialEducationSettingDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SpecialEducationSettingDescriptor" >
           <key>
             <column name="SpecialEducationSettingDescriptorId" />
           </key>
@@ -8516,8 +8884,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSpecialEducationProgramAssociationAggregate.EdFi.StudentSpecialEducationProgramAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffClassificationDescriptorAggregate.EdFi.StaffClassificationDescriptorQ" table="StaffClassificationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffClassificationDescriptorAggregate.EdFi.StaffClassificationDescriptorQ" lazy="false" discriminator-value="edfi.StaffClassificationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="StaffClassificationDescriptor" >
           <key>
             <column name="StaffClassificationDescriptorId" />
           </key>
@@ -8544,8 +8914,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StaffEducationOrganizationAssignmentAssociationAggregate.EdFi.StaffEducationOrganizationAssignmentAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffIdentificationSystemDescriptorAggregate.EdFi.StaffIdentificationSystemDescriptorQ" table="StaffIdentificationSystemDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffIdentificationSystemDescriptorAggregate.EdFi.StaffIdentificationSystemDescriptorQ" lazy="false" discriminator-value="edfi.StaffIdentificationSystemDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="StaffIdentificationSystemDescriptor" >
           <key>
             <column name="StaffIdentificationSystemDescriptorId" />
           </key>
@@ -8565,8 +8937,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StaffAggregate.EdFi.StaffIdentificationCodeQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffLeaveEventCategoryDescriptorAggregate.EdFi.StaffLeaveEventCategoryDescriptorQ" table="StaffLeaveEventCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffLeaveEventCategoryDescriptorAggregate.EdFi.StaffLeaveEventCategoryDescriptorQ" lazy="false" discriminator-value="edfi.StaffLeaveEventCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="StaffLeaveEventCategoryDescriptor" >
           <key>
             <column name="StaffLeaveEventCategoryDescriptorId" />
           </key>
@@ -8586,8 +8960,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StaffLeaveAggregate.EdFi.StaffLeaveQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.StateAbbreviationDescriptorAggregate.EdFi.StateAbbreviationDescriptorQ" table="StateAbbreviationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.StateAbbreviationDescriptorAggregate.EdFi.StateAbbreviationDescriptorQ" lazy="false" discriminator-value="edfi.StateAbbreviationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="StateAbbreviationDescriptor" >
           <key>
             <column name="StateAbbreviationDescriptorId" />
           </key>
@@ -8656,8 +9032,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationAddressQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentCharacteristicDescriptorAggregate.EdFi.StudentCharacteristicDescriptorQ" table="StudentCharacteristicDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentCharacteristicDescriptorAggregate.EdFi.StudentCharacteristicDescriptorQ" lazy="false" discriminator-value="edfi.StudentCharacteristicDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="StudentCharacteristicDescriptor" >
           <key>
             <column name="StudentCharacteristicDescriptorId" />
           </key>
@@ -8677,8 +9055,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationStudentCharacteristicQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentIdentificationSystemDescriptorAggregate.EdFi.StudentIdentificationSystemDescriptorQ" table="StudentIdentificationSystemDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentIdentificationSystemDescriptorAggregate.EdFi.StudentIdentificationSystemDescriptorQ" lazy="false" discriminator-value="edfi.StudentIdentificationSystemDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="StudentIdentificationSystemDescriptor" >
           <key>
             <column name="StudentIdentificationSystemDescriptorId" />
           </key>
@@ -8698,8 +9078,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationStudentIdentificationCodeQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentParticipationCodeDescriptorAggregate.EdFi.StudentParticipationCodeDescriptorQ" table="StudentParticipationCodeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentParticipationCodeDescriptorAggregate.EdFi.StudentParticipationCodeDescriptorQ" lazy="false" discriminator-value="edfi.StudentParticipationCodeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="StudentParticipationCodeDescriptor" >
           <key>
             <column name="StudentParticipationCodeDescriptorId" />
           </key>
@@ -8712,8 +9094,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SubmissionStatusDescriptorAggregate.EdFi.SubmissionStatusDescriptorQ" table="SubmissionStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SubmissionStatusDescriptorAggregate.EdFi.SubmissionStatusDescriptorQ" lazy="false" discriminator-value="edfi.SubmissionStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SubmissionStatusDescriptor" >
           <key>
             <column name="SubmissionStatusDescriptorId" />
           </key>
@@ -8733,8 +9117,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentGradebookEntryAggregate.EdFi.StudentGradebookEntryQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SupporterMilitaryConnectionDescriptorAggregate.EdFi.SupporterMilitaryConnectionDescriptorQ" table="SupporterMilitaryConnectionDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SupporterMilitaryConnectionDescriptorAggregate.EdFi.SupporterMilitaryConnectionDescriptorQ" lazy="false" discriminator-value="edfi.SupporterMilitaryConnectionDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SupporterMilitaryConnectionDescriptor" >
           <key>
             <column name="SupporterMilitaryConnectionDescriptorId" />
           </key>
@@ -8754,8 +9140,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyCategoryDescriptorAggregate.EdFi.SurveyCategoryDescriptorQ" table="SurveyCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyCategoryDescriptorAggregate.EdFi.SurveyCategoryDescriptorQ" lazy="false" discriminator-value="edfi.SurveyCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SurveyCategoryDescriptor" >
           <key>
             <column name="SurveyCategoryDescriptorId" />
           </key>
@@ -8775,8 +9163,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyAggregate.EdFi.SurveyQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyLevelDescriptorAggregate.EdFi.SurveyLevelDescriptorQ" table="SurveyLevelDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyLevelDescriptorAggregate.EdFi.SurveyLevelDescriptorQ" lazy="false" discriminator-value="edfi.SurveyLevelDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SurveyLevelDescriptor" >
           <key>
             <column name="SurveyLevelDescriptorId" />
           </key>
@@ -8796,8 +9186,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyResponseAggregate.EdFi.SurveyResponseSurveyLevelQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.TeachingCredentialBasisDescriptorAggregate.EdFi.TeachingCredentialBasisDescriptorQ" table="TeachingCredentialBasisDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.TeachingCredentialBasisDescriptorAggregate.EdFi.TeachingCredentialBasisDescriptorQ" lazy="false" discriminator-value="edfi.TeachingCredentialBasisDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="TeachingCredentialBasisDescriptor" >
           <key>
             <column name="TeachingCredentialBasisDescriptorId" />
           </key>
@@ -8817,8 +9209,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.CredentialAggregate.EdFi.CredentialQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.TeachingCredentialDescriptorAggregate.EdFi.TeachingCredentialDescriptorQ" table="TeachingCredentialDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.TeachingCredentialDescriptorAggregate.EdFi.TeachingCredentialDescriptorQ" lazy="false" discriminator-value="edfi.TeachingCredentialDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="TeachingCredentialDescriptor" >
           <key>
             <column name="TeachingCredentialDescriptorId" />
           </key>
@@ -8838,8 +9232,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.CredentialAggregate.EdFi.CredentialQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.TechnicalSkillsAssessmentDescriptorAggregate.EdFi.TechnicalSkillsAssessmentDescriptorQ" table="TechnicalSkillsAssessmentDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.TechnicalSkillsAssessmentDescriptorAggregate.EdFi.TechnicalSkillsAssessmentDescriptorQ" lazy="false" discriminator-value="edfi.TechnicalSkillsAssessmentDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="TechnicalSkillsAssessmentDescriptor" >
           <key>
             <column name="TechnicalSkillsAssessmentDescriptorId" />
           </key>
@@ -8859,8 +9255,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentCTEProgramAssociationAggregate.EdFi.StudentCTEProgramAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.TelephoneNumberTypeDescriptorAggregate.EdFi.TelephoneNumberTypeDescriptorQ" table="TelephoneNumberTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.TelephoneNumberTypeDescriptorAggregate.EdFi.TelephoneNumberTypeDescriptorQ" lazy="false" discriminator-value="edfi.TelephoneNumberTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="TelephoneNumberTypeDescriptor" >
           <key>
             <column name="TelephoneNumberTypeDescriptorId" />
           </key>
@@ -8901,8 +9299,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationTelephoneQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.TermDescriptorAggregate.EdFi.TermDescriptorQ" table="TermDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.TermDescriptorAggregate.EdFi.TermDescriptorQ" lazy="false" discriminator-value="edfi.TermDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="TermDescriptor" >
           <key>
             <column name="TermDescriptorId" />
           </key>
@@ -8936,8 +9336,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationCohortYearQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.TitleIPartAParticipantDescriptorAggregate.EdFi.TitleIPartAParticipantDescriptorQ" table="TitleIPartAParticipantDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.TitleIPartAParticipantDescriptorAggregate.EdFi.TitleIPartAParticipantDescriptorQ" lazy="false" discriminator-value="edfi.TitleIPartAParticipantDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="TitleIPartAParticipantDescriptor" >
           <key>
             <column name="TitleIPartAParticipantDescriptorId" />
           </key>
@@ -8957,8 +9359,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentTitleIPartAProgramAssociationAggregate.EdFi.StudentTitleIPartAProgramAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.TitleIPartAProgramServiceDescriptorAggregate.EdFi.TitleIPartAProgramServiceDescriptorQ" table="TitleIPartAProgramServiceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.TitleIPartAProgramServiceDescriptorAggregate.EdFi.TitleIPartAProgramServiceDescriptorQ" lazy="false" discriminator-value="edfi.TitleIPartAProgramServiceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="TitleIPartAProgramServiceDescriptor" >
           <key>
             <column name="TitleIPartAProgramServiceDescriptorId" />
           </key>
@@ -8978,8 +9382,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentTitleIPartAProgramAssociationAggregate.EdFi.StudentTitleIPartAProgramAssociationTitleIPartAProgramServiceQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.TitleIPartASchoolDesignationDescriptorAggregate.EdFi.TitleIPartASchoolDesignationDescriptorQ" table="TitleIPartASchoolDesignationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.TitleIPartASchoolDesignationDescriptorAggregate.EdFi.TitleIPartASchoolDesignationDescriptorQ" lazy="false" discriminator-value="edfi.TitleIPartASchoolDesignationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="TitleIPartASchoolDesignationDescriptor" >
           <key>
             <column name="TitleIPartASchoolDesignationDescriptorId" />
           </key>
@@ -8999,8 +9405,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.SchoolAggregate.EdFi.SchoolQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.TransportationPublicExpenseEligibilityTypeDescriptorAggregate.EdFi.TransportationPublicExpenseEligibilityTypeDescriptorQ" table="TransportationPublicExpenseEligibilityTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.TransportationPublicExpenseEligibilityTypeDescriptorAggregate.EdFi.TransportationPublicExpenseEligibilityTypeDescriptorQ" lazy="false" discriminator-value="edfi.TransportationPublicExpenseEligibilityTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="TransportationPublicExpenseEligibilityTypeDescriptor" >
           <key>
             <column name="TransportationPublicExpenseEligibilityTypeDescriptorId" />
           </key>
@@ -9020,8 +9428,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentTransportationAggregate.EdFi.StudentTransportationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.TransportationTypeDescriptorAggregate.EdFi.TransportationTypeDescriptorQ" table="TransportationTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.TransportationTypeDescriptorAggregate.EdFi.TransportationTypeDescriptorQ" lazy="false" discriminator-value="edfi.TransportationTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="TransportationTypeDescriptor" >
           <key>
             <column name="TransportationTypeDescriptorId" />
           </key>
@@ -9041,8 +9451,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentTransportationAggregate.EdFi.StudentTransportationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.TravelDayofWeekDescriptorAggregate.EdFi.TravelDayofWeekDescriptorQ" table="TravelDayofWeekDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.TravelDayofWeekDescriptorAggregate.EdFi.TravelDayofWeekDescriptorQ" lazy="false" discriminator-value="edfi.TravelDayofWeekDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="TravelDayofWeekDescriptor" >
           <key>
             <column name="TravelDayofWeekDescriptorId" />
           </key>
@@ -9062,8 +9474,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentTransportationAggregate.EdFi.StudentTransportationStudentBusDetailsTravelDayofWeekQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.TravelDirectionDescriptorAggregate.EdFi.TravelDirectionDescriptorQ" table="TravelDirectionDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.TravelDirectionDescriptorAggregate.EdFi.TravelDirectionDescriptorQ" lazy="false" discriminator-value="edfi.TravelDirectionDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="TravelDirectionDescriptor" >
           <key>
             <column name="TravelDirectionDescriptorId" />
           </key>
@@ -9083,8 +9497,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentTransportationAggregate.EdFi.StudentTransportationStudentBusDetailsTravelDirectionQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.TribalAffiliationDescriptorAggregate.EdFi.TribalAffiliationDescriptorQ" table="TribalAffiliationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.TribalAffiliationDescriptorAggregate.EdFi.TribalAffiliationDescriptorQ" lazy="false" discriminator-value="edfi.TribalAffiliationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="TribalAffiliationDescriptor" >
           <key>
             <column name="TribalAffiliationDescriptorId" />
           </key>
@@ -9111,8 +9527,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationTribalAffiliationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.VisaDescriptorAggregate.EdFi.VisaDescriptorQ" table="VisaDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.VisaDescriptorAggregate.EdFi.VisaDescriptorQ" lazy="false" discriminator-value="edfi.VisaDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="VisaDescriptor" >
           <key>
             <column name="VisaDescriptorId" />
           </key>
@@ -9139,8 +9557,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAggregate.EdFi.StudentVisaQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.WeaponDescriptorAggregate.EdFi.WeaponDescriptorQ" table="WeaponDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.WeaponDescriptorAggregate.EdFi.WeaponDescriptorQ" lazy="false" discriminator-value="edfi.WeaponDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="WeaponDescriptor" >
           <key>
             <column name="WeaponDescriptorId" />
           </key>
@@ -9160,7 +9580,8 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.DisciplineIncidentAggregate.EdFi.DisciplineIncidentWeaponQ" />
           </set>
 
-      </joined-subclass>
+      </join>
+    </subclass>
 </class>
 
 
diff --git a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/5.1.0/DataStandard_510_ApprovalTests.Verify.Standard_Std_5.1.0_EntityOrmMappings_PgSql_EntityOrmMappings.generated.hbm.approved.xml b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/5.1.0/DataStandard_510_ApprovalTests.Verify.Standard_Std_5.1.0_EntityOrmMappings_PgSql_EntityOrmMappings.generated.hbm.approved.xml
index a481e3b8a2..bcc5cd5f50 100644
--- a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/5.1.0/DataStandard_510_ApprovalTests.Verify.Standard_Std_5.1.0_EntityOrmMappings_PgSql_EntityOrmMappings.generated.hbm.approved.xml
+++ b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/5.1.0/DataStandard_510_ApprovalTests.Verify.Standard_Std_5.1.0_EntityOrmMappings_PgSql_EntityOrmMappings.generated.hbm.approved.xml
@@ -3091,12 +3091,13 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.DescriptorAggregate.EdFi.Descriptor" table="Descriptor" lazy="false" abstract="true">
+  <class name="EdFi.Ods.Entities.NHibernate.DescriptorAggregate.EdFi.Descriptor" table="Descriptor" lazy="false" abstract="true" discriminator-value="NULL">
     <id name="DescriptorId" column="DescriptorId" type="int">
       <generator class="identity" />
     </id>
 
     <!-- Discriminator -->
+    <discriminator column="Discriminator" type="string" />
 
     <!-- Optimistic locking for aggregate root -->
     <version name="LastModifiedDate" column="LastModifiedDate" type="UtcDateTime" />
@@ -3121,7 +3122,8 @@
 
     <!-- Collections -->
     <!-- Derived classes -->
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.AbsenceEventCategoryDescriptorAggregate.EdFi.AbsenceEventCategoryDescriptor" table="AbsenceEventCategoryDescriptor" lazy="false">
+    <subclass name="EdFi.Ods.Entities.NHibernate.AbsenceEventCategoryDescriptorAggregate.EdFi.AbsenceEventCategoryDescriptor" lazy="false" discriminator-value="edfi.AbsenceEventCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AbsenceEventCategoryDescriptor" >
           <key>
             <column name="AbsenceEventCategoryDescriptorId" />
           </key>
@@ -3134,8 +3136,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.AcademicHonorCategoryDescriptorAggregate.EdFi.AcademicHonorCategoryDescriptor" table="AcademicHonorCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.AcademicHonorCategoryDescriptorAggregate.EdFi.AcademicHonorCategoryDescriptor" lazy="false" discriminator-value="edfi.AcademicHonorCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AcademicHonorCategoryDescriptor" >
           <key>
             <column name="AcademicHonorCategoryDescriptorId" />
           </key>
@@ -3148,8 +3152,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.AcademicSubjectDescriptorAggregate.EdFi.AcademicSubjectDescriptor" table="AcademicSubjectDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.AcademicSubjectDescriptorAggregate.EdFi.AcademicSubjectDescriptor" lazy="false" discriminator-value="edfi.AcademicSubjectDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AcademicSubjectDescriptor" >
           <key>
             <column name="AcademicSubjectDescriptorId" />
           </key>
@@ -3162,8 +3168,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.AccommodationDescriptorAggregate.EdFi.AccommodationDescriptor" table="AccommodationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.AccommodationDescriptorAggregate.EdFi.AccommodationDescriptor" lazy="false" discriminator-value="edfi.AccommodationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AccommodationDescriptor" >
           <key>
             <column name="AccommodationDescriptorId" />
           </key>
@@ -3176,8 +3184,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.AccountTypeDescriptorAggregate.EdFi.AccountTypeDescriptor" table="AccountTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.AccountTypeDescriptorAggregate.EdFi.AccountTypeDescriptor" lazy="false" discriminator-value="edfi.AccountTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AccountTypeDescriptor" >
           <key>
             <column name="AccountTypeDescriptorId" />
           </key>
@@ -3190,8 +3200,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.AchievementCategoryDescriptorAggregate.EdFi.AchievementCategoryDescriptor" table="AchievementCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.AchievementCategoryDescriptorAggregate.EdFi.AchievementCategoryDescriptor" lazy="false" discriminator-value="edfi.AchievementCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AchievementCategoryDescriptor" >
           <key>
             <column name="AchievementCategoryDescriptorId" />
           </key>
@@ -3204,8 +3216,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.AdditionalCreditTypeDescriptorAggregate.EdFi.AdditionalCreditTypeDescriptor" table="AdditionalCreditTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.AdditionalCreditTypeDescriptorAggregate.EdFi.AdditionalCreditTypeDescriptor" lazy="false" discriminator-value="edfi.AdditionalCreditTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AdditionalCreditTypeDescriptor" >
           <key>
             <column name="AdditionalCreditTypeDescriptorId" />
           </key>
@@ -3218,8 +3232,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.AddressTypeDescriptorAggregate.EdFi.AddressTypeDescriptor" table="AddressTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.AddressTypeDescriptorAggregate.EdFi.AddressTypeDescriptor" lazy="false" discriminator-value="edfi.AddressTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AddressTypeDescriptor" >
           <key>
             <column name="AddressTypeDescriptorId" />
           </key>
@@ -3232,8 +3248,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.AdministrationEnvironmentDescriptorAggregate.EdFi.AdministrationEnvironmentDescriptor" table="AdministrationEnvironmentDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.AdministrationEnvironmentDescriptorAggregate.EdFi.AdministrationEnvironmentDescriptor" lazy="false" discriminator-value="edfi.AdministrationEnvironmentDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AdministrationEnvironmentDescriptor" >
           <key>
             <column name="AdministrationEnvironmentDescriptorId" />
           </key>
@@ -3246,8 +3264,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.AdministrativeFundingControlDescriptorAggregate.EdFi.AdministrativeFundingControlDescriptor" table="AdministrativeFundingControlDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.AdministrativeFundingControlDescriptorAggregate.EdFi.AdministrativeFundingControlDescriptor" lazy="false" discriminator-value="edfi.AdministrativeFundingControlDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AdministrativeFundingControlDescriptor" >
           <key>
             <column name="AdministrativeFundingControlDescriptorId" />
           </key>
@@ -3260,8 +3280,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.AncestryEthnicOriginDescriptorAggregate.EdFi.AncestryEthnicOriginDescriptor" table="AncestryEthnicOriginDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.AncestryEthnicOriginDescriptorAggregate.EdFi.AncestryEthnicOriginDescriptor" lazy="false" discriminator-value="edfi.AncestryEthnicOriginDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AncestryEthnicOriginDescriptor" >
           <key>
             <column name="AncestryEthnicOriginDescriptorId" />
           </key>
@@ -3274,8 +3296,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.AssessmentCategoryDescriptorAggregate.EdFi.AssessmentCategoryDescriptor" table="AssessmentCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.AssessmentCategoryDescriptorAggregate.EdFi.AssessmentCategoryDescriptor" lazy="false" discriminator-value="edfi.AssessmentCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AssessmentCategoryDescriptor" >
           <key>
             <column name="AssessmentCategoryDescriptorId" />
           </key>
@@ -3288,8 +3312,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.AssessmentIdentificationSystemDescriptorAggregate.EdFi.AssessmentIdentificationSystemDescriptor" table="AssessmentIdentificationSystemDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.AssessmentIdentificationSystemDescriptorAggregate.EdFi.AssessmentIdentificationSystemDescriptor" lazy="false" discriminator-value="edfi.AssessmentIdentificationSystemDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AssessmentIdentificationSystemDescriptor" >
           <key>
             <column name="AssessmentIdentificationSystemDescriptorId" />
           </key>
@@ -3302,8 +3328,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.AssessmentItemCategoryDescriptorAggregate.EdFi.AssessmentItemCategoryDescriptor" table="AssessmentItemCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.AssessmentItemCategoryDescriptorAggregate.EdFi.AssessmentItemCategoryDescriptor" lazy="false" discriminator-value="edfi.AssessmentItemCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AssessmentItemCategoryDescriptor" >
           <key>
             <column name="AssessmentItemCategoryDescriptorId" />
           </key>
@@ -3316,8 +3344,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.AssessmentItemResultDescriptorAggregate.EdFi.AssessmentItemResultDescriptor" table="AssessmentItemResultDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.AssessmentItemResultDescriptorAggregate.EdFi.AssessmentItemResultDescriptor" lazy="false" discriminator-value="edfi.AssessmentItemResultDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AssessmentItemResultDescriptor" >
           <key>
             <column name="AssessmentItemResultDescriptorId" />
           </key>
@@ -3330,8 +3360,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.AssessmentPeriodDescriptorAggregate.EdFi.AssessmentPeriodDescriptor" table="AssessmentPeriodDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.AssessmentPeriodDescriptorAggregate.EdFi.AssessmentPeriodDescriptor" lazy="false" discriminator-value="edfi.AssessmentPeriodDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AssessmentPeriodDescriptor" >
           <key>
             <column name="AssessmentPeriodDescriptorId" />
           </key>
@@ -3344,8 +3376,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.AssessmentReportingMethodDescriptorAggregate.EdFi.AssessmentReportingMethodDescriptor" table="AssessmentReportingMethodDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.AssessmentReportingMethodDescriptorAggregate.EdFi.AssessmentReportingMethodDescriptor" lazy="false" discriminator-value="edfi.AssessmentReportingMethodDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AssessmentReportingMethodDescriptor" >
           <key>
             <column name="AssessmentReportingMethodDescriptorId" />
           </key>
@@ -3358,8 +3392,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.AssignmentLateStatusDescriptorAggregate.EdFi.AssignmentLateStatusDescriptor" table="AssignmentLateStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.AssignmentLateStatusDescriptorAggregate.EdFi.AssignmentLateStatusDescriptor" lazy="false" discriminator-value="edfi.AssignmentLateStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AssignmentLateStatusDescriptor" >
           <key>
             <column name="AssignmentLateStatusDescriptorId" />
           </key>
@@ -3372,8 +3408,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.AttemptStatusDescriptorAggregate.EdFi.AttemptStatusDescriptor" table="AttemptStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.AttemptStatusDescriptorAggregate.EdFi.AttemptStatusDescriptor" lazy="false" discriminator-value="edfi.AttemptStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AttemptStatusDescriptor" >
           <key>
             <column name="AttemptStatusDescriptorId" />
           </key>
@@ -3386,8 +3424,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.AttendanceEventCategoryDescriptorAggregate.EdFi.AttendanceEventCategoryDescriptor" table="AttendanceEventCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.AttendanceEventCategoryDescriptorAggregate.EdFi.AttendanceEventCategoryDescriptor" lazy="false" discriminator-value="edfi.AttendanceEventCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AttendanceEventCategoryDescriptor" >
           <key>
             <column name="AttendanceEventCategoryDescriptorId" />
           </key>
@@ -3400,8 +3440,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.BarrierToInternetAccessInResidenceDescriptorAggregate.EdFi.BarrierToInternetAccessInResidenceDescriptor" table="BarrierToInternetAccessInResidenceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.BarrierToInternetAccessInResidenceDescriptorAggregate.EdFi.BarrierToInternetAccessInResidenceDescriptor" lazy="false" discriminator-value="edfi.BarrierToInternetAccessInResidenceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="BarrierToInternetAccessInResidenceDescriptor" >
           <key>
             <column name="BarrierToInternetAccessInResidenceDescriptorId" />
           </key>
@@ -3414,8 +3456,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.BehaviorDescriptorAggregate.EdFi.BehaviorDescriptor" table="BehaviorDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.BehaviorDescriptorAggregate.EdFi.BehaviorDescriptor" lazy="false" discriminator-value="edfi.BehaviorDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="BehaviorDescriptor" >
           <key>
             <column name="BehaviorDescriptorId" />
           </key>
@@ -3428,8 +3472,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.BusRouteDescriptorAggregate.EdFi.BusRouteDescriptor" table="BusRouteDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.BusRouteDescriptorAggregate.EdFi.BusRouteDescriptor" lazy="false" discriminator-value="edfi.BusRouteDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="BusRouteDescriptor" >
           <key>
             <column name="BusRouteDescriptorId" />
           </key>
@@ -3442,8 +3488,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CalendarEventDescriptorAggregate.EdFi.CalendarEventDescriptor" table="CalendarEventDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CalendarEventDescriptorAggregate.EdFi.CalendarEventDescriptor" lazy="false" discriminator-value="edfi.CalendarEventDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CalendarEventDescriptor" >
           <key>
             <column name="CalendarEventDescriptorId" />
           </key>
@@ -3456,8 +3504,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CalendarTypeDescriptorAggregate.EdFi.CalendarTypeDescriptor" table="CalendarTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CalendarTypeDescriptorAggregate.EdFi.CalendarTypeDescriptor" lazy="false" discriminator-value="edfi.CalendarTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CalendarTypeDescriptor" >
           <key>
             <column name="CalendarTypeDescriptorId" />
           </key>
@@ -3470,8 +3520,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CareerPathwayDescriptorAggregate.EdFi.CareerPathwayDescriptor" table="CareerPathwayDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CareerPathwayDescriptorAggregate.EdFi.CareerPathwayDescriptor" lazy="false" discriminator-value="edfi.CareerPathwayDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CareerPathwayDescriptor" >
           <key>
             <column name="CareerPathwayDescriptorId" />
           </key>
@@ -3484,8 +3536,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CharterApprovalAgencyTypeDescriptorAggregate.EdFi.CharterApprovalAgencyTypeDescriptor" table="CharterApprovalAgencyTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CharterApprovalAgencyTypeDescriptorAggregate.EdFi.CharterApprovalAgencyTypeDescriptor" lazy="false" discriminator-value="edfi.CharterApprovalAgencyTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CharterApprovalAgencyTypeDescriptor" >
           <key>
             <column name="CharterApprovalAgencyTypeDescriptorId" />
           </key>
@@ -3498,8 +3552,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CharterStatusDescriptorAggregate.EdFi.CharterStatusDescriptor" table="CharterStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CharterStatusDescriptorAggregate.EdFi.CharterStatusDescriptor" lazy="false" discriminator-value="edfi.CharterStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CharterStatusDescriptor" >
           <key>
             <column name="CharterStatusDescriptorId" />
           </key>
@@ -3512,8 +3568,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CitizenshipStatusDescriptorAggregate.EdFi.CitizenshipStatusDescriptor" table="CitizenshipStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CitizenshipStatusDescriptorAggregate.EdFi.CitizenshipStatusDescriptor" lazy="false" discriminator-value="edfi.CitizenshipStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CitizenshipStatusDescriptor" >
           <key>
             <column name="CitizenshipStatusDescriptorId" />
           </key>
@@ -3526,8 +3584,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ClassroomPositionDescriptorAggregate.EdFi.ClassroomPositionDescriptor" table="ClassroomPositionDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ClassroomPositionDescriptorAggregate.EdFi.ClassroomPositionDescriptor" lazy="false" discriminator-value="edfi.ClassroomPositionDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ClassroomPositionDescriptor" >
           <key>
             <column name="ClassroomPositionDescriptorId" />
           </key>
@@ -3540,8 +3600,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CohortScopeDescriptorAggregate.EdFi.CohortScopeDescriptor" table="CohortScopeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CohortScopeDescriptorAggregate.EdFi.CohortScopeDescriptor" lazy="false" discriminator-value="edfi.CohortScopeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CohortScopeDescriptor" >
           <key>
             <column name="CohortScopeDescriptorId" />
           </key>
@@ -3554,8 +3616,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CohortTypeDescriptorAggregate.EdFi.CohortTypeDescriptor" table="CohortTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CohortTypeDescriptorAggregate.EdFi.CohortTypeDescriptor" lazy="false" discriminator-value="edfi.CohortTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CohortTypeDescriptor" >
           <key>
             <column name="CohortTypeDescriptorId" />
           </key>
@@ -3568,8 +3632,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CohortYearTypeDescriptorAggregate.EdFi.CohortYearTypeDescriptor" table="CohortYearTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CohortYearTypeDescriptorAggregate.EdFi.CohortYearTypeDescriptor" lazy="false" discriminator-value="edfi.CohortYearTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CohortYearTypeDescriptor" >
           <key>
             <column name="CohortYearTypeDescriptorId" />
           </key>
@@ -3582,8 +3648,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CompetencyLevelDescriptorAggregate.EdFi.CompetencyLevelDescriptor" table="CompetencyLevelDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CompetencyLevelDescriptorAggregate.EdFi.CompetencyLevelDescriptor" lazy="false" discriminator-value="edfi.CompetencyLevelDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CompetencyLevelDescriptor" >
           <key>
             <column name="CompetencyLevelDescriptorId" />
           </key>
@@ -3596,8 +3664,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ContactTypeDescriptorAggregate.EdFi.ContactTypeDescriptor" table="ContactTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ContactTypeDescriptorAggregate.EdFi.ContactTypeDescriptor" lazy="false" discriminator-value="edfi.ContactTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ContactTypeDescriptor" >
           <key>
             <column name="ContactTypeDescriptorId" />
           </key>
@@ -3610,8 +3680,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ContentClassDescriptorAggregate.EdFi.ContentClassDescriptor" table="ContentClassDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ContentClassDescriptorAggregate.EdFi.ContentClassDescriptor" lazy="false" discriminator-value="edfi.ContentClassDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ContentClassDescriptor" >
           <key>
             <column name="ContentClassDescriptorId" />
           </key>
@@ -3624,8 +3696,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ContinuationOfServicesReasonDescriptorAggregate.EdFi.ContinuationOfServicesReasonDescriptor" table="ContinuationOfServicesReasonDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ContinuationOfServicesReasonDescriptorAggregate.EdFi.ContinuationOfServicesReasonDescriptor" lazy="false" discriminator-value="edfi.ContinuationOfServicesReasonDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ContinuationOfServicesReasonDescriptor" >
           <key>
             <column name="ContinuationOfServicesReasonDescriptorId" />
           </key>
@@ -3638,8 +3712,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CostRateDescriptorAggregate.EdFi.CostRateDescriptor" table="CostRateDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CostRateDescriptorAggregate.EdFi.CostRateDescriptor" lazy="false" discriminator-value="edfi.CostRateDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CostRateDescriptor" >
           <key>
             <column name="CostRateDescriptorId" />
           </key>
@@ -3652,8 +3728,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CountryDescriptorAggregate.EdFi.CountryDescriptor" table="CountryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CountryDescriptorAggregate.EdFi.CountryDescriptor" lazy="false" discriminator-value="edfi.CountryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CountryDescriptor" >
           <key>
             <column name="CountryDescriptorId" />
           </key>
@@ -3666,8 +3744,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CourseAttemptResultDescriptorAggregate.EdFi.CourseAttemptResultDescriptor" table="CourseAttemptResultDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CourseAttemptResultDescriptorAggregate.EdFi.CourseAttemptResultDescriptor" lazy="false" discriminator-value="edfi.CourseAttemptResultDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CourseAttemptResultDescriptor" >
           <key>
             <column name="CourseAttemptResultDescriptorId" />
           </key>
@@ -3680,8 +3760,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CourseDefinedByDescriptorAggregate.EdFi.CourseDefinedByDescriptor" table="CourseDefinedByDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CourseDefinedByDescriptorAggregate.EdFi.CourseDefinedByDescriptor" lazy="false" discriminator-value="edfi.CourseDefinedByDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CourseDefinedByDescriptor" >
           <key>
             <column name="CourseDefinedByDescriptorId" />
           </key>
@@ -3694,8 +3776,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CourseGPAApplicabilityDescriptorAggregate.EdFi.CourseGPAApplicabilityDescriptor" table="CourseGPAApplicabilityDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CourseGPAApplicabilityDescriptorAggregate.EdFi.CourseGPAApplicabilityDescriptor" lazy="false" discriminator-value="edfi.CourseGPAApplicabilityDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CourseGPAApplicabilityDescriptor" >
           <key>
             <column name="CourseGPAApplicabilityDescriptorId" />
           </key>
@@ -3708,8 +3792,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CourseIdentificationSystemDescriptorAggregate.EdFi.CourseIdentificationSystemDescriptor" table="CourseIdentificationSystemDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CourseIdentificationSystemDescriptorAggregate.EdFi.CourseIdentificationSystemDescriptor" lazy="false" discriminator-value="edfi.CourseIdentificationSystemDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CourseIdentificationSystemDescriptor" >
           <key>
             <column name="CourseIdentificationSystemDescriptorId" />
           </key>
@@ -3722,8 +3808,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CourseLevelCharacteristicDescriptorAggregate.EdFi.CourseLevelCharacteristicDescriptor" table="CourseLevelCharacteristicDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CourseLevelCharacteristicDescriptorAggregate.EdFi.CourseLevelCharacteristicDescriptor" lazy="false" discriminator-value="edfi.CourseLevelCharacteristicDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CourseLevelCharacteristicDescriptor" >
           <key>
             <column name="CourseLevelCharacteristicDescriptorId" />
           </key>
@@ -3736,8 +3824,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CourseRepeatCodeDescriptorAggregate.EdFi.CourseRepeatCodeDescriptor" table="CourseRepeatCodeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CourseRepeatCodeDescriptorAggregate.EdFi.CourseRepeatCodeDescriptor" lazy="false" discriminator-value="edfi.CourseRepeatCodeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CourseRepeatCodeDescriptor" >
           <key>
             <column name="CourseRepeatCodeDescriptorId" />
           </key>
@@ -3750,8 +3840,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CredentialFieldDescriptorAggregate.EdFi.CredentialFieldDescriptor" table="CredentialFieldDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CredentialFieldDescriptorAggregate.EdFi.CredentialFieldDescriptor" lazy="false" discriminator-value="edfi.CredentialFieldDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CredentialFieldDescriptor" >
           <key>
             <column name="CredentialFieldDescriptorId" />
           </key>
@@ -3764,8 +3856,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CredentialTypeDescriptorAggregate.EdFi.CredentialTypeDescriptor" table="CredentialTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CredentialTypeDescriptorAggregate.EdFi.CredentialTypeDescriptor" lazy="false" discriminator-value="edfi.CredentialTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CredentialTypeDescriptor" >
           <key>
             <column name="CredentialTypeDescriptorId" />
           </key>
@@ -3778,8 +3872,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CreditCategoryDescriptorAggregate.EdFi.CreditCategoryDescriptor" table="CreditCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CreditCategoryDescriptorAggregate.EdFi.CreditCategoryDescriptor" lazy="false" discriminator-value="edfi.CreditCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CreditCategoryDescriptor" >
           <key>
             <column name="CreditCategoryDescriptorId" />
           </key>
@@ -3792,8 +3888,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CreditTypeDescriptorAggregate.EdFi.CreditTypeDescriptor" table="CreditTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CreditTypeDescriptorAggregate.EdFi.CreditTypeDescriptor" lazy="false" discriminator-value="edfi.CreditTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CreditTypeDescriptor" >
           <key>
             <column name="CreditTypeDescriptorId" />
           </key>
@@ -3806,8 +3904,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CrisisTypeDescriptorAggregate.EdFi.CrisisTypeDescriptor" table="CrisisTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CrisisTypeDescriptorAggregate.EdFi.CrisisTypeDescriptor" lazy="false" discriminator-value="edfi.CrisisTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CrisisTypeDescriptor" >
           <key>
             <column name="CrisisTypeDescriptorId" />
           </key>
@@ -3820,8 +3920,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CTEProgramServiceDescriptorAggregate.EdFi.CTEProgramServiceDescriptor" table="CTEProgramServiceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CTEProgramServiceDescriptorAggregate.EdFi.CTEProgramServiceDescriptor" lazy="false" discriminator-value="edfi.CTEProgramServiceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CTEProgramServiceDescriptor" >
           <key>
             <column name="CTEProgramServiceDescriptorId" />
           </key>
@@ -3834,8 +3936,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.CurriculumUsedDescriptorAggregate.EdFi.CurriculumUsedDescriptor" table="CurriculumUsedDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.CurriculumUsedDescriptorAggregate.EdFi.CurriculumUsedDescriptor" lazy="false" discriminator-value="edfi.CurriculumUsedDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CurriculumUsedDescriptor" >
           <key>
             <column name="CurriculumUsedDescriptorId" />
           </key>
@@ -3848,8 +3952,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.DeliveryMethodDescriptorAggregate.EdFi.DeliveryMethodDescriptor" table="DeliveryMethodDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.DeliveryMethodDescriptorAggregate.EdFi.DeliveryMethodDescriptor" lazy="false" discriminator-value="edfi.DeliveryMethodDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="DeliveryMethodDescriptor" >
           <key>
             <column name="DeliveryMethodDescriptorId" />
           </key>
@@ -3862,8 +3968,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.DiagnosisDescriptorAggregate.EdFi.DiagnosisDescriptor" table="DiagnosisDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.DiagnosisDescriptorAggregate.EdFi.DiagnosisDescriptor" lazy="false" discriminator-value="edfi.DiagnosisDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="DiagnosisDescriptor" >
           <key>
             <column name="DiagnosisDescriptorId" />
           </key>
@@ -3876,8 +3984,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.DiplomaLevelDescriptorAggregate.EdFi.DiplomaLevelDescriptor" table="DiplomaLevelDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.DiplomaLevelDescriptorAggregate.EdFi.DiplomaLevelDescriptor" lazy="false" discriminator-value="edfi.DiplomaLevelDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="DiplomaLevelDescriptor" >
           <key>
             <column name="DiplomaLevelDescriptorId" />
           </key>
@@ -3890,8 +4000,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.DiplomaTypeDescriptorAggregate.EdFi.DiplomaTypeDescriptor" table="DiplomaTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.DiplomaTypeDescriptorAggregate.EdFi.DiplomaTypeDescriptor" lazy="false" discriminator-value="edfi.DiplomaTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="DiplomaTypeDescriptor" >
           <key>
             <column name="DiplomaTypeDescriptorId" />
           </key>
@@ -3904,8 +4016,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.DisabilityDescriptorAggregate.EdFi.DisabilityDescriptor" table="DisabilityDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.DisabilityDescriptorAggregate.EdFi.DisabilityDescriptor" lazy="false" discriminator-value="edfi.DisabilityDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="DisabilityDescriptor" >
           <key>
             <column name="DisabilityDescriptorId" />
           </key>
@@ -3918,8 +4032,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.DisabilityDesignationDescriptorAggregate.EdFi.DisabilityDesignationDescriptor" table="DisabilityDesignationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.DisabilityDesignationDescriptorAggregate.EdFi.DisabilityDesignationDescriptor" lazy="false" discriminator-value="edfi.DisabilityDesignationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="DisabilityDesignationDescriptor" >
           <key>
             <column name="DisabilityDesignationDescriptorId" />
           </key>
@@ -3932,8 +4048,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.DisabilityDeterminationSourceTypeDescriptorAggregate.EdFi.DisabilityDeterminationSourceTypeDescriptor" table="DisabilityDeterminationSourceTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.DisabilityDeterminationSourceTypeDescriptorAggregate.EdFi.DisabilityDeterminationSourceTypeDescriptor" lazy="false" discriminator-value="edfi.DisabilityDeterminationSourceTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="DisabilityDeterminationSourceTypeDescriptor" >
           <key>
             <column name="DisabilityDeterminationSourceTypeDescriptorId" />
           </key>
@@ -3946,8 +4064,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.DisciplineActionLengthDifferenceReasonDescriptorAggregate.EdFi.DisciplineActionLengthDifferenceReasonDescriptor" table="DisciplineActionLengthDifferenceReasonDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.DisciplineActionLengthDifferenceReasonDescriptorAggregate.EdFi.DisciplineActionLengthDifferenceReasonDescriptor" lazy="false" discriminator-value="edfi.DisciplineActionLengthDifferenceReasonDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="DisciplineActionLengthDifferenceReasonDescriptor" >
           <key>
             <column name="DisciplineActionLengthDifferenceReasonDescriptorId" />
           </key>
@@ -3960,8 +4080,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.DisciplineDescriptorAggregate.EdFi.DisciplineDescriptor" table="DisciplineDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.DisciplineDescriptorAggregate.EdFi.DisciplineDescriptor" lazy="false" discriminator-value="edfi.DisciplineDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="DisciplineDescriptor" >
           <key>
             <column name="DisciplineDescriptorId" />
           </key>
@@ -3974,8 +4096,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.DisciplineIncidentParticipationCodeDescriptorAggregate.EdFi.DisciplineIncidentParticipationCodeDescriptor" table="DisciplineIncidentParticipationCodeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.DisciplineIncidentParticipationCodeDescriptorAggregate.EdFi.DisciplineIncidentParticipationCodeDescriptor" lazy="false" discriminator-value="edfi.DisciplineIncidentParticipationCodeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="DisciplineIncidentParticipationCodeDescriptor" >
           <key>
             <column name="DisciplineIncidentParticipationCodeDescriptorId" />
           </key>
@@ -3988,8 +4112,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.DisplacedStudentStatusDescriptorAggregate.EdFi.DisplacedStudentStatusDescriptor" table="DisplacedStudentStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.DisplacedStudentStatusDescriptorAggregate.EdFi.DisplacedStudentStatusDescriptor" lazy="false" discriminator-value="edfi.DisplacedStudentStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="DisplacedStudentStatusDescriptor" >
           <key>
             <column name="DisplacedStudentStatusDescriptorId" />
           </key>
@@ -4002,8 +4128,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.EducationalEnvironmentDescriptorAggregate.EdFi.EducationalEnvironmentDescriptor" table="EducationalEnvironmentDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.EducationalEnvironmentDescriptorAggregate.EdFi.EducationalEnvironmentDescriptor" lazy="false" discriminator-value="edfi.EducationalEnvironmentDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="EducationalEnvironmentDescriptor" >
           <key>
             <column name="EducationalEnvironmentDescriptorId" />
           </key>
@@ -4016,8 +4144,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.EducationOrganizationAssociationTypeDescriptorAggregate.EdFi.EducationOrganizationAssociationTypeDescriptor" table="EducationOrganizationAssociationTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.EducationOrganizationAssociationTypeDescriptorAggregate.EdFi.EducationOrganizationAssociationTypeDescriptor" lazy="false" discriminator-value="edfi.EducationOrganizationAssociationTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="EducationOrganizationAssociationTypeDescriptor" >
           <key>
             <column name="EducationOrganizationAssociationTypeDescriptorId" />
           </key>
@@ -4030,8 +4160,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.EducationOrganizationCategoryDescriptorAggregate.EdFi.EducationOrganizationCategoryDescriptor" table="EducationOrganizationCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.EducationOrganizationCategoryDescriptorAggregate.EdFi.EducationOrganizationCategoryDescriptor" lazy="false" discriminator-value="edfi.EducationOrganizationCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="EducationOrganizationCategoryDescriptor" >
           <key>
             <column name="EducationOrganizationCategoryDescriptorId" />
           </key>
@@ -4044,8 +4176,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.EducationOrganizationIdentificationSystemDescriptorAggregate.EdFi.EducationOrganizationIdentificationSystemDescriptor" table="EducationOrganizationIdentificationSystemDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.EducationOrganizationIdentificationSystemDescriptorAggregate.EdFi.EducationOrganizationIdentificationSystemDescriptor" lazy="false" discriminator-value="edfi.EducationOrganizationIdentificationSystemDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="EducationOrganizationIdentificationSystemDescriptor" >
           <key>
             <column name="EducationOrganizationIdentificationSystemDescriptorId" />
           </key>
@@ -4058,8 +4192,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.EducationPlanDescriptorAggregate.EdFi.EducationPlanDescriptor" table="EducationPlanDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.EducationPlanDescriptorAggregate.EdFi.EducationPlanDescriptor" lazy="false" discriminator-value="edfi.EducationPlanDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="EducationPlanDescriptor" >
           <key>
             <column name="EducationPlanDescriptorId" />
           </key>
@@ -4072,8 +4208,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ElectronicMailTypeDescriptorAggregate.EdFi.ElectronicMailTypeDescriptor" table="ElectronicMailTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ElectronicMailTypeDescriptorAggregate.EdFi.ElectronicMailTypeDescriptor" lazy="false" discriminator-value="edfi.ElectronicMailTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ElectronicMailTypeDescriptor" >
           <key>
             <column name="ElectronicMailTypeDescriptorId" />
           </key>
@@ -4086,8 +4224,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.EligibilityDelayReasonDescriptorAggregate.EdFi.EligibilityDelayReasonDescriptor" table="EligibilityDelayReasonDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.EligibilityDelayReasonDescriptorAggregate.EdFi.EligibilityDelayReasonDescriptor" lazy="false" discriminator-value="edfi.EligibilityDelayReasonDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="EligibilityDelayReasonDescriptor" >
           <key>
             <column name="EligibilityDelayReasonDescriptorId" />
           </key>
@@ -4100,8 +4240,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.EligibilityEvaluationTypeDescriptorAggregate.EdFi.EligibilityEvaluationTypeDescriptor" table="EligibilityEvaluationTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.EligibilityEvaluationTypeDescriptorAggregate.EdFi.EligibilityEvaluationTypeDescriptor" lazy="false" discriminator-value="edfi.EligibilityEvaluationTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="EligibilityEvaluationTypeDescriptor" >
           <key>
             <column name="EligibilityEvaluationTypeDescriptorId" />
           </key>
@@ -4114,8 +4256,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.EmploymentStatusDescriptorAggregate.EdFi.EmploymentStatusDescriptor" table="EmploymentStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.EmploymentStatusDescriptorAggregate.EdFi.EmploymentStatusDescriptor" lazy="false" discriminator-value="edfi.EmploymentStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="EmploymentStatusDescriptor" >
           <key>
             <column name="EmploymentStatusDescriptorId" />
           </key>
@@ -4128,8 +4272,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.EnrollmentTypeDescriptorAggregate.EdFi.EnrollmentTypeDescriptor" table="EnrollmentTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.EnrollmentTypeDescriptorAggregate.EdFi.EnrollmentTypeDescriptor" lazy="false" discriminator-value="edfi.EnrollmentTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="EnrollmentTypeDescriptor" >
           <key>
             <column name="EnrollmentTypeDescriptorId" />
           </key>
@@ -4142,8 +4288,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.EntryGradeLevelReasonDescriptorAggregate.EdFi.EntryGradeLevelReasonDescriptor" table="EntryGradeLevelReasonDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.EntryGradeLevelReasonDescriptorAggregate.EdFi.EntryGradeLevelReasonDescriptor" lazy="false" discriminator-value="edfi.EntryGradeLevelReasonDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="EntryGradeLevelReasonDescriptor" >
           <key>
             <column name="EntryGradeLevelReasonDescriptorId" />
           </key>
@@ -4156,8 +4304,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.EntryTypeDescriptorAggregate.EdFi.EntryTypeDescriptor" table="EntryTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.EntryTypeDescriptorAggregate.EdFi.EntryTypeDescriptor" lazy="false" discriminator-value="edfi.EntryTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="EntryTypeDescriptor" >
           <key>
             <column name="EntryTypeDescriptorId" />
           </key>
@@ -4170,8 +4320,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.EvaluationDelayReasonDescriptorAggregate.EdFi.EvaluationDelayReasonDescriptor" table="EvaluationDelayReasonDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.EvaluationDelayReasonDescriptorAggregate.EdFi.EvaluationDelayReasonDescriptor" lazy="false" discriminator-value="edfi.EvaluationDelayReasonDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="EvaluationDelayReasonDescriptor" >
           <key>
             <column name="EvaluationDelayReasonDescriptorId" />
           </key>
@@ -4184,8 +4336,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.EventCircumstanceDescriptorAggregate.EdFi.EventCircumstanceDescriptor" table="EventCircumstanceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.EventCircumstanceDescriptorAggregate.EdFi.EventCircumstanceDescriptor" lazy="false" discriminator-value="edfi.EventCircumstanceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="EventCircumstanceDescriptor" >
           <key>
             <column name="EventCircumstanceDescriptorId" />
           </key>
@@ -4198,8 +4352,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ExitWithdrawTypeDescriptorAggregate.EdFi.ExitWithdrawTypeDescriptor" table="ExitWithdrawTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ExitWithdrawTypeDescriptorAggregate.EdFi.ExitWithdrawTypeDescriptor" lazy="false" discriminator-value="edfi.ExitWithdrawTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ExitWithdrawTypeDescriptor" >
           <key>
             <column name="ExitWithdrawTypeDescriptorId" />
           </key>
@@ -4212,8 +4368,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.FinancialCollectionDescriptorAggregate.EdFi.FinancialCollectionDescriptor" table="FinancialCollectionDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.FinancialCollectionDescriptorAggregate.EdFi.FinancialCollectionDescriptor" lazy="false" discriminator-value="edfi.FinancialCollectionDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="FinancialCollectionDescriptor" >
           <key>
             <column name="FinancialCollectionDescriptorId" />
           </key>
@@ -4226,8 +4384,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.GradebookEntryTypeDescriptorAggregate.EdFi.GradebookEntryTypeDescriptor" table="GradebookEntryTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.GradebookEntryTypeDescriptorAggregate.EdFi.GradebookEntryTypeDescriptor" lazy="false" discriminator-value="edfi.GradebookEntryTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="GradebookEntryTypeDescriptor" >
           <key>
             <column name="GradebookEntryTypeDescriptorId" />
           </key>
@@ -4240,8 +4400,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.GradeLevelDescriptorAggregate.EdFi.GradeLevelDescriptor" table="GradeLevelDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.GradeLevelDescriptorAggregate.EdFi.GradeLevelDescriptor" lazy="false" discriminator-value="edfi.GradeLevelDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="GradeLevelDescriptor" >
           <key>
             <column name="GradeLevelDescriptorId" />
           </key>
@@ -4254,8 +4416,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.GradePointAverageTypeDescriptorAggregate.EdFi.GradePointAverageTypeDescriptor" table="GradePointAverageTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.GradePointAverageTypeDescriptorAggregate.EdFi.GradePointAverageTypeDescriptor" lazy="false" discriminator-value="edfi.GradePointAverageTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="GradePointAverageTypeDescriptor" >
           <key>
             <column name="GradePointAverageTypeDescriptorId" />
           </key>
@@ -4268,8 +4432,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.GradeTypeDescriptorAggregate.EdFi.GradeTypeDescriptor" table="GradeTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.GradeTypeDescriptorAggregate.EdFi.GradeTypeDescriptor" lazy="false" discriminator-value="edfi.GradeTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="GradeTypeDescriptor" >
           <key>
             <column name="GradeTypeDescriptorId" />
           </key>
@@ -4282,8 +4448,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.GradingPeriodDescriptorAggregate.EdFi.GradingPeriodDescriptor" table="GradingPeriodDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.GradingPeriodDescriptorAggregate.EdFi.GradingPeriodDescriptor" lazy="false" discriminator-value="edfi.GradingPeriodDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="GradingPeriodDescriptor" >
           <key>
             <column name="GradingPeriodDescriptorId" />
           </key>
@@ -4296,8 +4464,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.GraduationPlanTypeDescriptorAggregate.EdFi.GraduationPlanTypeDescriptor" table="GraduationPlanTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.GraduationPlanTypeDescriptorAggregate.EdFi.GraduationPlanTypeDescriptor" lazy="false" discriminator-value="edfi.GraduationPlanTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="GraduationPlanTypeDescriptor" >
           <key>
             <column name="GraduationPlanTypeDescriptorId" />
           </key>
@@ -4310,8 +4480,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.GunFreeSchoolsActReportingStatusDescriptorAggregate.EdFi.GunFreeSchoolsActReportingStatusDescriptor" table="GunFreeSchoolsActReportingStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.GunFreeSchoolsActReportingStatusDescriptorAggregate.EdFi.GunFreeSchoolsActReportingStatusDescriptor" lazy="false" discriminator-value="edfi.GunFreeSchoolsActReportingStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="GunFreeSchoolsActReportingStatusDescriptor" >
           <key>
             <column name="GunFreeSchoolsActReportingStatusDescriptorId" />
           </key>
@@ -4324,8 +4496,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.HomelessPrimaryNighttimeResidenceDescriptorAggregate.EdFi.HomelessPrimaryNighttimeResidenceDescriptor" table="HomelessPrimaryNighttimeResidenceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.HomelessPrimaryNighttimeResidenceDescriptorAggregate.EdFi.HomelessPrimaryNighttimeResidenceDescriptor" lazy="false" discriminator-value="edfi.HomelessPrimaryNighttimeResidenceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="HomelessPrimaryNighttimeResidenceDescriptor" >
           <key>
             <column name="HomelessPrimaryNighttimeResidenceDescriptorId" />
           </key>
@@ -4338,8 +4512,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.HomelessProgramServiceDescriptorAggregate.EdFi.HomelessProgramServiceDescriptor" table="HomelessProgramServiceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.HomelessProgramServiceDescriptorAggregate.EdFi.HomelessProgramServiceDescriptor" lazy="false" discriminator-value="edfi.HomelessProgramServiceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="HomelessProgramServiceDescriptor" >
           <key>
             <column name="HomelessProgramServiceDescriptorId" />
           </key>
@@ -4352,8 +4528,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.IDEAPartDescriptorAggregate.EdFi.IDEAPartDescriptor" table="IDEAPartDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.IDEAPartDescriptorAggregate.EdFi.IDEAPartDescriptor" lazy="false" discriminator-value="edfi.IDEAPartDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="IDEAPartDescriptor" >
           <key>
             <column name="IDEAPartDescriptorId" />
           </key>
@@ -4366,8 +4544,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.IdentificationDocumentUseDescriptorAggregate.EdFi.IdentificationDocumentUseDescriptor" table="IdentificationDocumentUseDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.IdentificationDocumentUseDescriptorAggregate.EdFi.IdentificationDocumentUseDescriptor" lazy="false" discriminator-value="edfi.IdentificationDocumentUseDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="IdentificationDocumentUseDescriptor" >
           <key>
             <column name="IdentificationDocumentUseDescriptorId" />
           </key>
@@ -4380,8 +4560,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ImmunizationTypeDescriptorAggregate.EdFi.ImmunizationTypeDescriptor" table="ImmunizationTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ImmunizationTypeDescriptorAggregate.EdFi.ImmunizationTypeDescriptor" lazy="false" discriminator-value="edfi.ImmunizationTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ImmunizationTypeDescriptor" >
           <key>
             <column name="ImmunizationTypeDescriptorId" />
           </key>
@@ -4394,8 +4576,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.IncidentLocationDescriptorAggregate.EdFi.IncidentLocationDescriptor" table="IncidentLocationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.IncidentLocationDescriptorAggregate.EdFi.IncidentLocationDescriptor" lazy="false" discriminator-value="edfi.IncidentLocationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="IncidentLocationDescriptor" >
           <key>
             <column name="IncidentLocationDescriptorId" />
           </key>
@@ -4408,8 +4592,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.IndicatorDescriptorAggregate.EdFi.IndicatorDescriptor" table="IndicatorDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.IndicatorDescriptorAggregate.EdFi.IndicatorDescriptor" lazy="false" discriminator-value="edfi.IndicatorDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="IndicatorDescriptor" >
           <key>
             <column name="IndicatorDescriptorId" />
           </key>
@@ -4422,8 +4608,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.IndicatorGroupDescriptorAggregate.EdFi.IndicatorGroupDescriptor" table="IndicatorGroupDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.IndicatorGroupDescriptorAggregate.EdFi.IndicatorGroupDescriptor" lazy="false" discriminator-value="edfi.IndicatorGroupDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="IndicatorGroupDescriptor" >
           <key>
             <column name="IndicatorGroupDescriptorId" />
           </key>
@@ -4436,8 +4624,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.IndicatorLevelDescriptorAggregate.EdFi.IndicatorLevelDescriptor" table="IndicatorLevelDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.IndicatorLevelDescriptorAggregate.EdFi.IndicatorLevelDescriptor" lazy="false" discriminator-value="edfi.IndicatorLevelDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="IndicatorLevelDescriptor" >
           <key>
             <column name="IndicatorLevelDescriptorId" />
           </key>
@@ -4450,8 +4640,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.InstitutionTelephoneNumberTypeDescriptorAggregate.EdFi.InstitutionTelephoneNumberTypeDescriptor" table="InstitutionTelephoneNumberTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.InstitutionTelephoneNumberTypeDescriptorAggregate.EdFi.InstitutionTelephoneNumberTypeDescriptor" lazy="false" discriminator-value="edfi.InstitutionTelephoneNumberTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="InstitutionTelephoneNumberTypeDescriptor" >
           <key>
             <column name="InstitutionTelephoneNumberTypeDescriptorId" />
           </key>
@@ -4464,8 +4656,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.InteractivityStyleDescriptorAggregate.EdFi.InteractivityStyleDescriptor" table="InteractivityStyleDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.InteractivityStyleDescriptorAggregate.EdFi.InteractivityStyleDescriptor" lazy="false" discriminator-value="edfi.InteractivityStyleDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="InteractivityStyleDescriptor" >
           <key>
             <column name="InteractivityStyleDescriptorId" />
           </key>
@@ -4478,8 +4672,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.InternetAccessDescriptorAggregate.EdFi.InternetAccessDescriptor" table="InternetAccessDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.InternetAccessDescriptorAggregate.EdFi.InternetAccessDescriptor" lazy="false" discriminator-value="edfi.InternetAccessDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="InternetAccessDescriptor" >
           <key>
             <column name="InternetAccessDescriptorId" />
           </key>
@@ -4492,8 +4688,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.InternetAccessTypeInResidenceDescriptorAggregate.EdFi.InternetAccessTypeInResidenceDescriptor" table="InternetAccessTypeInResidenceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.InternetAccessTypeInResidenceDescriptorAggregate.EdFi.InternetAccessTypeInResidenceDescriptor" lazy="false" discriminator-value="edfi.InternetAccessTypeInResidenceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="InternetAccessTypeInResidenceDescriptor" >
           <key>
             <column name="InternetAccessTypeInResidenceDescriptorId" />
           </key>
@@ -4506,8 +4704,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.InternetPerformanceInResidenceDescriptorAggregate.EdFi.InternetPerformanceInResidenceDescriptor" table="InternetPerformanceInResidenceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.InternetPerformanceInResidenceDescriptorAggregate.EdFi.InternetPerformanceInResidenceDescriptor" lazy="false" discriminator-value="edfi.InternetPerformanceInResidenceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="InternetPerformanceInResidenceDescriptor" >
           <key>
             <column name="InternetPerformanceInResidenceDescriptorId" />
           </key>
@@ -4520,8 +4720,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.InterventionClassDescriptorAggregate.EdFi.InterventionClassDescriptor" table="InterventionClassDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.InterventionClassDescriptorAggregate.EdFi.InterventionClassDescriptor" lazy="false" discriminator-value="edfi.InterventionClassDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="InterventionClassDescriptor" >
           <key>
             <column name="InterventionClassDescriptorId" />
           </key>
@@ -4534,8 +4736,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.InterventionEffectivenessRatingDescriptorAggregate.EdFi.InterventionEffectivenessRatingDescriptor" table="InterventionEffectivenessRatingDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.InterventionEffectivenessRatingDescriptorAggregate.EdFi.InterventionEffectivenessRatingDescriptor" lazy="false" discriminator-value="edfi.InterventionEffectivenessRatingDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="InterventionEffectivenessRatingDescriptor" >
           <key>
             <column name="InterventionEffectivenessRatingDescriptorId" />
           </key>
@@ -4548,8 +4752,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.LanguageDescriptorAggregate.EdFi.LanguageDescriptor" table="LanguageDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.LanguageDescriptorAggregate.EdFi.LanguageDescriptor" lazy="false" discriminator-value="edfi.LanguageDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LanguageDescriptor" >
           <key>
             <column name="LanguageDescriptorId" />
           </key>
@@ -4562,8 +4768,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.LanguageInstructionProgramServiceDescriptorAggregate.EdFi.LanguageInstructionProgramServiceDescriptor" table="LanguageInstructionProgramServiceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.LanguageInstructionProgramServiceDescriptorAggregate.EdFi.LanguageInstructionProgramServiceDescriptor" lazy="false" discriminator-value="edfi.LanguageInstructionProgramServiceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LanguageInstructionProgramServiceDescriptor" >
           <key>
             <column name="LanguageInstructionProgramServiceDescriptorId" />
           </key>
@@ -4576,8 +4784,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.LanguageUseDescriptorAggregate.EdFi.LanguageUseDescriptor" table="LanguageUseDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.LanguageUseDescriptorAggregate.EdFi.LanguageUseDescriptor" lazy="false" discriminator-value="edfi.LanguageUseDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LanguageUseDescriptor" >
           <key>
             <column name="LanguageUseDescriptorId" />
           </key>
@@ -4590,8 +4800,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.LearningStandardCategoryDescriptorAggregate.EdFi.LearningStandardCategoryDescriptor" table="LearningStandardCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.LearningStandardCategoryDescriptorAggregate.EdFi.LearningStandardCategoryDescriptor" lazy="false" discriminator-value="edfi.LearningStandardCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LearningStandardCategoryDescriptor" >
           <key>
             <column name="LearningStandardCategoryDescriptorId" />
           </key>
@@ -4604,8 +4816,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.LearningStandardEquivalenceStrengthDescriptorAggregate.EdFi.LearningStandardEquivalenceStrengthDescriptor" table="LearningStandardEquivalenceStrengthDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.LearningStandardEquivalenceStrengthDescriptorAggregate.EdFi.LearningStandardEquivalenceStrengthDescriptor" lazy="false" discriminator-value="edfi.LearningStandardEquivalenceStrengthDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LearningStandardEquivalenceStrengthDescriptor" >
           <key>
             <column name="LearningStandardEquivalenceStrengthDescriptorId" />
           </key>
@@ -4618,8 +4832,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.LearningStandardScopeDescriptorAggregate.EdFi.LearningStandardScopeDescriptor" table="LearningStandardScopeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.LearningStandardScopeDescriptorAggregate.EdFi.LearningStandardScopeDescriptor" lazy="false" discriminator-value="edfi.LearningStandardScopeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LearningStandardScopeDescriptor" >
           <key>
             <column name="LearningStandardScopeDescriptorId" />
           </key>
@@ -4632,8 +4848,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.LevelOfEducationDescriptorAggregate.EdFi.LevelOfEducationDescriptor" table="LevelOfEducationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.LevelOfEducationDescriptorAggregate.EdFi.LevelOfEducationDescriptor" lazy="false" discriminator-value="edfi.LevelOfEducationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LevelOfEducationDescriptor" >
           <key>
             <column name="LevelOfEducationDescriptorId" />
           </key>
@@ -4646,8 +4864,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.LicenseStatusDescriptorAggregate.EdFi.LicenseStatusDescriptor" table="LicenseStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.LicenseStatusDescriptorAggregate.EdFi.LicenseStatusDescriptor" lazy="false" discriminator-value="edfi.LicenseStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LicenseStatusDescriptor" >
           <key>
             <column name="LicenseStatusDescriptorId" />
           </key>
@@ -4660,8 +4880,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.LicenseTypeDescriptorAggregate.EdFi.LicenseTypeDescriptor" table="LicenseTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.LicenseTypeDescriptorAggregate.EdFi.LicenseTypeDescriptor" lazy="false" discriminator-value="edfi.LicenseTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LicenseTypeDescriptor" >
           <key>
             <column name="LicenseTypeDescriptorId" />
           </key>
@@ -4674,8 +4896,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.LimitedEnglishProficiencyDescriptorAggregate.EdFi.LimitedEnglishProficiencyDescriptor" table="LimitedEnglishProficiencyDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.LimitedEnglishProficiencyDescriptorAggregate.EdFi.LimitedEnglishProficiencyDescriptor" lazy="false" discriminator-value="edfi.LimitedEnglishProficiencyDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LimitedEnglishProficiencyDescriptor" >
           <key>
             <column name="LimitedEnglishProficiencyDescriptorId" />
           </key>
@@ -4688,8 +4912,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.LocaleDescriptorAggregate.EdFi.LocaleDescriptor" table="LocaleDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.LocaleDescriptorAggregate.EdFi.LocaleDescriptor" lazy="false" discriminator-value="edfi.LocaleDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LocaleDescriptor" >
           <key>
             <column name="LocaleDescriptorId" />
           </key>
@@ -4702,8 +4928,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.LocalEducationAgencyCategoryDescriptorAggregate.EdFi.LocalEducationAgencyCategoryDescriptor" table="LocalEducationAgencyCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.LocalEducationAgencyCategoryDescriptorAggregate.EdFi.LocalEducationAgencyCategoryDescriptor" lazy="false" discriminator-value="edfi.LocalEducationAgencyCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LocalEducationAgencyCategoryDescriptor" >
           <key>
             <column name="LocalEducationAgencyCategoryDescriptorId" />
           </key>
@@ -4716,8 +4944,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.MagnetSpecialProgramEmphasisSchoolDescriptorAggregate.EdFi.MagnetSpecialProgramEmphasisSchoolDescriptor" table="MagnetSpecialProgramEmphasisSchoolDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.MagnetSpecialProgramEmphasisSchoolDescriptorAggregate.EdFi.MagnetSpecialProgramEmphasisSchoolDescriptor" lazy="false" discriminator-value="edfi.MagnetSpecialProgramEmphasisSchoolDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="MagnetSpecialProgramEmphasisSchoolDescriptor" >
           <key>
             <column name="MagnetSpecialProgramEmphasisSchoolDescriptorId" />
           </key>
@@ -4730,8 +4960,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.MediumOfInstructionDescriptorAggregate.EdFi.MediumOfInstructionDescriptor" table="MediumOfInstructionDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.MediumOfInstructionDescriptorAggregate.EdFi.MediumOfInstructionDescriptor" lazy="false" discriminator-value="edfi.MediumOfInstructionDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="MediumOfInstructionDescriptor" >
           <key>
             <column name="MediumOfInstructionDescriptorId" />
           </key>
@@ -4744,8 +4976,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.MethodCreditEarnedDescriptorAggregate.EdFi.MethodCreditEarnedDescriptor" table="MethodCreditEarnedDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.MethodCreditEarnedDescriptorAggregate.EdFi.MethodCreditEarnedDescriptor" lazy="false" discriminator-value="edfi.MethodCreditEarnedDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="MethodCreditEarnedDescriptor" >
           <key>
             <column name="MethodCreditEarnedDescriptorId" />
           </key>
@@ -4758,8 +4992,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.MigrantEducationProgramServiceDescriptorAggregate.EdFi.MigrantEducationProgramServiceDescriptor" table="MigrantEducationProgramServiceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.MigrantEducationProgramServiceDescriptorAggregate.EdFi.MigrantEducationProgramServiceDescriptor" lazy="false" discriminator-value="edfi.MigrantEducationProgramServiceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="MigrantEducationProgramServiceDescriptor" >
           <key>
             <column name="MigrantEducationProgramServiceDescriptorId" />
           </key>
@@ -4772,8 +5008,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ModelEntityDescriptorAggregate.EdFi.ModelEntityDescriptor" table="ModelEntityDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ModelEntityDescriptorAggregate.EdFi.ModelEntityDescriptor" lazy="false" discriminator-value="edfi.ModelEntityDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ModelEntityDescriptor" >
           <key>
             <column name="ModelEntityDescriptorId" />
           </key>
@@ -4786,8 +5024,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.MonitoredDescriptorAggregate.EdFi.MonitoredDescriptor" table="MonitoredDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.MonitoredDescriptorAggregate.EdFi.MonitoredDescriptor" lazy="false" discriminator-value="edfi.MonitoredDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="MonitoredDescriptor" >
           <key>
             <column name="MonitoredDescriptorId" />
           </key>
@@ -4800,8 +5040,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.NeglectedOrDelinquentProgramDescriptorAggregate.EdFi.NeglectedOrDelinquentProgramDescriptor" table="NeglectedOrDelinquentProgramDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.NeglectedOrDelinquentProgramDescriptorAggregate.EdFi.NeglectedOrDelinquentProgramDescriptor" lazy="false" discriminator-value="edfi.NeglectedOrDelinquentProgramDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="NeglectedOrDelinquentProgramDescriptor" >
           <key>
             <column name="NeglectedOrDelinquentProgramDescriptorId" />
           </key>
@@ -4814,8 +5056,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.NeglectedOrDelinquentProgramServiceDescriptorAggregate.EdFi.NeglectedOrDelinquentProgramServiceDescriptor" table="NeglectedOrDelinquentProgramServiceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.NeglectedOrDelinquentProgramServiceDescriptorAggregate.EdFi.NeglectedOrDelinquentProgramServiceDescriptor" lazy="false" discriminator-value="edfi.NeglectedOrDelinquentProgramServiceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="NeglectedOrDelinquentProgramServiceDescriptor" >
           <key>
             <column name="NeglectedOrDelinquentProgramServiceDescriptorId" />
           </key>
@@ -4828,8 +5072,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.NetworkPurposeDescriptorAggregate.EdFi.NetworkPurposeDescriptor" table="NetworkPurposeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.NetworkPurposeDescriptorAggregate.EdFi.NetworkPurposeDescriptor" lazy="false" discriminator-value="edfi.NetworkPurposeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="NetworkPurposeDescriptor" >
           <key>
             <column name="NetworkPurposeDescriptorId" />
           </key>
@@ -4842,8 +5088,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.NonMedicalImmunizationExemptionDescriptorAggregate.EdFi.NonMedicalImmunizationExemptionDescriptor" table="NonMedicalImmunizationExemptionDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.NonMedicalImmunizationExemptionDescriptorAggregate.EdFi.NonMedicalImmunizationExemptionDescriptor" lazy="false" discriminator-value="edfi.NonMedicalImmunizationExemptionDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="NonMedicalImmunizationExemptionDescriptor" >
           <key>
             <column name="NonMedicalImmunizationExemptionDescriptorId" />
           </key>
@@ -4856,8 +5104,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.OperationalStatusDescriptorAggregate.EdFi.OperationalStatusDescriptor" table="OperationalStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.OperationalStatusDescriptorAggregate.EdFi.OperationalStatusDescriptor" lazy="false" discriminator-value="edfi.OperationalStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="OperationalStatusDescriptor" >
           <key>
             <column name="OperationalStatusDescriptorId" />
           </key>
@@ -4870,8 +5120,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.OtherNameTypeDescriptorAggregate.EdFi.OtherNameTypeDescriptor" table="OtherNameTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.OtherNameTypeDescriptorAggregate.EdFi.OtherNameTypeDescriptor" lazy="false" discriminator-value="edfi.OtherNameTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="OtherNameTypeDescriptor" >
           <key>
             <column name="OtherNameTypeDescriptorId" />
           </key>
@@ -4884,8 +5136,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ParticipationDescriptorAggregate.EdFi.ParticipationDescriptor" table="ParticipationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ParticipationDescriptorAggregate.EdFi.ParticipationDescriptor" lazy="false" discriminator-value="edfi.ParticipationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ParticipationDescriptor" >
           <key>
             <column name="ParticipationDescriptorId" />
           </key>
@@ -4898,8 +5152,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ParticipationStatusDescriptorAggregate.EdFi.ParticipationStatusDescriptor" table="ParticipationStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ParticipationStatusDescriptorAggregate.EdFi.ParticipationStatusDescriptor" lazy="false" discriminator-value="edfi.ParticipationStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ParticipationStatusDescriptor" >
           <key>
             <column name="ParticipationStatusDescriptorId" />
           </key>
@@ -4912,8 +5168,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.PerformanceBaseConversionDescriptorAggregate.EdFi.PerformanceBaseConversionDescriptor" table="PerformanceBaseConversionDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.PerformanceBaseConversionDescriptorAggregate.EdFi.PerformanceBaseConversionDescriptor" lazy="false" discriminator-value="edfi.PerformanceBaseConversionDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PerformanceBaseConversionDescriptor" >
           <key>
             <column name="PerformanceBaseConversionDescriptorId" />
           </key>
@@ -4926,8 +5184,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.PerformanceLevelDescriptorAggregate.EdFi.PerformanceLevelDescriptor" table="PerformanceLevelDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.PerformanceLevelDescriptorAggregate.EdFi.PerformanceLevelDescriptor" lazy="false" discriminator-value="edfi.PerformanceLevelDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PerformanceLevelDescriptor" >
           <key>
             <column name="PerformanceLevelDescriptorId" />
           </key>
@@ -4940,8 +5200,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.PersonalInformationVerificationDescriptorAggregate.EdFi.PersonalInformationVerificationDescriptor" table="PersonalInformationVerificationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.PersonalInformationVerificationDescriptorAggregate.EdFi.PersonalInformationVerificationDescriptor" lazy="false" discriminator-value="edfi.PersonalInformationVerificationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PersonalInformationVerificationDescriptor" >
           <key>
             <column name="PersonalInformationVerificationDescriptorId" />
           </key>
@@ -4954,8 +5216,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.PlatformTypeDescriptorAggregate.EdFi.PlatformTypeDescriptor" table="PlatformTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.PlatformTypeDescriptorAggregate.EdFi.PlatformTypeDescriptor" lazy="false" discriminator-value="edfi.PlatformTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PlatformTypeDescriptor" >
           <key>
             <column name="PlatformTypeDescriptorId" />
           </key>
@@ -4968,8 +5232,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.PopulationServedDescriptorAggregate.EdFi.PopulationServedDescriptor" table="PopulationServedDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.PopulationServedDescriptorAggregate.EdFi.PopulationServedDescriptor" lazy="false" discriminator-value="edfi.PopulationServedDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PopulationServedDescriptor" >
           <key>
             <column name="PopulationServedDescriptorId" />
           </key>
@@ -4982,8 +5248,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.PostingResultDescriptorAggregate.EdFi.PostingResultDescriptor" table="PostingResultDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.PostingResultDescriptorAggregate.EdFi.PostingResultDescriptor" lazy="false" discriminator-value="edfi.PostingResultDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PostingResultDescriptor" >
           <key>
             <column name="PostingResultDescriptorId" />
           </key>
@@ -4996,8 +5264,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.PostSecondaryEventCategoryDescriptorAggregate.EdFi.PostSecondaryEventCategoryDescriptor" table="PostSecondaryEventCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.PostSecondaryEventCategoryDescriptorAggregate.EdFi.PostSecondaryEventCategoryDescriptor" lazy="false" discriminator-value="edfi.PostSecondaryEventCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PostSecondaryEventCategoryDescriptor" >
           <key>
             <column name="PostSecondaryEventCategoryDescriptorId" />
           </key>
@@ -5010,8 +5280,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.PostSecondaryInstitutionLevelDescriptorAggregate.EdFi.PostSecondaryInstitutionLevelDescriptor" table="PostSecondaryInstitutionLevelDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.PostSecondaryInstitutionLevelDescriptorAggregate.EdFi.PostSecondaryInstitutionLevelDescriptor" lazy="false" discriminator-value="edfi.PostSecondaryInstitutionLevelDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PostSecondaryInstitutionLevelDescriptor" >
           <key>
             <column name="PostSecondaryInstitutionLevelDescriptorId" />
           </key>
@@ -5024,8 +5296,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.PrimaryLearningDeviceAccessDescriptorAggregate.EdFi.PrimaryLearningDeviceAccessDescriptor" table="PrimaryLearningDeviceAccessDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.PrimaryLearningDeviceAccessDescriptorAggregate.EdFi.PrimaryLearningDeviceAccessDescriptor" lazy="false" discriminator-value="edfi.PrimaryLearningDeviceAccessDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PrimaryLearningDeviceAccessDescriptor" >
           <key>
             <column name="PrimaryLearningDeviceAccessDescriptorId" />
           </key>
@@ -5038,8 +5312,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.PrimaryLearningDeviceAwayFromSchoolDescriptorAggregate.EdFi.PrimaryLearningDeviceAwayFromSchoolDescriptor" table="PrimaryLearningDeviceAwayFromSchoolDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.PrimaryLearningDeviceAwayFromSchoolDescriptorAggregate.EdFi.PrimaryLearningDeviceAwayFromSchoolDescriptor" lazy="false" discriminator-value="edfi.PrimaryLearningDeviceAwayFromSchoolDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PrimaryLearningDeviceAwayFromSchoolDescriptor" >
           <key>
             <column name="PrimaryLearningDeviceAwayFromSchoolDescriptorId" />
           </key>
@@ -5052,8 +5328,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.PrimaryLearningDeviceProviderDescriptorAggregate.EdFi.PrimaryLearningDeviceProviderDescriptor" table="PrimaryLearningDeviceProviderDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.PrimaryLearningDeviceProviderDescriptorAggregate.EdFi.PrimaryLearningDeviceProviderDescriptor" lazy="false" discriminator-value="edfi.PrimaryLearningDeviceProviderDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PrimaryLearningDeviceProviderDescriptor" >
           <key>
             <column name="PrimaryLearningDeviceProviderDescriptorId" />
           </key>
@@ -5066,8 +5344,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ProficiencyDescriptorAggregate.EdFi.ProficiencyDescriptor" table="ProficiencyDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ProficiencyDescriptorAggregate.EdFi.ProficiencyDescriptor" lazy="false" discriminator-value="edfi.ProficiencyDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ProficiencyDescriptor" >
           <key>
             <column name="ProficiencyDescriptorId" />
           </key>
@@ -5080,8 +5360,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ProgramAssignmentDescriptorAggregate.EdFi.ProgramAssignmentDescriptor" table="ProgramAssignmentDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ProgramAssignmentDescriptorAggregate.EdFi.ProgramAssignmentDescriptor" lazy="false" discriminator-value="edfi.ProgramAssignmentDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ProgramAssignmentDescriptor" >
           <key>
             <column name="ProgramAssignmentDescriptorId" />
           </key>
@@ -5094,8 +5376,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ProgramCharacteristicDescriptorAggregate.EdFi.ProgramCharacteristicDescriptor" table="ProgramCharacteristicDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ProgramCharacteristicDescriptorAggregate.EdFi.ProgramCharacteristicDescriptor" lazy="false" discriminator-value="edfi.ProgramCharacteristicDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ProgramCharacteristicDescriptor" >
           <key>
             <column name="ProgramCharacteristicDescriptorId" />
           </key>
@@ -5108,8 +5392,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ProgramEvaluationPeriodDescriptorAggregate.EdFi.ProgramEvaluationPeriodDescriptor" table="ProgramEvaluationPeriodDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ProgramEvaluationPeriodDescriptorAggregate.EdFi.ProgramEvaluationPeriodDescriptor" lazy="false" discriminator-value="edfi.ProgramEvaluationPeriodDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ProgramEvaluationPeriodDescriptor" >
           <key>
             <column name="ProgramEvaluationPeriodDescriptorId" />
           </key>
@@ -5122,8 +5408,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ProgramEvaluationTypeDescriptorAggregate.EdFi.ProgramEvaluationTypeDescriptor" table="ProgramEvaluationTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ProgramEvaluationTypeDescriptorAggregate.EdFi.ProgramEvaluationTypeDescriptor" lazy="false" discriminator-value="edfi.ProgramEvaluationTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ProgramEvaluationTypeDescriptor" >
           <key>
             <column name="ProgramEvaluationTypeDescriptorId" />
           </key>
@@ -5136,8 +5424,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ProgramSponsorDescriptorAggregate.EdFi.ProgramSponsorDescriptor" table="ProgramSponsorDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ProgramSponsorDescriptorAggregate.EdFi.ProgramSponsorDescriptor" lazy="false" discriminator-value="edfi.ProgramSponsorDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ProgramSponsorDescriptor" >
           <key>
             <column name="ProgramSponsorDescriptorId" />
           </key>
@@ -5150,8 +5440,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ProgramTypeDescriptorAggregate.EdFi.ProgramTypeDescriptor" table="ProgramTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ProgramTypeDescriptorAggregate.EdFi.ProgramTypeDescriptor" lazy="false" discriminator-value="edfi.ProgramTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ProgramTypeDescriptor" >
           <key>
             <column name="ProgramTypeDescriptorId" />
           </key>
@@ -5164,8 +5456,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ProgressDescriptorAggregate.EdFi.ProgressDescriptor" table="ProgressDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ProgressDescriptorAggregate.EdFi.ProgressDescriptor" lazy="false" discriminator-value="edfi.ProgressDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ProgressDescriptor" >
           <key>
             <column name="ProgressDescriptorId" />
           </key>
@@ -5178,8 +5472,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ProgressLevelDescriptorAggregate.EdFi.ProgressLevelDescriptor" table="ProgressLevelDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ProgressLevelDescriptorAggregate.EdFi.ProgressLevelDescriptor" lazy="false" discriminator-value="edfi.ProgressLevelDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ProgressLevelDescriptor" >
           <key>
             <column name="ProgressLevelDescriptorId" />
           </key>
@@ -5192,8 +5488,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ProviderCategoryDescriptorAggregate.EdFi.ProviderCategoryDescriptor" table="ProviderCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ProviderCategoryDescriptorAggregate.EdFi.ProviderCategoryDescriptor" lazy="false" discriminator-value="edfi.ProviderCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ProviderCategoryDescriptor" >
           <key>
             <column name="ProviderCategoryDescriptorId" />
           </key>
@@ -5206,8 +5504,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ProviderProfitabilityDescriptorAggregate.EdFi.ProviderProfitabilityDescriptor" table="ProviderProfitabilityDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ProviderProfitabilityDescriptorAggregate.EdFi.ProviderProfitabilityDescriptor" lazy="false" discriminator-value="edfi.ProviderProfitabilityDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ProviderProfitabilityDescriptor" >
           <key>
             <column name="ProviderProfitabilityDescriptorId" />
           </key>
@@ -5220,8 +5520,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ProviderStatusDescriptorAggregate.EdFi.ProviderStatusDescriptor" table="ProviderStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ProviderStatusDescriptorAggregate.EdFi.ProviderStatusDescriptor" lazy="false" discriminator-value="edfi.ProviderStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ProviderStatusDescriptor" >
           <key>
             <column name="ProviderStatusDescriptorId" />
           </key>
@@ -5234,8 +5536,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.PublicationStatusDescriptorAggregate.EdFi.PublicationStatusDescriptor" table="PublicationStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.PublicationStatusDescriptorAggregate.EdFi.PublicationStatusDescriptor" lazy="false" discriminator-value="edfi.PublicationStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PublicationStatusDescriptor" >
           <key>
             <column name="PublicationStatusDescriptorId" />
           </key>
@@ -5248,8 +5552,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QuestionFormDescriptorAggregate.EdFi.QuestionFormDescriptor" table="QuestionFormDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QuestionFormDescriptorAggregate.EdFi.QuestionFormDescriptor" lazy="false" discriminator-value="edfi.QuestionFormDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="QuestionFormDescriptor" >
           <key>
             <column name="QuestionFormDescriptorId" />
           </key>
@@ -5262,8 +5568,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.RaceDescriptorAggregate.EdFi.RaceDescriptor" table="RaceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.RaceDescriptorAggregate.EdFi.RaceDescriptor" lazy="false" discriminator-value="edfi.RaceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="RaceDescriptor" >
           <key>
             <column name="RaceDescriptorId" />
           </key>
@@ -5276,8 +5584,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.RatingLevelDescriptorAggregate.EdFi.RatingLevelDescriptor" table="RatingLevelDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.RatingLevelDescriptorAggregate.EdFi.RatingLevelDescriptor" lazy="false" discriminator-value="edfi.RatingLevelDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="RatingLevelDescriptor" >
           <key>
             <column name="RatingLevelDescriptorId" />
           </key>
@@ -5290,8 +5600,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ReasonExitedDescriptorAggregate.EdFi.ReasonExitedDescriptor" table="ReasonExitedDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ReasonExitedDescriptorAggregate.EdFi.ReasonExitedDescriptor" lazy="false" discriminator-value="edfi.ReasonExitedDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ReasonExitedDescriptor" >
           <key>
             <column name="ReasonExitedDescriptorId" />
           </key>
@@ -5304,8 +5616,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ReasonNotTestedDescriptorAggregate.EdFi.ReasonNotTestedDescriptor" table="ReasonNotTestedDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ReasonNotTestedDescriptorAggregate.EdFi.ReasonNotTestedDescriptor" lazy="false" discriminator-value="edfi.ReasonNotTestedDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ReasonNotTestedDescriptor" >
           <key>
             <column name="ReasonNotTestedDescriptorId" />
           </key>
@@ -5318,8 +5632,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.RecognitionTypeDescriptorAggregate.EdFi.RecognitionTypeDescriptor" table="RecognitionTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.RecognitionTypeDescriptorAggregate.EdFi.RecognitionTypeDescriptor" lazy="false" discriminator-value="edfi.RecognitionTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="RecognitionTypeDescriptor" >
           <key>
             <column name="RecognitionTypeDescriptorId" />
           </key>
@@ -5332,8 +5648,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.RelationDescriptorAggregate.EdFi.RelationDescriptor" table="RelationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.RelationDescriptorAggregate.EdFi.RelationDescriptor" lazy="false" discriminator-value="edfi.RelationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="RelationDescriptor" >
           <key>
             <column name="RelationDescriptorId" />
           </key>
@@ -5346,8 +5664,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.RepeatIdentifierDescriptorAggregate.EdFi.RepeatIdentifierDescriptor" table="RepeatIdentifierDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.RepeatIdentifierDescriptorAggregate.EdFi.RepeatIdentifierDescriptor" lazy="false" discriminator-value="edfi.RepeatIdentifierDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="RepeatIdentifierDescriptor" >
           <key>
             <column name="RepeatIdentifierDescriptorId" />
           </key>
@@ -5360,8 +5680,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ReporterDescriptionDescriptorAggregate.EdFi.ReporterDescriptionDescriptor" table="ReporterDescriptionDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ReporterDescriptionDescriptorAggregate.EdFi.ReporterDescriptionDescriptor" lazy="false" discriminator-value="edfi.ReporterDescriptionDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ReporterDescriptionDescriptor" >
           <key>
             <column name="ReporterDescriptionDescriptorId" />
           </key>
@@ -5374,8 +5696,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ReportingTagDescriptorAggregate.EdFi.ReportingTagDescriptor" table="ReportingTagDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ReportingTagDescriptorAggregate.EdFi.ReportingTagDescriptor" lazy="false" discriminator-value="edfi.ReportingTagDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ReportingTagDescriptor" >
           <key>
             <column name="ReportingTagDescriptorId" />
           </key>
@@ -5388,8 +5712,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ResidencyStatusDescriptorAggregate.EdFi.ResidencyStatusDescriptor" table="ResidencyStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ResidencyStatusDescriptorAggregate.EdFi.ResidencyStatusDescriptor" lazy="false" discriminator-value="edfi.ResidencyStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ResidencyStatusDescriptor" >
           <key>
             <column name="ResidencyStatusDescriptorId" />
           </key>
@@ -5402,8 +5728,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ResponseIndicatorDescriptorAggregate.EdFi.ResponseIndicatorDescriptor" table="ResponseIndicatorDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ResponseIndicatorDescriptorAggregate.EdFi.ResponseIndicatorDescriptor" lazy="false" discriminator-value="edfi.ResponseIndicatorDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ResponseIndicatorDescriptor" >
           <key>
             <column name="ResponseIndicatorDescriptorId" />
           </key>
@@ -5416,8 +5744,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ResponsibilityDescriptorAggregate.EdFi.ResponsibilityDescriptor" table="ResponsibilityDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ResponsibilityDescriptorAggregate.EdFi.ResponsibilityDescriptor" lazy="false" discriminator-value="edfi.ResponsibilityDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ResponsibilityDescriptor" >
           <key>
             <column name="ResponsibilityDescriptorId" />
           </key>
@@ -5430,8 +5760,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.RestraintEventReasonDescriptorAggregate.EdFi.RestraintEventReasonDescriptor" table="RestraintEventReasonDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.RestraintEventReasonDescriptorAggregate.EdFi.RestraintEventReasonDescriptor" lazy="false" discriminator-value="edfi.RestraintEventReasonDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="RestraintEventReasonDescriptor" >
           <key>
             <column name="RestraintEventReasonDescriptorId" />
           </key>
@@ -5444,8 +5776,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ResultDatatypeTypeDescriptorAggregate.EdFi.ResultDatatypeTypeDescriptor" table="ResultDatatypeTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ResultDatatypeTypeDescriptorAggregate.EdFi.ResultDatatypeTypeDescriptor" lazy="false" discriminator-value="edfi.ResultDatatypeTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ResultDatatypeTypeDescriptor" >
           <key>
             <column name="ResultDatatypeTypeDescriptorId" />
           </key>
@@ -5458,8 +5792,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.RetestIndicatorDescriptorAggregate.EdFi.RetestIndicatorDescriptor" table="RetestIndicatorDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.RetestIndicatorDescriptorAggregate.EdFi.RetestIndicatorDescriptor" lazy="false" discriminator-value="edfi.RetestIndicatorDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="RetestIndicatorDescriptor" >
           <key>
             <column name="RetestIndicatorDescriptorId" />
           </key>
@@ -5472,8 +5808,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.SchoolCategoryDescriptorAggregate.EdFi.SchoolCategoryDescriptor" table="SchoolCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.SchoolCategoryDescriptorAggregate.EdFi.SchoolCategoryDescriptor" lazy="false" discriminator-value="edfi.SchoolCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SchoolCategoryDescriptor" >
           <key>
             <column name="SchoolCategoryDescriptorId" />
           </key>
@@ -5486,8 +5824,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.SchoolChoiceBasisDescriptorAggregate.EdFi.SchoolChoiceBasisDescriptor" table="SchoolChoiceBasisDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.SchoolChoiceBasisDescriptorAggregate.EdFi.SchoolChoiceBasisDescriptor" lazy="false" discriminator-value="edfi.SchoolChoiceBasisDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SchoolChoiceBasisDescriptor" >
           <key>
             <column name="SchoolChoiceBasisDescriptorId" />
           </key>
@@ -5500,8 +5840,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.SchoolChoiceImplementStatusDescriptorAggregate.EdFi.SchoolChoiceImplementStatusDescriptor" table="SchoolChoiceImplementStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.SchoolChoiceImplementStatusDescriptorAggregate.EdFi.SchoolChoiceImplementStatusDescriptor" lazy="false" discriminator-value="edfi.SchoolChoiceImplementStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SchoolChoiceImplementStatusDescriptor" >
           <key>
             <column name="SchoolChoiceImplementStatusDescriptorId" />
           </key>
@@ -5514,8 +5856,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.SchoolFoodServiceProgramServiceDescriptorAggregate.EdFi.SchoolFoodServiceProgramServiceDescriptor" table="SchoolFoodServiceProgramServiceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.SchoolFoodServiceProgramServiceDescriptorAggregate.EdFi.SchoolFoodServiceProgramServiceDescriptor" lazy="false" discriminator-value="edfi.SchoolFoodServiceProgramServiceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SchoolFoodServiceProgramServiceDescriptor" >
           <key>
             <column name="SchoolFoodServiceProgramServiceDescriptorId" />
           </key>
@@ -5528,8 +5872,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.SchoolTypeDescriptorAggregate.EdFi.SchoolTypeDescriptor" table="SchoolTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.SchoolTypeDescriptorAggregate.EdFi.SchoolTypeDescriptor" lazy="false" discriminator-value="edfi.SchoolTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SchoolTypeDescriptor" >
           <key>
             <column name="SchoolTypeDescriptorId" />
           </key>
@@ -5542,8 +5888,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.SectionCharacteristicDescriptorAggregate.EdFi.SectionCharacteristicDescriptor" table="SectionCharacteristicDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.SectionCharacteristicDescriptorAggregate.EdFi.SectionCharacteristicDescriptor" lazy="false" discriminator-value="edfi.SectionCharacteristicDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SectionCharacteristicDescriptor" >
           <key>
             <column name="SectionCharacteristicDescriptorId" />
           </key>
@@ -5556,8 +5904,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.SectionTypeDescriptorAggregate.EdFi.SectionTypeDescriptor" table="SectionTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.SectionTypeDescriptorAggregate.EdFi.SectionTypeDescriptor" lazy="false" discriminator-value="edfi.SectionTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SectionTypeDescriptor" >
           <key>
             <column name="SectionTypeDescriptorId" />
           </key>
@@ -5570,8 +5920,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.SeparationDescriptorAggregate.EdFi.SeparationDescriptor" table="SeparationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.SeparationDescriptorAggregate.EdFi.SeparationDescriptor" lazy="false" discriminator-value="edfi.SeparationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SeparationDescriptor" >
           <key>
             <column name="SeparationDescriptorId" />
           </key>
@@ -5584,8 +5936,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.SeparationReasonDescriptorAggregate.EdFi.SeparationReasonDescriptor" table="SeparationReasonDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.SeparationReasonDescriptorAggregate.EdFi.SeparationReasonDescriptor" lazy="false" discriminator-value="edfi.SeparationReasonDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SeparationReasonDescriptor" >
           <key>
             <column name="SeparationReasonDescriptorId" />
           </key>
@@ -5598,8 +5952,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.ServiceDescriptorAggregate.EdFi.ServiceDescriptor" table="ServiceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.ServiceDescriptorAggregate.EdFi.ServiceDescriptor" lazy="false" discriminator-value="edfi.ServiceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ServiceDescriptor" >
           <key>
             <column name="ServiceDescriptorId" />
           </key>
@@ -5612,8 +5968,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.SexDescriptorAggregate.EdFi.SexDescriptor" table="SexDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.SexDescriptorAggregate.EdFi.SexDescriptor" lazy="false" discriminator-value="edfi.SexDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SexDescriptor" >
           <key>
             <column name="SexDescriptorId" />
           </key>
@@ -5626,8 +5984,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.SourceSystemDescriptorAggregate.EdFi.SourceSystemDescriptor" table="SourceSystemDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.SourceSystemDescriptorAggregate.EdFi.SourceSystemDescriptor" lazy="false" discriminator-value="edfi.SourceSystemDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SourceSystemDescriptor" >
           <key>
             <column name="SourceSystemDescriptorId" />
           </key>
@@ -5640,8 +6000,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.SpecialEducationExitReasonDescriptorAggregate.EdFi.SpecialEducationExitReasonDescriptor" table="SpecialEducationExitReasonDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.SpecialEducationExitReasonDescriptorAggregate.EdFi.SpecialEducationExitReasonDescriptor" lazy="false" discriminator-value="edfi.SpecialEducationExitReasonDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SpecialEducationExitReasonDescriptor" >
           <key>
             <column name="SpecialEducationExitReasonDescriptorId" />
           </key>
@@ -5654,8 +6016,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.SpecialEducationProgramServiceDescriptorAggregate.EdFi.SpecialEducationProgramServiceDescriptor" table="SpecialEducationProgramServiceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.SpecialEducationProgramServiceDescriptorAggregate.EdFi.SpecialEducationProgramServiceDescriptor" lazy="false" discriminator-value="edfi.SpecialEducationProgramServiceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SpecialEducationProgramServiceDescriptor" >
           <key>
             <column name="SpecialEducationProgramServiceDescriptorId" />
           </key>
@@ -5668,8 +6032,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.SpecialEducationSettingDescriptorAggregate.EdFi.SpecialEducationSettingDescriptor" table="SpecialEducationSettingDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.SpecialEducationSettingDescriptorAggregate.EdFi.SpecialEducationSettingDescriptor" lazy="false" discriminator-value="edfi.SpecialEducationSettingDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SpecialEducationSettingDescriptor" >
           <key>
             <column name="SpecialEducationSettingDescriptorId" />
           </key>
@@ -5682,8 +6048,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.StaffClassificationDescriptorAggregate.EdFi.StaffClassificationDescriptor" table="StaffClassificationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.StaffClassificationDescriptorAggregate.EdFi.StaffClassificationDescriptor" lazy="false" discriminator-value="edfi.StaffClassificationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="StaffClassificationDescriptor" >
           <key>
             <column name="StaffClassificationDescriptorId" />
           </key>
@@ -5696,8 +6064,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.StaffIdentificationSystemDescriptorAggregate.EdFi.StaffIdentificationSystemDescriptor" table="StaffIdentificationSystemDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.StaffIdentificationSystemDescriptorAggregate.EdFi.StaffIdentificationSystemDescriptor" lazy="false" discriminator-value="edfi.StaffIdentificationSystemDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="StaffIdentificationSystemDescriptor" >
           <key>
             <column name="StaffIdentificationSystemDescriptorId" />
           </key>
@@ -5710,8 +6080,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.StaffLeaveEventCategoryDescriptorAggregate.EdFi.StaffLeaveEventCategoryDescriptor" table="StaffLeaveEventCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.StaffLeaveEventCategoryDescriptorAggregate.EdFi.StaffLeaveEventCategoryDescriptor" lazy="false" discriminator-value="edfi.StaffLeaveEventCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="StaffLeaveEventCategoryDescriptor" >
           <key>
             <column name="StaffLeaveEventCategoryDescriptorId" />
           </key>
@@ -5724,8 +6096,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.StateAbbreviationDescriptorAggregate.EdFi.StateAbbreviationDescriptor" table="StateAbbreviationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.StateAbbreviationDescriptorAggregate.EdFi.StateAbbreviationDescriptor" lazy="false" discriminator-value="edfi.StateAbbreviationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="StateAbbreviationDescriptor" >
           <key>
             <column name="StateAbbreviationDescriptorId" />
           </key>
@@ -5738,8 +6112,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.StudentCharacteristicDescriptorAggregate.EdFi.StudentCharacteristicDescriptor" table="StudentCharacteristicDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.StudentCharacteristicDescriptorAggregate.EdFi.StudentCharacteristicDescriptor" lazy="false" discriminator-value="edfi.StudentCharacteristicDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="StudentCharacteristicDescriptor" >
           <key>
             <column name="StudentCharacteristicDescriptorId" />
           </key>
@@ -5752,8 +6128,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.StudentIdentificationSystemDescriptorAggregate.EdFi.StudentIdentificationSystemDescriptor" table="StudentIdentificationSystemDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.StudentIdentificationSystemDescriptorAggregate.EdFi.StudentIdentificationSystemDescriptor" lazy="false" discriminator-value="edfi.StudentIdentificationSystemDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="StudentIdentificationSystemDescriptor" >
           <key>
             <column name="StudentIdentificationSystemDescriptorId" />
           </key>
@@ -5766,8 +6144,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.StudentParticipationCodeDescriptorAggregate.EdFi.StudentParticipationCodeDescriptor" table="StudentParticipationCodeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.StudentParticipationCodeDescriptorAggregate.EdFi.StudentParticipationCodeDescriptor" lazy="false" discriminator-value="edfi.StudentParticipationCodeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="StudentParticipationCodeDescriptor" >
           <key>
             <column name="StudentParticipationCodeDescriptorId" />
           </key>
@@ -5780,8 +6160,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.SubmissionStatusDescriptorAggregate.EdFi.SubmissionStatusDescriptor" table="SubmissionStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.SubmissionStatusDescriptorAggregate.EdFi.SubmissionStatusDescriptor" lazy="false" discriminator-value="edfi.SubmissionStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SubmissionStatusDescriptor" >
           <key>
             <column name="SubmissionStatusDescriptorId" />
           </key>
@@ -5794,8 +6176,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.SupporterMilitaryConnectionDescriptorAggregate.EdFi.SupporterMilitaryConnectionDescriptor" table="SupporterMilitaryConnectionDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.SupporterMilitaryConnectionDescriptorAggregate.EdFi.SupporterMilitaryConnectionDescriptor" lazy="false" discriminator-value="edfi.SupporterMilitaryConnectionDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SupporterMilitaryConnectionDescriptor" >
           <key>
             <column name="SupporterMilitaryConnectionDescriptorId" />
           </key>
@@ -5808,8 +6192,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.SurveyCategoryDescriptorAggregate.EdFi.SurveyCategoryDescriptor" table="SurveyCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.SurveyCategoryDescriptorAggregate.EdFi.SurveyCategoryDescriptor" lazy="false" discriminator-value="edfi.SurveyCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SurveyCategoryDescriptor" >
           <key>
             <column name="SurveyCategoryDescriptorId" />
           </key>
@@ -5822,8 +6208,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.SurveyLevelDescriptorAggregate.EdFi.SurveyLevelDescriptor" table="SurveyLevelDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.SurveyLevelDescriptorAggregate.EdFi.SurveyLevelDescriptor" lazy="false" discriminator-value="edfi.SurveyLevelDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SurveyLevelDescriptor" >
           <key>
             <column name="SurveyLevelDescriptorId" />
           </key>
@@ -5836,8 +6224,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.TeachingCredentialBasisDescriptorAggregate.EdFi.TeachingCredentialBasisDescriptor" table="TeachingCredentialBasisDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.TeachingCredentialBasisDescriptorAggregate.EdFi.TeachingCredentialBasisDescriptor" lazy="false" discriminator-value="edfi.TeachingCredentialBasisDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="TeachingCredentialBasisDescriptor" >
           <key>
             <column name="TeachingCredentialBasisDescriptorId" />
           </key>
@@ -5850,8 +6240,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.TeachingCredentialDescriptorAggregate.EdFi.TeachingCredentialDescriptor" table="TeachingCredentialDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.TeachingCredentialDescriptorAggregate.EdFi.TeachingCredentialDescriptor" lazy="false" discriminator-value="edfi.TeachingCredentialDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="TeachingCredentialDescriptor" >
           <key>
             <column name="TeachingCredentialDescriptorId" />
           </key>
@@ -5864,8 +6256,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.TechnicalSkillsAssessmentDescriptorAggregate.EdFi.TechnicalSkillsAssessmentDescriptor" table="TechnicalSkillsAssessmentDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.TechnicalSkillsAssessmentDescriptorAggregate.EdFi.TechnicalSkillsAssessmentDescriptor" lazy="false" discriminator-value="edfi.TechnicalSkillsAssessmentDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="TechnicalSkillsAssessmentDescriptor" >
           <key>
             <column name="TechnicalSkillsAssessmentDescriptorId" />
           </key>
@@ -5878,8 +6272,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.TelephoneNumberTypeDescriptorAggregate.EdFi.TelephoneNumberTypeDescriptor" table="TelephoneNumberTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.TelephoneNumberTypeDescriptorAggregate.EdFi.TelephoneNumberTypeDescriptor" lazy="false" discriminator-value="edfi.TelephoneNumberTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="TelephoneNumberTypeDescriptor" >
           <key>
             <column name="TelephoneNumberTypeDescriptorId" />
           </key>
@@ -5892,8 +6288,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.TermDescriptorAggregate.EdFi.TermDescriptor" table="TermDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.TermDescriptorAggregate.EdFi.TermDescriptor" lazy="false" discriminator-value="edfi.TermDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="TermDescriptor" >
           <key>
             <column name="TermDescriptorId" />
           </key>
@@ -5906,8 +6304,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.TitleIPartAParticipantDescriptorAggregate.EdFi.TitleIPartAParticipantDescriptor" table="TitleIPartAParticipantDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.TitleIPartAParticipantDescriptorAggregate.EdFi.TitleIPartAParticipantDescriptor" lazy="false" discriminator-value="edfi.TitleIPartAParticipantDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="TitleIPartAParticipantDescriptor" >
           <key>
             <column name="TitleIPartAParticipantDescriptorId" />
           </key>
@@ -5920,8 +6320,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.TitleIPartAProgramServiceDescriptorAggregate.EdFi.TitleIPartAProgramServiceDescriptor" table="TitleIPartAProgramServiceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.TitleIPartAProgramServiceDescriptorAggregate.EdFi.TitleIPartAProgramServiceDescriptor" lazy="false" discriminator-value="edfi.TitleIPartAProgramServiceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="TitleIPartAProgramServiceDescriptor" >
           <key>
             <column name="TitleIPartAProgramServiceDescriptorId" />
           </key>
@@ -5934,8 +6336,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.TitleIPartASchoolDesignationDescriptorAggregate.EdFi.TitleIPartASchoolDesignationDescriptor" table="TitleIPartASchoolDesignationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.TitleIPartASchoolDesignationDescriptorAggregate.EdFi.TitleIPartASchoolDesignationDescriptor" lazy="false" discriminator-value="edfi.TitleIPartASchoolDesignationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="TitleIPartASchoolDesignationDescriptor" >
           <key>
             <column name="TitleIPartASchoolDesignationDescriptorId" />
           </key>
@@ -5948,8 +6352,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.TransportationPublicExpenseEligibilityTypeDescriptorAggregate.EdFi.TransportationPublicExpenseEligibilityTypeDescriptor" table="TransportationPublicExpenseEligibilityTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.TransportationPublicExpenseEligibilityTypeDescriptorAggregate.EdFi.TransportationPublicExpenseEligibilityTypeDescriptor" lazy="false" discriminator-value="edfi.TransportationPublicExpenseEligibilityTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="TransportationPublicExpenseEligibilityTypeDescriptor" >
           <key>
             <column name="TransportationPublicExpenseEligibilityTypeDescriptorId" />
           </key>
@@ -5962,8 +6368,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.TransportationTypeDescriptorAggregate.EdFi.TransportationTypeDescriptor" table="TransportationTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.TransportationTypeDescriptorAggregate.EdFi.TransportationTypeDescriptor" lazy="false" discriminator-value="edfi.TransportationTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="TransportationTypeDescriptor" >
           <key>
             <column name="TransportationTypeDescriptorId" />
           </key>
@@ -5976,8 +6384,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.TravelDayofWeekDescriptorAggregate.EdFi.TravelDayofWeekDescriptor" table="TravelDayofWeekDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.TravelDayofWeekDescriptorAggregate.EdFi.TravelDayofWeekDescriptor" lazy="false" discriminator-value="edfi.TravelDayofWeekDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="TravelDayofWeekDescriptor" >
           <key>
             <column name="TravelDayofWeekDescriptorId" />
           </key>
@@ -5990,8 +6400,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.TravelDirectionDescriptorAggregate.EdFi.TravelDirectionDescriptor" table="TravelDirectionDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.TravelDirectionDescriptorAggregate.EdFi.TravelDirectionDescriptor" lazy="false" discriminator-value="edfi.TravelDirectionDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="TravelDirectionDescriptor" >
           <key>
             <column name="TravelDirectionDescriptorId" />
           </key>
@@ -6004,8 +6416,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.TribalAffiliationDescriptorAggregate.EdFi.TribalAffiliationDescriptor" table="TribalAffiliationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.TribalAffiliationDescriptorAggregate.EdFi.TribalAffiliationDescriptor" lazy="false" discriminator-value="edfi.TribalAffiliationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="TribalAffiliationDescriptor" >
           <key>
             <column name="TribalAffiliationDescriptorId" />
           </key>
@@ -6018,8 +6432,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.VisaDescriptorAggregate.EdFi.VisaDescriptor" table="VisaDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.VisaDescriptorAggregate.EdFi.VisaDescriptor" lazy="false" discriminator-value="edfi.VisaDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="VisaDescriptor" >
           <key>
             <column name="VisaDescriptorId" />
           </key>
@@ -6032,8 +6448,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.WeaponDescriptorAggregate.EdFi.WeaponDescriptor" table="WeaponDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.WeaponDescriptorAggregate.EdFi.WeaponDescriptor" lazy="false" discriminator-value="edfi.WeaponDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="WeaponDescriptor" >
           <key>
             <column name="WeaponDescriptorId" />
           </key>
@@ -6046,7 +6464,8 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
+      </join>
+    </subclass>
 </class>
 
 
diff --git a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/5.1.0/DataStandard_510_ApprovalTests.Verify.Standard_Std_5.1.0_EntityOrmMappings_PgSql_EntityOrmMappingsForQueries.generated.hbm.approved.xml b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/5.1.0/DataStandard_510_ApprovalTests.Verify.Standard_Std_5.1.0_EntityOrmMappings_PgSql_EntityOrmMappingsForQueries.generated.hbm.approved.xml
index a8c8d126fe..61531d84db 100644
--- a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/5.1.0/DataStandard_510_ApprovalTests.Verify.Standard_Std_5.1.0_EntityOrmMappings_PgSql_EntityOrmMappingsForQueries.generated.hbm.approved.xml
+++ b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/5.1.0/DataStandard_510_ApprovalTests.Verify.Standard_Std_5.1.0_EntityOrmMappings_PgSql_EntityOrmMappingsForQueries.generated.hbm.approved.xml
@@ -3342,12 +3342,13 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.DescriptorAggregate.EdFi.DescriptorQ" table="Descriptor" lazy="false" abstract="true">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.DescriptorAggregate.EdFi.DescriptorQ" table="Descriptor" lazy="false" abstract="true" discriminator-value="NULL">
     <id name="DescriptorId" column="DescriptorId" type="int">
       <generator class="identity" />
     </id>
 
     <!-- Discriminator -->
+    <discriminator column="Discriminator" type="string" />
 
     <!-- Optimistic locking for aggregate root -->
     <version name="LastModifiedDate" column="LastModifiedDate" type="UtcDateTime" />
@@ -3359,6 +3360,8 @@
     <property name="Id" column="Id" type="guid" not-null="true" />
 
     <!-- Properties -->
+    <!-- Readonly property to surface the discriminator value -->
+    <property name="Discriminator" column="Discriminator" type="string" insert="false" update="false" />
     <property name="CodeValue" column="CodeValue" type="string" length="50" not-null="true" />
     <property name="Description" column="Description" type="string" length="1024" />
     <property name="EffectiveBeginDate" column="EffectiveBeginDate" type="date" />
@@ -3372,7 +3375,8 @@
 
     <!-- Collections -->
     <!-- Derived classes -->
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AbsenceEventCategoryDescriptorAggregate.EdFi.AbsenceEventCategoryDescriptorQ" table="AbsenceEventCategoryDescriptor" lazy="false">
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AbsenceEventCategoryDescriptorAggregate.EdFi.AbsenceEventCategoryDescriptorQ" lazy="false" discriminator-value="edfi.AbsenceEventCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AbsenceEventCategoryDescriptor" >
           <key>
             <column name="AbsenceEventCategoryDescriptorId" />
           </key>
@@ -3392,8 +3396,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StaffAbsenceEventAggregate.EdFi.StaffAbsenceEventQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AcademicHonorCategoryDescriptorAggregate.EdFi.AcademicHonorCategoryDescriptorQ" table="AcademicHonorCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AcademicHonorCategoryDescriptorAggregate.EdFi.AcademicHonorCategoryDescriptorQ" lazy="false" discriminator-value="edfi.AcademicHonorCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AcademicHonorCategoryDescriptor" >
           <key>
             <column name="AcademicHonorCategoryDescriptorId" />
           </key>
@@ -3413,8 +3419,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAcademicRecordAggregate.EdFi.StudentAcademicRecordAcademicHonorQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AcademicSubjectDescriptorAggregate.EdFi.AcademicSubjectDescriptorQ" table="AcademicSubjectDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AcademicSubjectDescriptorAggregate.EdFi.AcademicSubjectDescriptorQ" lazy="false" discriminator-value="edfi.AcademicSubjectDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AcademicSubjectDescriptor" >
           <key>
             <column name="AcademicSubjectDescriptorId" />
           </key>
@@ -3504,8 +3512,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StaffSchoolAssociationAggregate.EdFi.StaffSchoolAssociationAcademicSubjectQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AccommodationDescriptorAggregate.EdFi.AccommodationDescriptorQ" table="AccommodationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AccommodationDescriptorAggregate.EdFi.AccommodationDescriptorQ" lazy="false" discriminator-value="edfi.AccommodationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AccommodationDescriptor" >
           <key>
             <column name="AccommodationDescriptorId" />
           </key>
@@ -3525,8 +3535,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAssessmentAggregate.EdFi.StudentAssessmentAccommodationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AccountTypeDescriptorAggregate.EdFi.AccountTypeDescriptorQ" table="AccountTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AccountTypeDescriptorAggregate.EdFi.AccountTypeDescriptorQ" lazy="false" discriminator-value="edfi.AccountTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AccountTypeDescriptor" >
           <key>
             <column name="AccountTypeDescriptorId" />
           </key>
@@ -3546,8 +3558,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.ChartOfAccountAggregate.EdFi.ChartOfAccountQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AchievementCategoryDescriptorAggregate.EdFi.AchievementCategoryDescriptorQ" table="AchievementCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AchievementCategoryDescriptorAggregate.EdFi.AchievementCategoryDescriptorQ" lazy="false" discriminator-value="edfi.AchievementCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AchievementCategoryDescriptor" >
           <key>
             <column name="AchievementCategoryDescriptorId" />
           </key>
@@ -3588,8 +3602,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAcademicRecordAggregate.EdFi.StudentAcademicRecordRecognitionQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AdditionalCreditTypeDescriptorAggregate.EdFi.AdditionalCreditTypeDescriptorQ" table="AdditionalCreditTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AdditionalCreditTypeDescriptorAggregate.EdFi.AdditionalCreditTypeDescriptorQ" lazy="false" discriminator-value="edfi.AdditionalCreditTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AdditionalCreditTypeDescriptor" >
           <key>
             <column name="AdditionalCreditTypeDescriptorId" />
           </key>
@@ -3609,8 +3625,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.CourseTranscriptAggregate.EdFi.CourseTranscriptEarnedAdditionalCreditsQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AddressTypeDescriptorAggregate.EdFi.AddressTypeDescriptorQ" table="AddressTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AddressTypeDescriptorAggregate.EdFi.AddressTypeDescriptorQ" lazy="false" discriminator-value="edfi.AddressTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AddressTypeDescriptor" >
           <key>
             <column name="AddressTypeDescriptorId" />
           </key>
@@ -3686,8 +3704,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationInternationalAddressQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AdministrationEnvironmentDescriptorAggregate.EdFi.AdministrationEnvironmentDescriptorQ" table="AdministrationEnvironmentDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AdministrationEnvironmentDescriptorAggregate.EdFi.AdministrationEnvironmentDescriptorQ" lazy="false" discriminator-value="edfi.AdministrationEnvironmentDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AdministrationEnvironmentDescriptor" >
           <key>
             <column name="AdministrationEnvironmentDescriptorId" />
           </key>
@@ -3707,8 +3727,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAssessmentAggregate.EdFi.StudentAssessmentQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AdministrativeFundingControlDescriptorAggregate.EdFi.AdministrativeFundingControlDescriptorQ" table="AdministrativeFundingControlDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AdministrativeFundingControlDescriptorAggregate.EdFi.AdministrativeFundingControlDescriptorQ" lazy="false" discriminator-value="edfi.AdministrativeFundingControlDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AdministrativeFundingControlDescriptor" >
           <key>
             <column name="AdministrativeFundingControlDescriptorId" />
           </key>
@@ -3735,8 +3757,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.SchoolAggregate.EdFi.SchoolQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AncestryEthnicOriginDescriptorAggregate.EdFi.AncestryEthnicOriginDescriptorQ" table="AncestryEthnicOriginDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AncestryEthnicOriginDescriptorAggregate.EdFi.AncestryEthnicOriginDescriptorQ" lazy="false" discriminator-value="edfi.AncestryEthnicOriginDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AncestryEthnicOriginDescriptor" >
           <key>
             <column name="AncestryEthnicOriginDescriptorId" />
           </key>
@@ -3763,8 +3787,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationAncestryEthnicOriginQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AssessmentCategoryDescriptorAggregate.EdFi.AssessmentCategoryDescriptorQ" table="AssessmentCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AssessmentCategoryDescriptorAggregate.EdFi.AssessmentCategoryDescriptorQ" lazy="false" discriminator-value="edfi.AssessmentCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AssessmentCategoryDescriptor" >
           <key>
             <column name="AssessmentCategoryDescriptorId" />
           </key>
@@ -3784,8 +3810,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.AssessmentAggregate.EdFi.AssessmentQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AssessmentIdentificationSystemDescriptorAggregate.EdFi.AssessmentIdentificationSystemDescriptorQ" table="AssessmentIdentificationSystemDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AssessmentIdentificationSystemDescriptorAggregate.EdFi.AssessmentIdentificationSystemDescriptorQ" lazy="false" discriminator-value="edfi.AssessmentIdentificationSystemDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AssessmentIdentificationSystemDescriptor" >
           <key>
             <column name="AssessmentIdentificationSystemDescriptorId" />
           </key>
@@ -3805,8 +3833,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.AssessmentAggregate.EdFi.AssessmentIdentificationCodeQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AssessmentItemCategoryDescriptorAggregate.EdFi.AssessmentItemCategoryDescriptorQ" table="AssessmentItemCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AssessmentItemCategoryDescriptorAggregate.EdFi.AssessmentItemCategoryDescriptorQ" lazy="false" discriminator-value="edfi.AssessmentItemCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AssessmentItemCategoryDescriptor" >
           <key>
             <column name="AssessmentItemCategoryDescriptorId" />
           </key>
@@ -3826,8 +3856,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.AssessmentItemAggregate.EdFi.AssessmentItemQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AssessmentItemResultDescriptorAggregate.EdFi.AssessmentItemResultDescriptorQ" table="AssessmentItemResultDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AssessmentItemResultDescriptorAggregate.EdFi.AssessmentItemResultDescriptorQ" lazy="false" discriminator-value="edfi.AssessmentItemResultDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AssessmentItemResultDescriptor" >
           <key>
             <column name="AssessmentItemResultDescriptorId" />
           </key>
@@ -3847,8 +3879,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAssessmentAggregate.EdFi.StudentAssessmentItemQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AssessmentPeriodDescriptorAggregate.EdFi.AssessmentPeriodDescriptorQ" table="AssessmentPeriodDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AssessmentPeriodDescriptorAggregate.EdFi.AssessmentPeriodDescriptorQ" lazy="false" discriminator-value="edfi.AssessmentPeriodDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AssessmentPeriodDescriptor" >
           <key>
             <column name="AssessmentPeriodDescriptorId" />
           </key>
@@ -3875,8 +3909,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAssessmentAggregate.EdFi.StudentAssessmentPeriodQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AssessmentReportingMethodDescriptorAggregate.EdFi.AssessmentReportingMethodDescriptorQ" table="AssessmentReportingMethodDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AssessmentReportingMethodDescriptorAggregate.EdFi.AssessmentReportingMethodDescriptorQ" lazy="false" discriminator-value="edfi.AssessmentReportingMethodDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AssessmentReportingMethodDescriptor" >
           <key>
             <column name="AssessmentReportingMethodDescriptorId" />
           </key>
@@ -3966,8 +4002,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAssessmentAggregate.EdFi.StudentAssessmentStudentObjectiveAssessmentScoreResultQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AssignmentLateStatusDescriptorAggregate.EdFi.AssignmentLateStatusDescriptorQ" table="AssignmentLateStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AssignmentLateStatusDescriptorAggregate.EdFi.AssignmentLateStatusDescriptorQ" lazy="false" discriminator-value="edfi.AssignmentLateStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AssignmentLateStatusDescriptor" >
           <key>
             <column name="AssignmentLateStatusDescriptorId" />
           </key>
@@ -3987,8 +4025,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentGradebookEntryAggregate.EdFi.StudentGradebookEntryQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AttemptStatusDescriptorAggregate.EdFi.AttemptStatusDescriptorQ" table="AttemptStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AttemptStatusDescriptorAggregate.EdFi.AttemptStatusDescriptorQ" lazy="false" discriminator-value="edfi.AttemptStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AttemptStatusDescriptor" >
           <key>
             <column name="AttemptStatusDescriptorId" />
           </key>
@@ -4008,8 +4048,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSectionAssociationAggregate.EdFi.StudentSectionAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AttendanceEventCategoryDescriptorAggregate.EdFi.AttendanceEventCategoryDescriptorQ" table="AttendanceEventCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.AttendanceEventCategoryDescriptorAggregate.EdFi.AttendanceEventCategoryDescriptorQ" lazy="false" discriminator-value="edfi.AttendanceEventCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="AttendanceEventCategoryDescriptor" >
           <key>
             <column name="AttendanceEventCategoryDescriptorId" />
           </key>
@@ -4050,8 +4092,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSectionAttendanceEventAggregate.EdFi.StudentSectionAttendanceEventQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.BarrierToInternetAccessInResidenceDescriptorAggregate.EdFi.BarrierToInternetAccessInResidenceDescriptorQ" table="BarrierToInternetAccessInResidenceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.BarrierToInternetAccessInResidenceDescriptorAggregate.EdFi.BarrierToInternetAccessInResidenceDescriptorQ" lazy="false" discriminator-value="edfi.BarrierToInternetAccessInResidenceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="BarrierToInternetAccessInResidenceDescriptor" >
           <key>
             <column name="BarrierToInternetAccessInResidenceDescriptorId" />
           </key>
@@ -4071,8 +4115,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.BehaviorDescriptorAggregate.EdFi.BehaviorDescriptorQ" table="BehaviorDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.BehaviorDescriptorAggregate.EdFi.BehaviorDescriptorQ" lazy="false" discriminator-value="edfi.BehaviorDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="BehaviorDescriptor" >
           <key>
             <column name="BehaviorDescriptorId" />
           </key>
@@ -4099,8 +4145,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentDisciplineIncidentBehaviorAssociationAggregate.EdFi.StudentDisciplineIncidentBehaviorAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.BusRouteDescriptorAggregate.EdFi.BusRouteDescriptorQ" table="BusRouteDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.BusRouteDescriptorAggregate.EdFi.BusRouteDescriptorQ" lazy="false" discriminator-value="edfi.BusRouteDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="BusRouteDescriptor" >
           <key>
             <column name="BusRouteDescriptorId" />
           </key>
@@ -4120,8 +4168,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentTransportationAggregate.EdFi.StudentTransportationStudentBusDetailsQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CalendarEventDescriptorAggregate.EdFi.CalendarEventDescriptorQ" table="CalendarEventDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CalendarEventDescriptorAggregate.EdFi.CalendarEventDescriptorQ" lazy="false" discriminator-value="edfi.CalendarEventDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CalendarEventDescriptor" >
           <key>
             <column name="CalendarEventDescriptorId" />
           </key>
@@ -4141,8 +4191,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.CalendarDateAggregate.EdFi.CalendarDateCalendarEventQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CalendarTypeDescriptorAggregate.EdFi.CalendarTypeDescriptorQ" table="CalendarTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CalendarTypeDescriptorAggregate.EdFi.CalendarTypeDescriptorQ" lazy="false" discriminator-value="edfi.CalendarTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CalendarTypeDescriptor" >
           <key>
             <column name="CalendarTypeDescriptorId" />
           </key>
@@ -4162,8 +4214,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.CalendarAggregate.EdFi.CalendarQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CareerPathwayDescriptorAggregate.EdFi.CareerPathwayDescriptorQ" table="CareerPathwayDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CareerPathwayDescriptorAggregate.EdFi.CareerPathwayDescriptorQ" lazy="false" discriminator-value="edfi.CareerPathwayDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CareerPathwayDescriptor" >
           <key>
             <column name="CareerPathwayDescriptorId" />
           </key>
@@ -4183,8 +4237,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.CourseAggregate.EdFi.CourseQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CharterApprovalAgencyTypeDescriptorAggregate.EdFi.CharterApprovalAgencyTypeDescriptorQ" table="CharterApprovalAgencyTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CharterApprovalAgencyTypeDescriptorAggregate.EdFi.CharterApprovalAgencyTypeDescriptorQ" lazy="false" discriminator-value="edfi.CharterApprovalAgencyTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CharterApprovalAgencyTypeDescriptor" >
           <key>
             <column name="CharterApprovalAgencyTypeDescriptorId" />
           </key>
@@ -4204,8 +4260,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.SchoolAggregate.EdFi.SchoolQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CharterStatusDescriptorAggregate.EdFi.CharterStatusDescriptorQ" table="CharterStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CharterStatusDescriptorAggregate.EdFi.CharterStatusDescriptorQ" lazy="false" discriminator-value="edfi.CharterStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CharterStatusDescriptor" >
           <key>
             <column name="CharterStatusDescriptorId" />
           </key>
@@ -4232,8 +4290,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.SchoolAggregate.EdFi.SchoolQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CitizenshipStatusDescriptorAggregate.EdFi.CitizenshipStatusDescriptorQ" table="CitizenshipStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CitizenshipStatusDescriptorAggregate.EdFi.CitizenshipStatusDescriptorQ" lazy="false" discriminator-value="edfi.CitizenshipStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CitizenshipStatusDescriptor" >
           <key>
             <column name="CitizenshipStatusDescriptorId" />
           </key>
@@ -4260,8 +4320,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAggregate.EdFi.StudentQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ClassroomPositionDescriptorAggregate.EdFi.ClassroomPositionDescriptorQ" table="ClassroomPositionDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ClassroomPositionDescriptorAggregate.EdFi.ClassroomPositionDescriptorQ" lazy="false" discriminator-value="edfi.ClassroomPositionDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ClassroomPositionDescriptor" >
           <key>
             <column name="ClassroomPositionDescriptorId" />
           </key>
@@ -4281,8 +4343,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StaffSectionAssociationAggregate.EdFi.StaffSectionAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CohortScopeDescriptorAggregate.EdFi.CohortScopeDescriptorQ" table="CohortScopeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CohortScopeDescriptorAggregate.EdFi.CohortScopeDescriptorQ" lazy="false" discriminator-value="edfi.CohortScopeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CohortScopeDescriptor" >
           <key>
             <column name="CohortScopeDescriptorId" />
           </key>
@@ -4302,8 +4366,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.CohortAggregate.EdFi.CohortQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CohortTypeDescriptorAggregate.EdFi.CohortTypeDescriptorQ" table="CohortTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CohortTypeDescriptorAggregate.EdFi.CohortTypeDescriptorQ" lazy="false" discriminator-value="edfi.CohortTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CohortTypeDescriptor" >
           <key>
             <column name="CohortTypeDescriptorId" />
           </key>
@@ -4323,8 +4389,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.CohortAggregate.EdFi.CohortQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CohortYearTypeDescriptorAggregate.EdFi.CohortYearTypeDescriptorQ" table="CohortYearTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CohortYearTypeDescriptorAggregate.EdFi.CohortYearTypeDescriptorQ" lazy="false" discriminator-value="edfi.CohortYearTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CohortYearTypeDescriptor" >
           <key>
             <column name="CohortYearTypeDescriptorId" />
           </key>
@@ -4344,8 +4412,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationCohortYearQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CompetencyLevelDescriptorAggregate.EdFi.CompetencyLevelDescriptorQ" table="CompetencyLevelDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CompetencyLevelDescriptorAggregate.EdFi.CompetencyLevelDescriptorQ" lazy="false" discriminator-value="edfi.CompetencyLevelDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CompetencyLevelDescriptor" >
           <key>
             <column name="CompetencyLevelDescriptorId" />
           </key>
@@ -4379,8 +4449,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentGradebookEntryAggregate.EdFi.StudentGradebookEntryQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ContactTypeDescriptorAggregate.EdFi.ContactTypeDescriptorQ" table="ContactTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ContactTypeDescriptorAggregate.EdFi.ContactTypeDescriptorQ" lazy="false" discriminator-value="edfi.ContactTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ContactTypeDescriptor" >
           <key>
             <column name="ContactTypeDescriptorId" />
           </key>
@@ -4400,8 +4472,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StaffEducationOrganizationContactAssociationAggregate.EdFi.StaffEducationOrganizationContactAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ContentClassDescriptorAggregate.EdFi.ContentClassDescriptorQ" table="ContentClassDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ContentClassDescriptorAggregate.EdFi.ContentClassDescriptorQ" lazy="false" discriminator-value="edfi.ContentClassDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ContentClassDescriptor" >
           <key>
             <column name="ContentClassDescriptorId" />
           </key>
@@ -4421,8 +4495,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.EducationContentAggregate.EdFi.EducationContentQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ContinuationOfServicesReasonDescriptorAggregate.EdFi.ContinuationOfServicesReasonDescriptorQ" table="ContinuationOfServicesReasonDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ContinuationOfServicesReasonDescriptorAggregate.EdFi.ContinuationOfServicesReasonDescriptorQ" lazy="false" discriminator-value="edfi.ContinuationOfServicesReasonDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ContinuationOfServicesReasonDescriptor" >
           <key>
             <column name="ContinuationOfServicesReasonDescriptorId" />
           </key>
@@ -4442,8 +4518,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentMigrantEducationProgramAssociationAggregate.EdFi.StudentMigrantEducationProgramAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CostRateDescriptorAggregate.EdFi.CostRateDescriptorQ" table="CostRateDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CostRateDescriptorAggregate.EdFi.CostRateDescriptorQ" lazy="false" discriminator-value="edfi.CostRateDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CostRateDescriptor" >
           <key>
             <column name="CostRateDescriptorId" />
           </key>
@@ -4463,8 +4541,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.EducationContentAggregate.EdFi.EducationContentQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CountryDescriptorAggregate.EdFi.CountryDescriptorQ" table="CountryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CountryDescriptorAggregate.EdFi.CountryDescriptorQ" lazy="false" discriminator-value="edfi.CountryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CountryDescriptor" >
           <key>
             <column name="CountryDescriptorId" />
           </key>
@@ -4547,8 +4627,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAggregate.EdFi.StudentPersonalIdentificationDocumentQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CourseAttemptResultDescriptorAggregate.EdFi.CourseAttemptResultDescriptorQ" table="CourseAttemptResultDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CourseAttemptResultDescriptorAggregate.EdFi.CourseAttemptResultDescriptorQ" lazy="false" discriminator-value="edfi.CourseAttemptResultDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CourseAttemptResultDescriptor" >
           <key>
             <column name="CourseAttemptResultDescriptorId" />
           </key>
@@ -4568,8 +4650,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.CourseTranscriptAggregate.EdFi.CourseTranscriptQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CourseDefinedByDescriptorAggregate.EdFi.CourseDefinedByDescriptorQ" table="CourseDefinedByDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CourseDefinedByDescriptorAggregate.EdFi.CourseDefinedByDescriptorQ" lazy="false" discriminator-value="edfi.CourseDefinedByDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CourseDefinedByDescriptor" >
           <key>
             <column name="CourseDefinedByDescriptorId" />
           </key>
@@ -4589,8 +4673,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.CourseAggregate.EdFi.CourseQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CourseGPAApplicabilityDescriptorAggregate.EdFi.CourseGPAApplicabilityDescriptorQ" table="CourseGPAApplicabilityDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CourseGPAApplicabilityDescriptorAggregate.EdFi.CourseGPAApplicabilityDescriptorQ" lazy="false" discriminator-value="edfi.CourseGPAApplicabilityDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CourseGPAApplicabilityDescriptor" >
           <key>
             <column name="CourseGPAApplicabilityDescriptorId" />
           </key>
@@ -4610,8 +4696,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.CourseAggregate.EdFi.CourseQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CourseIdentificationSystemDescriptorAggregate.EdFi.CourseIdentificationSystemDescriptorQ" table="CourseIdentificationSystemDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CourseIdentificationSystemDescriptorAggregate.EdFi.CourseIdentificationSystemDescriptorQ" lazy="false" discriminator-value="edfi.CourseIdentificationSystemDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CourseIdentificationSystemDescriptor" >
           <key>
             <column name="CourseIdentificationSystemDescriptorId" />
           </key>
@@ -4638,8 +4726,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.CourseTranscriptAggregate.EdFi.CourseTranscriptAlternativeCourseIdentificationCodeQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CourseLevelCharacteristicDescriptorAggregate.EdFi.CourseLevelCharacteristicDescriptorQ" table="CourseLevelCharacteristicDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CourseLevelCharacteristicDescriptorAggregate.EdFi.CourseLevelCharacteristicDescriptorQ" lazy="false" discriminator-value="edfi.CourseLevelCharacteristicDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CourseLevelCharacteristicDescriptor" >
           <key>
             <column name="CourseLevelCharacteristicDescriptorId" />
           </key>
@@ -4673,8 +4763,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.SectionAggregate.EdFi.SectionCourseLevelCharacteristicQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CourseRepeatCodeDescriptorAggregate.EdFi.CourseRepeatCodeDescriptorQ" table="CourseRepeatCodeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CourseRepeatCodeDescriptorAggregate.EdFi.CourseRepeatCodeDescriptorQ" lazy="false" discriminator-value="edfi.CourseRepeatCodeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CourseRepeatCodeDescriptor" >
           <key>
             <column name="CourseRepeatCodeDescriptorId" />
           </key>
@@ -4694,8 +4786,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.CourseTranscriptAggregate.EdFi.CourseTranscriptQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CredentialFieldDescriptorAggregate.EdFi.CredentialFieldDescriptorQ" table="CredentialFieldDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CredentialFieldDescriptorAggregate.EdFi.CredentialFieldDescriptorQ" lazy="false" discriminator-value="edfi.CredentialFieldDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CredentialFieldDescriptor" >
           <key>
             <column name="CredentialFieldDescriptorId" />
           </key>
@@ -4715,8 +4809,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.CredentialAggregate.EdFi.CredentialQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CredentialTypeDescriptorAggregate.EdFi.CredentialTypeDescriptorQ" table="CredentialTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CredentialTypeDescriptorAggregate.EdFi.CredentialTypeDescriptorQ" lazy="false" discriminator-value="edfi.CredentialTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CredentialTypeDescriptor" >
           <key>
             <column name="CredentialTypeDescriptorId" />
           </key>
@@ -4736,8 +4832,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.CredentialAggregate.EdFi.CredentialQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CreditCategoryDescriptorAggregate.EdFi.CreditCategoryDescriptorQ" table="CreditCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CreditCategoryDescriptorAggregate.EdFi.CreditCategoryDescriptorQ" lazy="false" discriminator-value="edfi.CreditCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CreditCategoryDescriptor" >
           <key>
             <column name="CreditCategoryDescriptorId" />
           </key>
@@ -4764,8 +4862,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.GraduationPlanAggregate.EdFi.GraduationPlanCreditsByCreditCategoryQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CreditTypeDescriptorAggregate.EdFi.CreditTypeDescriptorQ" table="CreditTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CreditTypeDescriptorAggregate.EdFi.CreditTypeDescriptorQ" lazy="false" discriminator-value="edfi.CreditTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CreditTypeDescriptor" >
           <key>
             <column name="CreditTypeDescriptorId" />
           </key>
@@ -4869,8 +4969,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAcademicRecordAggregate.EdFi.StudentAcademicRecordQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CrisisTypeDescriptorAggregate.EdFi.CrisisTypeDescriptorQ" table="CrisisTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CrisisTypeDescriptorAggregate.EdFi.CrisisTypeDescriptorQ" lazy="false" discriminator-value="edfi.CrisisTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CrisisTypeDescriptor" >
           <key>
             <column name="CrisisTypeDescriptorId" />
           </key>
@@ -4890,8 +4992,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.CrisisEventAggregate.EdFi.CrisisEventQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CTEProgramServiceDescriptorAggregate.EdFi.CTEProgramServiceDescriptorQ" table="CTEProgramServiceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CTEProgramServiceDescriptorAggregate.EdFi.CTEProgramServiceDescriptorQ" lazy="false" discriminator-value="edfi.CTEProgramServiceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CTEProgramServiceDescriptor" >
           <key>
             <column name="CTEProgramServiceDescriptorId" />
           </key>
@@ -4911,8 +5015,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentCTEProgramAssociationAggregate.EdFi.StudentCTEProgramAssociationCTEProgramServiceQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CurriculumUsedDescriptorAggregate.EdFi.CurriculumUsedDescriptorQ" table="CurriculumUsedDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.CurriculumUsedDescriptorAggregate.EdFi.CurriculumUsedDescriptorQ" lazy="false" discriminator-value="edfi.CurriculumUsedDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="CurriculumUsedDescriptor" >
           <key>
             <column name="CurriculumUsedDescriptorId" />
           </key>
@@ -4932,8 +5038,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.CourseOfferingAggregate.EdFi.CourseOfferingCurriculumUsedQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.DeliveryMethodDescriptorAggregate.EdFi.DeliveryMethodDescriptorQ" table="DeliveryMethodDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.DeliveryMethodDescriptorAggregate.EdFi.DeliveryMethodDescriptorQ" lazy="false" discriminator-value="edfi.DeliveryMethodDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="DeliveryMethodDescriptor" >
           <key>
             <column name="DeliveryMethodDescriptorId" />
           </key>
@@ -4967,8 +5075,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.InterventionStudyAggregate.EdFi.InterventionStudyQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.DiagnosisDescriptorAggregate.EdFi.DiagnosisDescriptorQ" table="DiagnosisDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.DiagnosisDescriptorAggregate.EdFi.DiagnosisDescriptorQ" lazy="false" discriminator-value="edfi.DiagnosisDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="DiagnosisDescriptor" >
           <key>
             <column name="DiagnosisDescriptorId" />
           </key>
@@ -5009,8 +5119,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentInterventionAssociationAggregate.EdFi.StudentInterventionAssociationInterventionEffectivenessQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.DiplomaLevelDescriptorAggregate.EdFi.DiplomaLevelDescriptorQ" table="DiplomaLevelDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.DiplomaLevelDescriptorAggregate.EdFi.DiplomaLevelDescriptorQ" lazy="false" discriminator-value="edfi.DiplomaLevelDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="DiplomaLevelDescriptor" >
           <key>
             <column name="DiplomaLevelDescriptorId" />
           </key>
@@ -5030,8 +5142,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAcademicRecordAggregate.EdFi.StudentAcademicRecordDiplomaQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.DiplomaTypeDescriptorAggregate.EdFi.DiplomaTypeDescriptorQ" table="DiplomaTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.DiplomaTypeDescriptorAggregate.EdFi.DiplomaTypeDescriptorQ" lazy="false" discriminator-value="edfi.DiplomaTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="DiplomaTypeDescriptor" >
           <key>
             <column name="DiplomaTypeDescriptorId" />
           </key>
@@ -5051,8 +5165,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAcademicRecordAggregate.EdFi.StudentAcademicRecordDiplomaQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.DisabilityDescriptorAggregate.EdFi.DisabilityDescriptorQ" table="DisabilityDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.DisabilityDescriptorAggregate.EdFi.DisabilityDescriptorQ" lazy="false" discriminator-value="edfi.DisabilityDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="DisabilityDescriptor" >
           <key>
             <column name="DisabilityDescriptorId" />
           </key>
@@ -5079,8 +5195,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSpecialEducationProgramAssociationAggregate.EdFi.StudentSpecialEducationProgramAssociationDisabilityQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.DisabilityDesignationDescriptorAggregate.EdFi.DisabilityDesignationDescriptorQ" table="DisabilityDesignationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.DisabilityDesignationDescriptorAggregate.EdFi.DisabilityDesignationDescriptorQ" lazy="false" discriminator-value="edfi.DisabilityDesignationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="DisabilityDesignationDescriptor" >
           <key>
             <column name="DisabilityDesignationDescriptorId" />
           </key>
@@ -5107,8 +5225,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSpecialEducationProgramAssociationAggregate.EdFi.StudentSpecialEducationProgramAssociationDisabilityDesignationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.DisabilityDeterminationSourceTypeDescriptorAggregate.EdFi.DisabilityDeterminationSourceTypeDescriptorQ" table="DisabilityDeterminationSourceTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.DisabilityDeterminationSourceTypeDescriptorAggregate.EdFi.DisabilityDeterminationSourceTypeDescriptorQ" lazy="false" discriminator-value="edfi.DisabilityDeterminationSourceTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="DisabilityDeterminationSourceTypeDescriptor" >
           <key>
             <column name="DisabilityDeterminationSourceTypeDescriptorId" />
           </key>
@@ -5135,8 +5255,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSpecialEducationProgramAssociationAggregate.EdFi.StudentSpecialEducationProgramAssociationDisabilityQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.DisciplineActionLengthDifferenceReasonDescriptorAggregate.EdFi.DisciplineActionLengthDifferenceReasonDescriptorQ" table="DisciplineActionLengthDifferenceReasonDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.DisciplineActionLengthDifferenceReasonDescriptorAggregate.EdFi.DisciplineActionLengthDifferenceReasonDescriptorQ" lazy="false" discriminator-value="edfi.DisciplineActionLengthDifferenceReasonDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="DisciplineActionLengthDifferenceReasonDescriptor" >
           <key>
             <column name="DisciplineActionLengthDifferenceReasonDescriptorId" />
           </key>
@@ -5156,8 +5278,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.DisciplineActionAggregate.EdFi.DisciplineActionQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.DisciplineDescriptorAggregate.EdFi.DisciplineDescriptorQ" table="DisciplineDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.DisciplineDescriptorAggregate.EdFi.DisciplineDescriptorQ" lazy="false" discriminator-value="edfi.DisciplineDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="DisciplineDescriptor" >
           <key>
             <column name="DisciplineDescriptorId" />
           </key>
@@ -5177,8 +5301,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.DisciplineActionAggregate.EdFi.DisciplineActionDisciplineQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.DisciplineIncidentParticipationCodeDescriptorAggregate.EdFi.DisciplineIncidentParticipationCodeDescriptorQ" table="DisciplineIncidentParticipationCodeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.DisciplineIncidentParticipationCodeDescriptorAggregate.EdFi.DisciplineIncidentParticipationCodeDescriptorQ" lazy="false" discriminator-value="edfi.DisciplineIncidentParticipationCodeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="DisciplineIncidentParticipationCodeDescriptor" >
           <key>
             <column name="DisciplineIncidentParticipationCodeDescriptorId" />
           </key>
@@ -5219,8 +5345,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentDisciplineIncidentNonOffenderAssociationAggregate.EdFi.StudentDisciplineIncidentNonOffenderAssociationDisciplineIncidentParticipationCodeQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.DisplacedStudentStatusDescriptorAggregate.EdFi.DisplacedStudentStatusDescriptorQ" table="DisplacedStudentStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.DisplacedStudentStatusDescriptorAggregate.EdFi.DisplacedStudentStatusDescriptorQ" lazy="false" discriminator-value="edfi.DisplacedStudentStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="DisplacedStudentStatusDescriptor" >
           <key>
             <column name="DisplacedStudentStatusDescriptorId" />
           </key>
@@ -5240,8 +5368,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationDisplacedStudentQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.EducationalEnvironmentDescriptorAggregate.EdFi.EducationalEnvironmentDescriptorQ" table="EducationalEnvironmentDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.EducationalEnvironmentDescriptorAggregate.EdFi.EducationalEnvironmentDescriptorQ" lazy="false" discriminator-value="edfi.EducationalEnvironmentDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="EducationalEnvironmentDescriptor" >
           <key>
             <column name="EducationalEnvironmentDescriptorId" />
           </key>
@@ -5296,8 +5426,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSectionAttendanceEventAggregate.EdFi.StudentSectionAttendanceEventQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.EducationOrganizationAssociationTypeDescriptorAggregate.EdFi.EducationOrganizationAssociationTypeDescriptorQ" table="EducationOrganizationAssociationTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.EducationOrganizationAssociationTypeDescriptorAggregate.EdFi.EducationOrganizationAssociationTypeDescriptorQ" lazy="false" discriminator-value="edfi.EducationOrganizationAssociationTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="EducationOrganizationAssociationTypeDescriptor" >
           <key>
             <column name="EducationOrganizationAssociationTypeDescriptorId" />
           </key>
@@ -5317,8 +5449,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAssessmentEducationOrganizationAssociationAggregate.EdFi.StudentAssessmentEducationOrganizationAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.EducationOrganizationCategoryDescriptorAggregate.EdFi.EducationOrganizationCategoryDescriptorQ" table="EducationOrganizationCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.EducationOrganizationCategoryDescriptorAggregate.EdFi.EducationOrganizationCategoryDescriptorQ" lazy="false" discriminator-value="edfi.EducationOrganizationCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="EducationOrganizationCategoryDescriptor" >
           <key>
             <column name="EducationOrganizationCategoryDescriptorId" />
           </key>
@@ -5338,8 +5472,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.EducationOrganizationAggregate.EdFi.EducationOrganizationCategoryQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.EducationOrganizationIdentificationSystemDescriptorAggregate.EdFi.EducationOrganizationIdentificationSystemDescriptorQ" table="EducationOrganizationIdentificationSystemDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.EducationOrganizationIdentificationSystemDescriptorAggregate.EdFi.EducationOrganizationIdentificationSystemDescriptorQ" lazy="false" discriminator-value="edfi.EducationOrganizationIdentificationSystemDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="EducationOrganizationIdentificationSystemDescriptor" >
           <key>
             <column name="EducationOrganizationIdentificationSystemDescriptorId" />
           </key>
@@ -5359,8 +5495,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.EducationOrganizationAggregate.EdFi.EducationOrganizationIdentificationCodeQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.EducationPlanDescriptorAggregate.EdFi.EducationPlanDescriptorQ" table="EducationPlanDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.EducationPlanDescriptorAggregate.EdFi.EducationPlanDescriptorQ" lazy="false" discriminator-value="edfi.EducationPlanDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="EducationPlanDescriptor" >
           <key>
             <column name="EducationPlanDescriptorId" />
           </key>
@@ -5380,8 +5518,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSchoolAssociationAggregate.EdFi.StudentSchoolAssociationEducationPlanQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ElectronicMailTypeDescriptorAggregate.EdFi.ElectronicMailTypeDescriptorQ" table="ElectronicMailTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ElectronicMailTypeDescriptorAggregate.EdFi.ElectronicMailTypeDescriptorQ" lazy="false" discriminator-value="edfi.ElectronicMailTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ElectronicMailTypeDescriptor" >
           <key>
             <column name="ElectronicMailTypeDescriptorId" />
           </key>
@@ -5415,8 +5555,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationElectronicMailQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.EligibilityDelayReasonDescriptorAggregate.EdFi.EligibilityDelayReasonDescriptorQ" table="EligibilityDelayReasonDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.EligibilityDelayReasonDescriptorAggregate.EdFi.EligibilityDelayReasonDescriptorQ" lazy="false" discriminator-value="edfi.EligibilityDelayReasonDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="EligibilityDelayReasonDescriptor" >
           <key>
             <column name="EligibilityDelayReasonDescriptorId" />
           </key>
@@ -5436,8 +5578,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSpecialEducationProgramEligibilityAssociationAggregate.EdFi.StudentSpecialEducationProgramEligibilityAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.EligibilityEvaluationTypeDescriptorAggregate.EdFi.EligibilityEvaluationTypeDescriptorQ" table="EligibilityEvaluationTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.EligibilityEvaluationTypeDescriptorAggregate.EdFi.EligibilityEvaluationTypeDescriptorQ" lazy="false" discriminator-value="edfi.EligibilityEvaluationTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="EligibilityEvaluationTypeDescriptor" >
           <key>
             <column name="EligibilityEvaluationTypeDescriptorId" />
           </key>
@@ -5457,8 +5601,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSpecialEducationProgramEligibilityAssociationAggregate.EdFi.StudentSpecialEducationProgramEligibilityAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.EmploymentStatusDescriptorAggregate.EdFi.EmploymentStatusDescriptorQ" table="EmploymentStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.EmploymentStatusDescriptorAggregate.EdFi.EmploymentStatusDescriptorQ" lazy="false" discriminator-value="edfi.EmploymentStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="EmploymentStatusDescriptor" >
           <key>
             <column name="EmploymentStatusDescriptorId" />
           </key>
@@ -5485,8 +5631,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StaffEducationOrganizationEmploymentAssociationAggregate.EdFi.StaffEducationOrganizationEmploymentAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.EnrollmentTypeDescriptorAggregate.EdFi.EnrollmentTypeDescriptorQ" table="EnrollmentTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.EnrollmentTypeDescriptorAggregate.EdFi.EnrollmentTypeDescriptorQ" lazy="false" discriminator-value="edfi.EnrollmentTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="EnrollmentTypeDescriptor" >
           <key>
             <column name="EnrollmentTypeDescriptorId" />
           </key>
@@ -5506,8 +5654,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSchoolAssociationAggregate.EdFi.StudentSchoolAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.EntryGradeLevelReasonDescriptorAggregate.EdFi.EntryGradeLevelReasonDescriptorQ" table="EntryGradeLevelReasonDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.EntryGradeLevelReasonDescriptorAggregate.EdFi.EntryGradeLevelReasonDescriptorQ" lazy="false" discriminator-value="edfi.EntryGradeLevelReasonDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="EntryGradeLevelReasonDescriptor" >
           <key>
             <column name="EntryGradeLevelReasonDescriptorId" />
           </key>
@@ -5527,8 +5677,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSchoolAssociationAggregate.EdFi.StudentSchoolAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.EntryTypeDescriptorAggregate.EdFi.EntryTypeDescriptorQ" table="EntryTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.EntryTypeDescriptorAggregate.EdFi.EntryTypeDescriptorQ" lazy="false" discriminator-value="edfi.EntryTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="EntryTypeDescriptor" >
           <key>
             <column name="EntryTypeDescriptorId" />
           </key>
@@ -5548,8 +5700,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSchoolAssociationAggregate.EdFi.StudentSchoolAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.EvaluationDelayReasonDescriptorAggregate.EdFi.EvaluationDelayReasonDescriptorQ" table="EvaluationDelayReasonDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.EvaluationDelayReasonDescriptorAggregate.EdFi.EvaluationDelayReasonDescriptorQ" lazy="false" discriminator-value="edfi.EvaluationDelayReasonDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="EvaluationDelayReasonDescriptor" >
           <key>
             <column name="EvaluationDelayReasonDescriptorId" />
           </key>
@@ -5569,8 +5723,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSpecialEducationProgramEligibilityAssociationAggregate.EdFi.StudentSpecialEducationProgramEligibilityAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.EventCircumstanceDescriptorAggregate.EdFi.EventCircumstanceDescriptorQ" table="EventCircumstanceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.EventCircumstanceDescriptorAggregate.EdFi.EventCircumstanceDescriptorQ" lazy="false" discriminator-value="edfi.EventCircumstanceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="EventCircumstanceDescriptor" >
           <key>
             <column name="EventCircumstanceDescriptorId" />
           </key>
@@ -5590,8 +5746,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAssessmentAggregate.EdFi.StudentAssessmentQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ExitWithdrawTypeDescriptorAggregate.EdFi.ExitWithdrawTypeDescriptorQ" table="ExitWithdrawTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ExitWithdrawTypeDescriptorAggregate.EdFi.ExitWithdrawTypeDescriptorQ" lazy="false" discriminator-value="edfi.ExitWithdrawTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ExitWithdrawTypeDescriptor" >
           <key>
             <column name="ExitWithdrawTypeDescriptorId" />
           </key>
@@ -5611,8 +5769,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSchoolAssociationAggregate.EdFi.StudentSchoolAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.FinancialCollectionDescriptorAggregate.EdFi.FinancialCollectionDescriptorQ" table="FinancialCollectionDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.FinancialCollectionDescriptorAggregate.EdFi.FinancialCollectionDescriptorQ" lazy="false" discriminator-value="edfi.FinancialCollectionDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="FinancialCollectionDescriptor" >
           <key>
             <column name="FinancialCollectionDescriptorId" />
           </key>
@@ -5660,8 +5820,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.LocalPayrollAggregate.EdFi.LocalPayrollQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.GradebookEntryTypeDescriptorAggregate.EdFi.GradebookEntryTypeDescriptorQ" table="GradebookEntryTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.GradebookEntryTypeDescriptorAggregate.EdFi.GradebookEntryTypeDescriptorQ" lazy="false" discriminator-value="edfi.GradebookEntryTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="GradebookEntryTypeDescriptor" >
           <key>
             <column name="GradebookEntryTypeDescriptorId" />
           </key>
@@ -5681,8 +5843,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.GradebookEntryAggregate.EdFi.GradebookEntryQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.GradeLevelDescriptorAggregate.EdFi.GradeLevelDescriptorQ" table="GradeLevelDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.GradeLevelDescriptorAggregate.EdFi.GradeLevelDescriptorQ" lazy="false" discriminator-value="edfi.GradeLevelDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="GradeLevelDescriptor" >
           <key>
             <column name="GradeLevelDescriptorId" />
           </key>
@@ -5856,8 +6020,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSchoolAssociationAggregate.EdFi.StudentSchoolAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.GradePointAverageTypeDescriptorAggregate.EdFi.GradePointAverageTypeDescriptorQ" table="GradePointAverageTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.GradePointAverageTypeDescriptorAggregate.EdFi.GradePointAverageTypeDescriptorQ" lazy="false" discriminator-value="edfi.GradePointAverageTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="GradePointAverageTypeDescriptor" >
           <key>
             <column name="GradePointAverageTypeDescriptorId" />
           </key>
@@ -5884,8 +6050,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAcademicRecordAggregate.EdFi.StudentAcademicRecordGradePointAverageQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.GradeTypeDescriptorAggregate.EdFi.GradeTypeDescriptorQ" table="GradeTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.GradeTypeDescriptorAggregate.EdFi.GradeTypeDescriptorQ" lazy="false" discriminator-value="edfi.GradeTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="GradeTypeDescriptor" >
           <key>
             <column name="GradeTypeDescriptorId" />
           </key>
@@ -5905,8 +6073,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.GradeAggregate.EdFi.GradeQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.GradingPeriodDescriptorAggregate.EdFi.GradingPeriodDescriptorQ" table="GradingPeriodDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.GradingPeriodDescriptorAggregate.EdFi.GradingPeriodDescriptorQ" lazy="false" discriminator-value="edfi.GradingPeriodDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="GradingPeriodDescriptor" >
           <key>
             <column name="GradingPeriodDescriptorId" />
           </key>
@@ -5926,8 +6096,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.GradingPeriodAggregate.EdFi.GradingPeriodQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.GraduationPlanTypeDescriptorAggregate.EdFi.GraduationPlanTypeDescriptorQ" table="GraduationPlanTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.GraduationPlanTypeDescriptorAggregate.EdFi.GraduationPlanTypeDescriptorQ" lazy="false" discriminator-value="edfi.GraduationPlanTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="GraduationPlanTypeDescriptor" >
           <key>
             <column name="GraduationPlanTypeDescriptorId" />
           </key>
@@ -5947,8 +6119,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.GraduationPlanAggregate.EdFi.GraduationPlanQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.GunFreeSchoolsActReportingStatusDescriptorAggregate.EdFi.GunFreeSchoolsActReportingStatusDescriptorQ" table="GunFreeSchoolsActReportingStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.GunFreeSchoolsActReportingStatusDescriptorAggregate.EdFi.GunFreeSchoolsActReportingStatusDescriptorQ" lazy="false" discriminator-value="edfi.GunFreeSchoolsActReportingStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="GunFreeSchoolsActReportingStatusDescriptor" >
           <key>
             <column name="GunFreeSchoolsActReportingStatusDescriptorId" />
           </key>
@@ -5968,8 +6142,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.LocalEducationAgencyAggregate.EdFi.LocalEducationAgencyAccountabilityQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.HomelessPrimaryNighttimeResidenceDescriptorAggregate.EdFi.HomelessPrimaryNighttimeResidenceDescriptorQ" table="HomelessPrimaryNighttimeResidenceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.HomelessPrimaryNighttimeResidenceDescriptorAggregate.EdFi.HomelessPrimaryNighttimeResidenceDescriptorQ" lazy="false" discriminator-value="edfi.HomelessPrimaryNighttimeResidenceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="HomelessPrimaryNighttimeResidenceDescriptor" >
           <key>
             <column name="HomelessPrimaryNighttimeResidenceDescriptorId" />
           </key>
@@ -5989,8 +6165,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentHomelessProgramAssociationAggregate.EdFi.StudentHomelessProgramAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.HomelessProgramServiceDescriptorAggregate.EdFi.HomelessProgramServiceDescriptorQ" table="HomelessProgramServiceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.HomelessProgramServiceDescriptorAggregate.EdFi.HomelessProgramServiceDescriptorQ" lazy="false" discriminator-value="edfi.HomelessProgramServiceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="HomelessProgramServiceDescriptor" >
           <key>
             <column name="HomelessProgramServiceDescriptorId" />
           </key>
@@ -6010,8 +6188,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentHomelessProgramAssociationAggregate.EdFi.StudentHomelessProgramAssociationHomelessProgramServiceQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.IDEAPartDescriptorAggregate.EdFi.IDEAPartDescriptorQ" table="IDEAPartDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.IDEAPartDescriptorAggregate.EdFi.IDEAPartDescriptorQ" lazy="false" discriminator-value="edfi.IDEAPartDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="IDEAPartDescriptor" >
           <key>
             <column name="IDEAPartDescriptorId" />
           </key>
@@ -6031,8 +6211,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSpecialEducationProgramEligibilityAssociationAggregate.EdFi.StudentSpecialEducationProgramEligibilityAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.IdentificationDocumentUseDescriptorAggregate.EdFi.IdentificationDocumentUseDescriptorQ" table="IdentificationDocumentUseDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.IdentificationDocumentUseDescriptorAggregate.EdFi.IdentificationDocumentUseDescriptorQ" lazy="false" discriminator-value="edfi.IdentificationDocumentUseDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="IdentificationDocumentUseDescriptor" >
           <key>
             <column name="IdentificationDocumentUseDescriptorId" />
           </key>
@@ -6080,8 +6262,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAggregate.EdFi.StudentPersonalIdentificationDocumentQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ImmunizationTypeDescriptorAggregate.EdFi.ImmunizationTypeDescriptorQ" table="ImmunizationTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ImmunizationTypeDescriptorAggregate.EdFi.ImmunizationTypeDescriptorQ" lazy="false" discriminator-value="edfi.ImmunizationTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ImmunizationTypeDescriptor" >
           <key>
             <column name="ImmunizationTypeDescriptorId" />
           </key>
@@ -6101,8 +6285,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentHealthAggregate.EdFi.StudentHealthRequiredImmunizationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.IncidentLocationDescriptorAggregate.EdFi.IncidentLocationDescriptorQ" table="IncidentLocationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.IncidentLocationDescriptorAggregate.EdFi.IncidentLocationDescriptorQ" lazy="false" discriminator-value="edfi.IncidentLocationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="IncidentLocationDescriptor" >
           <key>
             <column name="IncidentLocationDescriptorId" />
           </key>
@@ -6122,8 +6308,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.DisciplineIncidentAggregate.EdFi.DisciplineIncidentQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.IndicatorDescriptorAggregate.EdFi.IndicatorDescriptorQ" table="IndicatorDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.IndicatorDescriptorAggregate.EdFi.IndicatorDescriptorQ" lazy="false" discriminator-value="edfi.IndicatorDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="IndicatorDescriptor" >
           <key>
             <column name="IndicatorDescriptorId" />
           </key>
@@ -6143,8 +6331,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.EducationOrganizationAggregate.EdFi.EducationOrganizationIndicatorQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.IndicatorGroupDescriptorAggregate.EdFi.IndicatorGroupDescriptorQ" table="IndicatorGroupDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.IndicatorGroupDescriptorAggregate.EdFi.IndicatorGroupDescriptorQ" lazy="false" discriminator-value="edfi.IndicatorGroupDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="IndicatorGroupDescriptor" >
           <key>
             <column name="IndicatorGroupDescriptorId" />
           </key>
@@ -6164,8 +6354,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.EducationOrganizationAggregate.EdFi.EducationOrganizationIndicatorQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.IndicatorLevelDescriptorAggregate.EdFi.IndicatorLevelDescriptorQ" table="IndicatorLevelDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.IndicatorLevelDescriptorAggregate.EdFi.IndicatorLevelDescriptorQ" lazy="false" discriminator-value="edfi.IndicatorLevelDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="IndicatorLevelDescriptor" >
           <key>
             <column name="IndicatorLevelDescriptorId" />
           </key>
@@ -6185,8 +6377,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.EducationOrganizationAggregate.EdFi.EducationOrganizationIndicatorQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.InstitutionTelephoneNumberTypeDescriptorAggregate.EdFi.InstitutionTelephoneNumberTypeDescriptorQ" table="InstitutionTelephoneNumberTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.InstitutionTelephoneNumberTypeDescriptorAggregate.EdFi.InstitutionTelephoneNumberTypeDescriptorQ" lazy="false" discriminator-value="edfi.InstitutionTelephoneNumberTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="InstitutionTelephoneNumberTypeDescriptor" >
           <key>
             <column name="InstitutionTelephoneNumberTypeDescriptorId" />
           </key>
@@ -6206,8 +6400,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.EducationOrganizationAggregate.EdFi.EducationOrganizationInstitutionTelephoneQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.InteractivityStyleDescriptorAggregate.EdFi.InteractivityStyleDescriptorQ" table="InteractivityStyleDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.InteractivityStyleDescriptorAggregate.EdFi.InteractivityStyleDescriptorQ" lazy="false" discriminator-value="edfi.InteractivityStyleDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="InteractivityStyleDescriptor" >
           <key>
             <column name="InteractivityStyleDescriptorId" />
           </key>
@@ -6227,8 +6423,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.EducationContentAggregate.EdFi.EducationContentQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.InternetAccessDescriptorAggregate.EdFi.InternetAccessDescriptorQ" table="InternetAccessDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.InternetAccessDescriptorAggregate.EdFi.InternetAccessDescriptorQ" lazy="false" discriminator-value="edfi.InternetAccessDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="InternetAccessDescriptor" >
           <key>
             <column name="InternetAccessDescriptorId" />
           </key>
@@ -6248,8 +6446,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.SchoolAggregate.EdFi.SchoolQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.InternetAccessTypeInResidenceDescriptorAggregate.EdFi.InternetAccessTypeInResidenceDescriptorQ" table="InternetAccessTypeInResidenceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.InternetAccessTypeInResidenceDescriptorAggregate.EdFi.InternetAccessTypeInResidenceDescriptorQ" lazy="false" discriminator-value="edfi.InternetAccessTypeInResidenceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="InternetAccessTypeInResidenceDescriptor" >
           <key>
             <column name="InternetAccessTypeInResidenceDescriptorId" />
           </key>
@@ -6269,8 +6469,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.InternetPerformanceInResidenceDescriptorAggregate.EdFi.InternetPerformanceInResidenceDescriptorQ" table="InternetPerformanceInResidenceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.InternetPerformanceInResidenceDescriptorAggregate.EdFi.InternetPerformanceInResidenceDescriptorQ" lazy="false" discriminator-value="edfi.InternetPerformanceInResidenceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="InternetPerformanceInResidenceDescriptor" >
           <key>
             <column name="InternetPerformanceInResidenceDescriptorId" />
           </key>
@@ -6290,8 +6492,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.InterventionClassDescriptorAggregate.EdFi.InterventionClassDescriptorQ" table="InterventionClassDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.InterventionClassDescriptorAggregate.EdFi.InterventionClassDescriptorQ" lazy="false" discriminator-value="edfi.InterventionClassDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="InterventionClassDescriptor" >
           <key>
             <column name="InterventionClassDescriptorId" />
           </key>
@@ -6325,8 +6529,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.InterventionStudyAggregate.EdFi.InterventionStudyQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.InterventionEffectivenessRatingDescriptorAggregate.EdFi.InterventionEffectivenessRatingDescriptorQ" table="InterventionEffectivenessRatingDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.InterventionEffectivenessRatingDescriptorAggregate.EdFi.InterventionEffectivenessRatingDescriptorQ" lazy="false" discriminator-value="edfi.InterventionEffectivenessRatingDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="InterventionEffectivenessRatingDescriptor" >
           <key>
             <column name="InterventionEffectivenessRatingDescriptorId" />
           </key>
@@ -6353,8 +6559,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentInterventionAssociationAggregate.EdFi.StudentInterventionAssociationInterventionEffectivenessQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LanguageDescriptorAggregate.EdFi.LanguageDescriptorQ" table="LanguageDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LanguageDescriptorAggregate.EdFi.LanguageDescriptorQ" lazy="false" discriminator-value="edfi.LanguageDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LanguageDescriptor" >
           <key>
             <column name="LanguageDescriptorId" />
           </key>
@@ -6416,8 +6624,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationLanguageQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LanguageInstructionProgramServiceDescriptorAggregate.EdFi.LanguageInstructionProgramServiceDescriptorQ" table="LanguageInstructionProgramServiceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LanguageInstructionProgramServiceDescriptorAggregate.EdFi.LanguageInstructionProgramServiceDescriptorQ" lazy="false" discriminator-value="edfi.LanguageInstructionProgramServiceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LanguageInstructionProgramServiceDescriptor" >
           <key>
             <column name="LanguageInstructionProgramServiceDescriptorId" />
           </key>
@@ -6437,8 +6647,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentLanguageInstructionProgramAssociationAggregate.EdFi.StudentLanguageInstructionProgramAssociationLanguageInstructionProgramServiceQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LanguageUseDescriptorAggregate.EdFi.LanguageUseDescriptorQ" table="LanguageUseDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LanguageUseDescriptorAggregate.EdFi.LanguageUseDescriptorQ" lazy="false" discriminator-value="edfi.LanguageUseDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LanguageUseDescriptor" >
           <key>
             <column name="LanguageUseDescriptorId" />
           </key>
@@ -6472,8 +6684,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationLanguageUseQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LearningStandardCategoryDescriptorAggregate.EdFi.LearningStandardCategoryDescriptorQ" table="LearningStandardCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LearningStandardCategoryDescriptorAggregate.EdFi.LearningStandardCategoryDescriptorQ" lazy="false" discriminator-value="edfi.LearningStandardCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LearningStandardCategoryDescriptor" >
           <key>
             <column name="LearningStandardCategoryDescriptorId" />
           </key>
@@ -6493,8 +6707,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.LearningStandardAggregate.EdFi.LearningStandardQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LearningStandardEquivalenceStrengthDescriptorAggregate.EdFi.LearningStandardEquivalenceStrengthDescriptorQ" table="LearningStandardEquivalenceStrengthDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LearningStandardEquivalenceStrengthDescriptorAggregate.EdFi.LearningStandardEquivalenceStrengthDescriptorQ" lazy="false" discriminator-value="edfi.LearningStandardEquivalenceStrengthDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LearningStandardEquivalenceStrengthDescriptor" >
           <key>
             <column name="LearningStandardEquivalenceStrengthDescriptorId" />
           </key>
@@ -6514,8 +6730,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.LearningStandardEquivalenceAssociationAggregate.EdFi.LearningStandardEquivalenceAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LearningStandardScopeDescriptorAggregate.EdFi.LearningStandardScopeDescriptorQ" table="LearningStandardScopeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LearningStandardScopeDescriptorAggregate.EdFi.LearningStandardScopeDescriptorQ" lazy="false" discriminator-value="edfi.LearningStandardScopeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LearningStandardScopeDescriptor" >
           <key>
             <column name="LearningStandardScopeDescriptorId" />
           </key>
@@ -6535,8 +6753,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.LearningStandardAggregate.EdFi.LearningStandardQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LevelOfEducationDescriptorAggregate.EdFi.LevelOfEducationDescriptorQ" table="LevelOfEducationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LevelOfEducationDescriptorAggregate.EdFi.LevelOfEducationDescriptorQ" lazy="false" discriminator-value="edfi.LevelOfEducationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LevelOfEducationDescriptor" >
           <key>
             <column name="LevelOfEducationDescriptorId" />
           </key>
@@ -6563,8 +6783,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StaffAggregate.EdFi.StaffQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LicenseStatusDescriptorAggregate.EdFi.LicenseStatusDescriptorQ" table="LicenseStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LicenseStatusDescriptorAggregate.EdFi.LicenseStatusDescriptorQ" lazy="false" discriminator-value="edfi.LicenseStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LicenseStatusDescriptor" >
           <key>
             <column name="LicenseStatusDescriptorId" />
           </key>
@@ -6584,8 +6806,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.CommunityProviderLicenseAggregate.EdFi.CommunityProviderLicenseQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LicenseTypeDescriptorAggregate.EdFi.LicenseTypeDescriptorQ" table="LicenseTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LicenseTypeDescriptorAggregate.EdFi.LicenseTypeDescriptorQ" lazy="false" discriminator-value="edfi.LicenseTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LicenseTypeDescriptor" >
           <key>
             <column name="LicenseTypeDescriptorId" />
           </key>
@@ -6605,8 +6829,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.CommunityProviderLicenseAggregate.EdFi.CommunityProviderLicenseQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LimitedEnglishProficiencyDescriptorAggregate.EdFi.LimitedEnglishProficiencyDescriptorQ" table="LimitedEnglishProficiencyDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LimitedEnglishProficiencyDescriptorAggregate.EdFi.LimitedEnglishProficiencyDescriptorQ" lazy="false" discriminator-value="edfi.LimitedEnglishProficiencyDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LimitedEnglishProficiencyDescriptor" >
           <key>
             <column name="LimitedEnglishProficiencyDescriptorId" />
           </key>
@@ -6626,8 +6852,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LocaleDescriptorAggregate.EdFi.LocaleDescriptorQ" table="LocaleDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LocaleDescriptorAggregate.EdFi.LocaleDescriptorQ" lazy="false" discriminator-value="edfi.LocaleDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LocaleDescriptor" >
           <key>
             <column name="LocaleDescriptorId" />
           </key>
@@ -6675,8 +6903,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationAddressQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LocalEducationAgencyCategoryDescriptorAggregate.EdFi.LocalEducationAgencyCategoryDescriptorQ" table="LocalEducationAgencyCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.LocalEducationAgencyCategoryDescriptorAggregate.EdFi.LocalEducationAgencyCategoryDescriptorQ" lazy="false" discriminator-value="edfi.LocalEducationAgencyCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="LocalEducationAgencyCategoryDescriptor" >
           <key>
             <column name="LocalEducationAgencyCategoryDescriptorId" />
           </key>
@@ -6696,8 +6926,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.LocalEducationAgencyAggregate.EdFi.LocalEducationAgencyQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.MagnetSpecialProgramEmphasisSchoolDescriptorAggregate.EdFi.MagnetSpecialProgramEmphasisSchoolDescriptorQ" table="MagnetSpecialProgramEmphasisSchoolDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.MagnetSpecialProgramEmphasisSchoolDescriptorAggregate.EdFi.MagnetSpecialProgramEmphasisSchoolDescriptorQ" lazy="false" discriminator-value="edfi.MagnetSpecialProgramEmphasisSchoolDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="MagnetSpecialProgramEmphasisSchoolDescriptor" >
           <key>
             <column name="MagnetSpecialProgramEmphasisSchoolDescriptorId" />
           </key>
@@ -6717,8 +6949,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.SchoolAggregate.EdFi.SchoolQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.MediumOfInstructionDescriptorAggregate.EdFi.MediumOfInstructionDescriptorQ" table="MediumOfInstructionDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.MediumOfInstructionDescriptorAggregate.EdFi.MediumOfInstructionDescriptorQ" lazy="false" discriminator-value="edfi.MediumOfInstructionDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="MediumOfInstructionDescriptor" >
           <key>
             <column name="MediumOfInstructionDescriptorId" />
           </key>
@@ -6745,8 +6979,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.SectionAggregate.EdFi.SectionQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.MethodCreditEarnedDescriptorAggregate.EdFi.MethodCreditEarnedDescriptorQ" table="MethodCreditEarnedDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.MethodCreditEarnedDescriptorAggregate.EdFi.MethodCreditEarnedDescriptorQ" lazy="false" discriminator-value="edfi.MethodCreditEarnedDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="MethodCreditEarnedDescriptor" >
           <key>
             <column name="MethodCreditEarnedDescriptorId" />
           </key>
@@ -6773,8 +7009,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.CourseTranscriptAggregate.EdFi.CourseTranscriptPartialCourseTranscriptAwardsQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.MigrantEducationProgramServiceDescriptorAggregate.EdFi.MigrantEducationProgramServiceDescriptorQ" table="MigrantEducationProgramServiceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.MigrantEducationProgramServiceDescriptorAggregate.EdFi.MigrantEducationProgramServiceDescriptorQ" lazy="false" discriminator-value="edfi.MigrantEducationProgramServiceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="MigrantEducationProgramServiceDescriptor" >
           <key>
             <column name="MigrantEducationProgramServiceDescriptorId" />
           </key>
@@ -6794,8 +7032,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentMigrantEducationProgramAssociationAggregate.EdFi.StudentMigrantEducationProgramAssociationMigrantEducationProgramServiceQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ModelEntityDescriptorAggregate.EdFi.ModelEntityDescriptorQ" table="ModelEntityDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ModelEntityDescriptorAggregate.EdFi.ModelEntityDescriptorQ" lazy="false" discriminator-value="edfi.ModelEntityDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ModelEntityDescriptor" >
           <key>
             <column name="ModelEntityDescriptorId" />
           </key>
@@ -6815,8 +7055,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.DescriptorMappingAggregate.EdFi.DescriptorMappingModelEntityQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.MonitoredDescriptorAggregate.EdFi.MonitoredDescriptorQ" table="MonitoredDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.MonitoredDescriptorAggregate.EdFi.MonitoredDescriptorQ" lazy="false" discriminator-value="edfi.MonitoredDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="MonitoredDescriptor" >
           <key>
             <column name="MonitoredDescriptorId" />
           </key>
@@ -6836,8 +7078,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentLanguageInstructionProgramAssociationAggregate.EdFi.StudentLanguageInstructionProgramAssociationEnglishLanguageProficiencyAssessmentQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.NeglectedOrDelinquentProgramDescriptorAggregate.EdFi.NeglectedOrDelinquentProgramDescriptorQ" table="NeglectedOrDelinquentProgramDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.NeglectedOrDelinquentProgramDescriptorAggregate.EdFi.NeglectedOrDelinquentProgramDescriptorQ" lazy="false" discriminator-value="edfi.NeglectedOrDelinquentProgramDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="NeglectedOrDelinquentProgramDescriptor" >
           <key>
             <column name="NeglectedOrDelinquentProgramDescriptorId" />
           </key>
@@ -6857,8 +7101,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentNeglectedOrDelinquentProgramAssociationAggregate.EdFi.StudentNeglectedOrDelinquentProgramAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.NeglectedOrDelinquentProgramServiceDescriptorAggregate.EdFi.NeglectedOrDelinquentProgramServiceDescriptorQ" table="NeglectedOrDelinquentProgramServiceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.NeglectedOrDelinquentProgramServiceDescriptorAggregate.EdFi.NeglectedOrDelinquentProgramServiceDescriptorQ" lazy="false" discriminator-value="edfi.NeglectedOrDelinquentProgramServiceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="NeglectedOrDelinquentProgramServiceDescriptor" >
           <key>
             <column name="NeglectedOrDelinquentProgramServiceDescriptorId" />
           </key>
@@ -6878,8 +7124,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentNeglectedOrDelinquentProgramAssociationAggregate.EdFi.StudentNeglectedOrDelinquentProgramAssociationNeglectedOrDelinquentProgramServiceQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.NetworkPurposeDescriptorAggregate.EdFi.NetworkPurposeDescriptorQ" table="NetworkPurposeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.NetworkPurposeDescriptorAggregate.EdFi.NetworkPurposeDescriptorQ" lazy="false" discriminator-value="edfi.NetworkPurposeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="NetworkPurposeDescriptor" >
           <key>
             <column name="NetworkPurposeDescriptorId" />
           </key>
@@ -6899,8 +7147,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.EducationOrganizationNetworkAggregate.EdFi.EducationOrganizationNetworkQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.NonMedicalImmunizationExemptionDescriptorAggregate.EdFi.NonMedicalImmunizationExemptionDescriptorQ" table="NonMedicalImmunizationExemptionDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.NonMedicalImmunizationExemptionDescriptorAggregate.EdFi.NonMedicalImmunizationExemptionDescriptorQ" lazy="false" discriminator-value="edfi.NonMedicalImmunizationExemptionDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="NonMedicalImmunizationExemptionDescriptor" >
           <key>
             <column name="NonMedicalImmunizationExemptionDescriptorId" />
           </key>
@@ -6920,8 +7170,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentHealthAggregate.EdFi.StudentHealthQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.OperationalStatusDescriptorAggregate.EdFi.OperationalStatusDescriptorQ" table="OperationalStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.OperationalStatusDescriptorAggregate.EdFi.OperationalStatusDescriptorQ" lazy="false" discriminator-value="edfi.OperationalStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="OperationalStatusDescriptor" >
           <key>
             <column name="OperationalStatusDescriptorId" />
           </key>
@@ -6941,8 +7193,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.EducationOrganizationAggregate.EdFi.EducationOrganizationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.OtherNameTypeDescriptorAggregate.EdFi.OtherNameTypeDescriptorQ" table="OtherNameTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.OtherNameTypeDescriptorAggregate.EdFi.OtherNameTypeDescriptorQ" lazy="false" discriminator-value="edfi.OtherNameTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="OtherNameTypeDescriptor" >
           <key>
             <column name="OtherNameTypeDescriptorId" />
           </key>
@@ -6976,8 +7230,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAggregate.EdFi.StudentOtherNameQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ParticipationDescriptorAggregate.EdFi.ParticipationDescriptorQ" table="ParticipationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ParticipationDescriptorAggregate.EdFi.ParticipationDescriptorQ" lazy="false" discriminator-value="edfi.ParticipationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ParticipationDescriptor" >
           <key>
             <column name="ParticipationDescriptorId" />
           </key>
@@ -6997,8 +7253,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentLanguageInstructionProgramAssociationAggregate.EdFi.StudentLanguageInstructionProgramAssociationEnglishLanguageProficiencyAssessmentQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ParticipationStatusDescriptorAggregate.EdFi.ParticipationStatusDescriptorQ" table="ParticipationStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ParticipationStatusDescriptorAggregate.EdFi.ParticipationStatusDescriptorQ" lazy="false" discriminator-value="edfi.ParticipationStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ParticipationStatusDescriptor" >
           <key>
             <column name="ParticipationStatusDescriptorId" />
           </key>
@@ -7018,8 +7276,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.GeneralStudentProgramAssociationAggregate.EdFi.GeneralStudentProgramAssociationProgramParticipationStatusQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PerformanceBaseConversionDescriptorAggregate.EdFi.PerformanceBaseConversionDescriptorQ" table="PerformanceBaseConversionDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PerformanceBaseConversionDescriptorAggregate.EdFi.PerformanceBaseConversionDescriptorQ" lazy="false" discriminator-value="edfi.PerformanceBaseConversionDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PerformanceBaseConversionDescriptor" >
           <key>
             <column name="PerformanceBaseConversionDescriptorId" />
           </key>
@@ -7046,8 +7306,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.GradeAggregate.EdFi.GradeLearningStandardGradeQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PerformanceLevelDescriptorAggregate.EdFi.PerformanceLevelDescriptorQ" table="PerformanceLevelDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PerformanceLevelDescriptorAggregate.EdFi.PerformanceLevelDescriptorQ" lazy="false" discriminator-value="edfi.PerformanceLevelDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PerformanceLevelDescriptor" >
           <key>
             <column name="PerformanceLevelDescriptorId" />
           </key>
@@ -7095,8 +7357,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAssessmentAggregate.EdFi.StudentAssessmentStudentObjectiveAssessmentPerformanceLevelQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PersonalInformationVerificationDescriptorAggregate.EdFi.PersonalInformationVerificationDescriptorQ" table="PersonalInformationVerificationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PersonalInformationVerificationDescriptorAggregate.EdFi.PersonalInformationVerificationDescriptorQ" lazy="false" discriminator-value="edfi.PersonalInformationVerificationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PersonalInformationVerificationDescriptor" >
           <key>
             <column name="PersonalInformationVerificationDescriptorId" />
           </key>
@@ -7144,8 +7408,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAggregate.EdFi.StudentPersonalIdentificationDocumentQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PlatformTypeDescriptorAggregate.EdFi.PlatformTypeDescriptorQ" table="PlatformTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PlatformTypeDescriptorAggregate.EdFi.PlatformTypeDescriptorQ" lazy="false" discriminator-value="edfi.PlatformTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PlatformTypeDescriptor" >
           <key>
             <column name="PlatformTypeDescriptorId" />
           </key>
@@ -7172,8 +7438,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAssessmentAggregate.EdFi.StudentAssessmentQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PopulationServedDescriptorAggregate.EdFi.PopulationServedDescriptorQ" table="PopulationServedDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PopulationServedDescriptorAggregate.EdFi.PopulationServedDescriptorQ" lazy="false" discriminator-value="edfi.PopulationServedDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PopulationServedDescriptor" >
           <key>
             <column name="PopulationServedDescriptorId" />
           </key>
@@ -7228,8 +7496,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentInterventionAssociationAggregate.EdFi.StudentInterventionAssociationInterventionEffectivenessQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PostingResultDescriptorAggregate.EdFi.PostingResultDescriptorQ" table="PostingResultDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PostingResultDescriptorAggregate.EdFi.PostingResultDescriptorQ" lazy="false" discriminator-value="edfi.PostingResultDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PostingResultDescriptor" >
           <key>
             <column name="PostingResultDescriptorId" />
           </key>
@@ -7249,8 +7519,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.OpenStaffPositionAggregate.EdFi.OpenStaffPositionQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PostSecondaryEventCategoryDescriptorAggregate.EdFi.PostSecondaryEventCategoryDescriptorQ" table="PostSecondaryEventCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PostSecondaryEventCategoryDescriptorAggregate.EdFi.PostSecondaryEventCategoryDescriptorQ" lazy="false" discriminator-value="edfi.PostSecondaryEventCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PostSecondaryEventCategoryDescriptor" >
           <key>
             <column name="PostSecondaryEventCategoryDescriptorId" />
           </key>
@@ -7270,8 +7542,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.PostSecondaryEventAggregate.EdFi.PostSecondaryEventQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PostSecondaryInstitutionLevelDescriptorAggregate.EdFi.PostSecondaryInstitutionLevelDescriptorQ" table="PostSecondaryInstitutionLevelDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PostSecondaryInstitutionLevelDescriptorAggregate.EdFi.PostSecondaryInstitutionLevelDescriptorQ" lazy="false" discriminator-value="edfi.PostSecondaryInstitutionLevelDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PostSecondaryInstitutionLevelDescriptor" >
           <key>
             <column name="PostSecondaryInstitutionLevelDescriptorId" />
           </key>
@@ -7291,8 +7565,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.PostSecondaryInstitutionAggregate.EdFi.PostSecondaryInstitutionQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PrimaryLearningDeviceAccessDescriptorAggregate.EdFi.PrimaryLearningDeviceAccessDescriptorQ" table="PrimaryLearningDeviceAccessDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PrimaryLearningDeviceAccessDescriptorAggregate.EdFi.PrimaryLearningDeviceAccessDescriptorQ" lazy="false" discriminator-value="edfi.PrimaryLearningDeviceAccessDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PrimaryLearningDeviceAccessDescriptor" >
           <key>
             <column name="PrimaryLearningDeviceAccessDescriptorId" />
           </key>
@@ -7312,8 +7588,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PrimaryLearningDeviceAwayFromSchoolDescriptorAggregate.EdFi.PrimaryLearningDeviceAwayFromSchoolDescriptorQ" table="PrimaryLearningDeviceAwayFromSchoolDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PrimaryLearningDeviceAwayFromSchoolDescriptorAggregate.EdFi.PrimaryLearningDeviceAwayFromSchoolDescriptorQ" lazy="false" discriminator-value="edfi.PrimaryLearningDeviceAwayFromSchoolDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PrimaryLearningDeviceAwayFromSchoolDescriptor" >
           <key>
             <column name="PrimaryLearningDeviceAwayFromSchoolDescriptorId" />
           </key>
@@ -7333,8 +7611,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PrimaryLearningDeviceProviderDescriptorAggregate.EdFi.PrimaryLearningDeviceProviderDescriptorQ" table="PrimaryLearningDeviceProviderDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PrimaryLearningDeviceProviderDescriptorAggregate.EdFi.PrimaryLearningDeviceProviderDescriptorQ" lazy="false" discriminator-value="edfi.PrimaryLearningDeviceProviderDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PrimaryLearningDeviceProviderDescriptor" >
           <key>
             <column name="PrimaryLearningDeviceProviderDescriptorId" />
           </key>
@@ -7354,8 +7634,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ProficiencyDescriptorAggregate.EdFi.ProficiencyDescriptorQ" table="ProficiencyDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ProficiencyDescriptorAggregate.EdFi.ProficiencyDescriptorQ" lazy="false" discriminator-value="edfi.ProficiencyDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ProficiencyDescriptor" >
           <key>
             <column name="ProficiencyDescriptorId" />
           </key>
@@ -7375,8 +7657,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentLanguageInstructionProgramAssociationAggregate.EdFi.StudentLanguageInstructionProgramAssociationEnglishLanguageProficiencyAssessmentQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ProgramAssignmentDescriptorAggregate.EdFi.ProgramAssignmentDescriptorQ" table="ProgramAssignmentDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ProgramAssignmentDescriptorAggregate.EdFi.ProgramAssignmentDescriptorQ" lazy="false" discriminator-value="edfi.ProgramAssignmentDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ProgramAssignmentDescriptor" >
           <key>
             <column name="ProgramAssignmentDescriptorId" />
           </key>
@@ -7403,8 +7687,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StaffSchoolAssociationAggregate.EdFi.StaffSchoolAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ProgramCharacteristicDescriptorAggregate.EdFi.ProgramCharacteristicDescriptorQ" table="ProgramCharacteristicDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ProgramCharacteristicDescriptorAggregate.EdFi.ProgramCharacteristicDescriptorQ" lazy="false" discriminator-value="edfi.ProgramCharacteristicDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ProgramCharacteristicDescriptor" >
           <key>
             <column name="ProgramCharacteristicDescriptorId" />
           </key>
@@ -7424,8 +7710,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.ProgramAggregate.EdFi.ProgramCharacteristicQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ProgramEvaluationPeriodDescriptorAggregate.EdFi.ProgramEvaluationPeriodDescriptorQ" table="ProgramEvaluationPeriodDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ProgramEvaluationPeriodDescriptorAggregate.EdFi.ProgramEvaluationPeriodDescriptorQ" lazy="false" discriminator-value="edfi.ProgramEvaluationPeriodDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ProgramEvaluationPeriodDescriptor" >
           <key>
             <column name="ProgramEvaluationPeriodDescriptorId" />
           </key>
@@ -7445,8 +7733,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.ProgramEvaluationAggregate.EdFi.ProgramEvaluationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ProgramEvaluationTypeDescriptorAggregate.EdFi.ProgramEvaluationTypeDescriptorQ" table="ProgramEvaluationTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ProgramEvaluationTypeDescriptorAggregate.EdFi.ProgramEvaluationTypeDescriptorQ" lazy="false" discriminator-value="edfi.ProgramEvaluationTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ProgramEvaluationTypeDescriptor" >
           <key>
             <column name="ProgramEvaluationTypeDescriptorId" />
           </key>
@@ -7466,8 +7756,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.ProgramEvaluationAggregate.EdFi.ProgramEvaluationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ProgramSponsorDescriptorAggregate.EdFi.ProgramSponsorDescriptorQ" table="ProgramSponsorDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ProgramSponsorDescriptorAggregate.EdFi.ProgramSponsorDescriptorQ" lazy="false" discriminator-value="edfi.ProgramSponsorDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ProgramSponsorDescriptor" >
           <key>
             <column name="ProgramSponsorDescriptorId" />
           </key>
@@ -7487,8 +7779,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.ProgramAggregate.EdFi.ProgramSponsorQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ProgramTypeDescriptorAggregate.EdFi.ProgramTypeDescriptorQ" table="ProgramTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ProgramTypeDescriptorAggregate.EdFi.ProgramTypeDescriptorQ" lazy="false" discriminator-value="edfi.ProgramTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ProgramTypeDescriptor" >
           <key>
             <column name="ProgramTypeDescriptorId" />
           </key>
@@ -7508,8 +7802,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.ProgramAggregate.EdFi.ProgramQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ProgressDescriptorAggregate.EdFi.ProgressDescriptorQ" table="ProgressDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ProgressDescriptorAggregate.EdFi.ProgressDescriptorQ" lazy="false" discriminator-value="edfi.ProgressDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ProgressDescriptor" >
           <key>
             <column name="ProgressDescriptorId" />
           </key>
@@ -7529,8 +7825,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentLanguageInstructionProgramAssociationAggregate.EdFi.StudentLanguageInstructionProgramAssociationEnglishLanguageProficiencyAssessmentQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ProgressLevelDescriptorAggregate.EdFi.ProgressLevelDescriptorQ" table="ProgressLevelDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ProgressLevelDescriptorAggregate.EdFi.ProgressLevelDescriptorQ" lazy="false" discriminator-value="edfi.ProgressLevelDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ProgressLevelDescriptor" >
           <key>
             <column name="ProgressLevelDescriptorId" />
           </key>
@@ -7557,8 +7855,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentNeglectedOrDelinquentProgramAssociationAggregate.EdFi.StudentNeglectedOrDelinquentProgramAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ProviderCategoryDescriptorAggregate.EdFi.ProviderCategoryDescriptorQ" table="ProviderCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ProviderCategoryDescriptorAggregate.EdFi.ProviderCategoryDescriptorQ" lazy="false" discriminator-value="edfi.ProviderCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ProviderCategoryDescriptor" >
           <key>
             <column name="ProviderCategoryDescriptorId" />
           </key>
@@ -7578,8 +7878,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.CommunityProviderAggregate.EdFi.CommunityProviderQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ProviderProfitabilityDescriptorAggregate.EdFi.ProviderProfitabilityDescriptorQ" table="ProviderProfitabilityDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ProviderProfitabilityDescriptorAggregate.EdFi.ProviderProfitabilityDescriptorQ" lazy="false" discriminator-value="edfi.ProviderProfitabilityDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ProviderProfitabilityDescriptor" >
           <key>
             <column name="ProviderProfitabilityDescriptorId" />
           </key>
@@ -7599,8 +7901,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.CommunityProviderAggregate.EdFi.CommunityProviderQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ProviderStatusDescriptorAggregate.EdFi.ProviderStatusDescriptorQ" table="ProviderStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ProviderStatusDescriptorAggregate.EdFi.ProviderStatusDescriptorQ" lazy="false" discriminator-value="edfi.ProviderStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ProviderStatusDescriptor" >
           <key>
             <column name="ProviderStatusDescriptorId" />
           </key>
@@ -7620,8 +7924,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.CommunityProviderAggregate.EdFi.CommunityProviderQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PublicationStatusDescriptorAggregate.EdFi.PublicationStatusDescriptorQ" table="PublicationStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.PublicationStatusDescriptorAggregate.EdFi.PublicationStatusDescriptorQ" lazy="false" discriminator-value="edfi.PublicationStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="PublicationStatusDescriptor" >
           <key>
             <column name="PublicationStatusDescriptorId" />
           </key>
@@ -7648,8 +7954,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.LearningStandardAggregate.EdFi.LearningStandardContentStandardQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.QuestionFormDescriptorAggregate.EdFi.QuestionFormDescriptorQ" table="QuestionFormDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.QuestionFormDescriptorAggregate.EdFi.QuestionFormDescriptorQ" lazy="false" discriminator-value="edfi.QuestionFormDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="QuestionFormDescriptor" >
           <key>
             <column name="QuestionFormDescriptorId" />
           </key>
@@ -7669,8 +7977,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyQuestionAggregate.EdFi.SurveyQuestionQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.RaceDescriptorAggregate.EdFi.RaceDescriptorQ" table="RaceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.RaceDescriptorAggregate.EdFi.RaceDescriptorQ" lazy="false" discriminator-value="edfi.RaceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="RaceDescriptor" >
           <key>
             <column name="RaceDescriptorId" />
           </key>
@@ -7697,8 +8007,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationRaceQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.RatingLevelDescriptorAggregate.EdFi.RatingLevelDescriptorQ" table="RatingLevelDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.RatingLevelDescriptorAggregate.EdFi.RatingLevelDescriptorQ" lazy="false" discriminator-value="edfi.RatingLevelDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="RatingLevelDescriptor" >
           <key>
             <column name="RatingLevelDescriptorId" />
           </key>
@@ -7760,8 +8072,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentProgramEvaluationAggregate.EdFi.StudentProgramEvaluationStudentEvaluationObjectiveQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ReasonExitedDescriptorAggregate.EdFi.ReasonExitedDescriptorQ" table="ReasonExitedDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ReasonExitedDescriptorAggregate.EdFi.ReasonExitedDescriptorQ" lazy="false" discriminator-value="edfi.ReasonExitedDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ReasonExitedDescriptor" >
           <key>
             <column name="ReasonExitedDescriptorId" />
           </key>
@@ -7781,8 +8095,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.GeneralStudentProgramAssociationAggregate.EdFi.GeneralStudentProgramAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ReasonNotTestedDescriptorAggregate.EdFi.ReasonNotTestedDescriptorQ" table="ReasonNotTestedDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ReasonNotTestedDescriptorAggregate.EdFi.ReasonNotTestedDescriptorQ" lazy="false" discriminator-value="edfi.ReasonNotTestedDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ReasonNotTestedDescriptor" >
           <key>
             <column name="ReasonNotTestedDescriptorId" />
           </key>
@@ -7802,8 +8118,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAssessmentAggregate.EdFi.StudentAssessmentQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.RecognitionTypeDescriptorAggregate.EdFi.RecognitionTypeDescriptorQ" table="RecognitionTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.RecognitionTypeDescriptorAggregate.EdFi.RecognitionTypeDescriptorQ" lazy="false" discriminator-value="edfi.RecognitionTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="RecognitionTypeDescriptor" >
           <key>
             <column name="RecognitionTypeDescriptorId" />
           </key>
@@ -7830,8 +8148,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAcademicRecordAggregate.EdFi.StudentAcademicRecordRecognitionQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.RelationDescriptorAggregate.EdFi.RelationDescriptorQ" table="RelationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.RelationDescriptorAggregate.EdFi.RelationDescriptorQ" lazy="false" discriminator-value="edfi.RelationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="RelationDescriptor" >
           <key>
             <column name="RelationDescriptorId" />
           </key>
@@ -7851,8 +8171,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentContactAssociationAggregate.EdFi.StudentContactAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.RepeatIdentifierDescriptorAggregate.EdFi.RepeatIdentifierDescriptorQ" table="RepeatIdentifierDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.RepeatIdentifierDescriptorAggregate.EdFi.RepeatIdentifierDescriptorQ" lazy="false" discriminator-value="edfi.RepeatIdentifierDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="RepeatIdentifierDescriptor" >
           <key>
             <column name="RepeatIdentifierDescriptorId" />
           </key>
@@ -7872,8 +8194,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSectionAssociationAggregate.EdFi.StudentSectionAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ReporterDescriptionDescriptorAggregate.EdFi.ReporterDescriptionDescriptorQ" table="ReporterDescriptionDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ReporterDescriptionDescriptorAggregate.EdFi.ReporterDescriptionDescriptorQ" lazy="false" discriminator-value="edfi.ReporterDescriptionDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ReporterDescriptionDescriptor" >
           <key>
             <column name="ReporterDescriptionDescriptorId" />
           </key>
@@ -7893,8 +8217,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.DisciplineIncidentAggregate.EdFi.DisciplineIncidentQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ReportingTagDescriptorAggregate.EdFi.ReportingTagDescriptorQ" table="ReportingTagDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ReportingTagDescriptorAggregate.EdFi.ReportingTagDescriptorQ" lazy="false" discriminator-value="edfi.ReportingTagDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ReportingTagDescriptor" >
           <key>
             <column name="ReportingTagDescriptorId" />
           </key>
@@ -7977,8 +8303,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.SourceDimensionAggregate.EdFi.SourceDimensionReportingTagQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ResidencyStatusDescriptorAggregate.EdFi.ResidencyStatusDescriptorQ" table="ResidencyStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ResidencyStatusDescriptorAggregate.EdFi.ResidencyStatusDescriptorQ" lazy="false" discriminator-value="edfi.ResidencyStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ResidencyStatusDescriptor" >
           <key>
             <column name="ResidencyStatusDescriptorId" />
           </key>
@@ -7998,8 +8326,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSchoolAssociationAggregate.EdFi.StudentSchoolAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ResponseIndicatorDescriptorAggregate.EdFi.ResponseIndicatorDescriptorQ" table="ResponseIndicatorDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ResponseIndicatorDescriptorAggregate.EdFi.ResponseIndicatorDescriptorQ" lazy="false" discriminator-value="edfi.ResponseIndicatorDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ResponseIndicatorDescriptor" >
           <key>
             <column name="ResponseIndicatorDescriptorId" />
           </key>
@@ -8019,8 +8349,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAssessmentAggregate.EdFi.StudentAssessmentItemQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ResponsibilityDescriptorAggregate.EdFi.ResponsibilityDescriptorQ" table="ResponsibilityDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ResponsibilityDescriptorAggregate.EdFi.ResponsibilityDescriptorQ" lazy="false" discriminator-value="edfi.ResponsibilityDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ResponsibilityDescriptor" >
           <key>
             <column name="ResponsibilityDescriptorId" />
           </key>
@@ -8040,8 +8372,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationResponsibilityAssociationAggregate.EdFi.StudentEducationOrganizationResponsibilityAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.RestraintEventReasonDescriptorAggregate.EdFi.RestraintEventReasonDescriptorQ" table="RestraintEventReasonDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.RestraintEventReasonDescriptorAggregate.EdFi.RestraintEventReasonDescriptorQ" lazy="false" discriminator-value="edfi.RestraintEventReasonDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="RestraintEventReasonDescriptor" >
           <key>
             <column name="RestraintEventReasonDescriptorId" />
           </key>
@@ -8061,8 +8395,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.RestraintEventAggregate.EdFi.RestraintEventReasonQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ResultDatatypeTypeDescriptorAggregate.EdFi.ResultDatatypeTypeDescriptorQ" table="ResultDatatypeTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ResultDatatypeTypeDescriptorAggregate.EdFi.ResultDatatypeTypeDescriptorQ" lazy="false" discriminator-value="edfi.ResultDatatypeTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ResultDatatypeTypeDescriptor" >
           <key>
             <column name="ResultDatatypeTypeDescriptorId" />
           </key>
@@ -8131,8 +8467,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAssessmentAggregate.EdFi.StudentAssessmentStudentObjectiveAssessmentScoreResultQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.RetestIndicatorDescriptorAggregate.EdFi.RetestIndicatorDescriptorQ" table="RetestIndicatorDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.RetestIndicatorDescriptorAggregate.EdFi.RetestIndicatorDescriptorQ" lazy="false" discriminator-value="edfi.RetestIndicatorDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="RetestIndicatorDescriptor" >
           <key>
             <column name="RetestIndicatorDescriptorId" />
           </key>
@@ -8152,8 +8490,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAssessmentAggregate.EdFi.StudentAssessmentQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SchoolCategoryDescriptorAggregate.EdFi.SchoolCategoryDescriptorQ" table="SchoolCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SchoolCategoryDescriptorAggregate.EdFi.SchoolCategoryDescriptorQ" lazy="false" discriminator-value="edfi.SchoolCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SchoolCategoryDescriptor" >
           <key>
             <column name="SchoolCategoryDescriptorId" />
           </key>
@@ -8173,8 +8513,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.SchoolAggregate.EdFi.SchoolCategoryQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SchoolChoiceBasisDescriptorAggregate.EdFi.SchoolChoiceBasisDescriptorQ" table="SchoolChoiceBasisDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SchoolChoiceBasisDescriptorAggregate.EdFi.SchoolChoiceBasisDescriptorQ" lazy="false" discriminator-value="edfi.SchoolChoiceBasisDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SchoolChoiceBasisDescriptor" >
           <key>
             <column name="SchoolChoiceBasisDescriptorId" />
           </key>
@@ -8194,8 +8536,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSchoolAssociationAggregate.EdFi.StudentSchoolAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SchoolChoiceImplementStatusDescriptorAggregate.EdFi.SchoolChoiceImplementStatusDescriptorQ" table="SchoolChoiceImplementStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SchoolChoiceImplementStatusDescriptorAggregate.EdFi.SchoolChoiceImplementStatusDescriptorQ" lazy="false" discriminator-value="edfi.SchoolChoiceImplementStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SchoolChoiceImplementStatusDescriptor" >
           <key>
             <column name="SchoolChoiceImplementStatusDescriptorId" />
           </key>
@@ -8215,8 +8559,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.LocalEducationAgencyAggregate.EdFi.LocalEducationAgencyAccountabilityQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SchoolFoodServiceProgramServiceDescriptorAggregate.EdFi.SchoolFoodServiceProgramServiceDescriptorQ" table="SchoolFoodServiceProgramServiceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SchoolFoodServiceProgramServiceDescriptorAggregate.EdFi.SchoolFoodServiceProgramServiceDescriptorQ" lazy="false" discriminator-value="edfi.SchoolFoodServiceProgramServiceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SchoolFoodServiceProgramServiceDescriptor" >
           <key>
             <column name="SchoolFoodServiceProgramServiceDescriptorId" />
           </key>
@@ -8236,8 +8582,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSchoolFoodServiceProgramAssociationAggregate.EdFi.StudentSchoolFoodServiceProgramAssociationSchoolFoodServiceProgramServiceQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SchoolTypeDescriptorAggregate.EdFi.SchoolTypeDescriptorQ" table="SchoolTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SchoolTypeDescriptorAggregate.EdFi.SchoolTypeDescriptorQ" lazy="false" discriminator-value="edfi.SchoolTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SchoolTypeDescriptor" >
           <key>
             <column name="SchoolTypeDescriptorId" />
           </key>
@@ -8257,8 +8605,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.SchoolAggregate.EdFi.SchoolQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SectionCharacteristicDescriptorAggregate.EdFi.SectionCharacteristicDescriptorQ" table="SectionCharacteristicDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SectionCharacteristicDescriptorAggregate.EdFi.SectionCharacteristicDescriptorQ" lazy="false" discriminator-value="edfi.SectionCharacteristicDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SectionCharacteristicDescriptor" >
           <key>
             <column name="SectionCharacteristicDescriptorId" />
           </key>
@@ -8278,8 +8628,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.SectionAggregate.EdFi.SectionCharacteristicQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SectionTypeDescriptorAggregate.EdFi.SectionTypeDescriptorQ" table="SectionTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SectionTypeDescriptorAggregate.EdFi.SectionTypeDescriptorQ" lazy="false" discriminator-value="edfi.SectionTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SectionTypeDescriptor" >
           <key>
             <column name="SectionTypeDescriptorId" />
           </key>
@@ -8299,8 +8651,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.SectionAggregate.EdFi.SectionQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SeparationDescriptorAggregate.EdFi.SeparationDescriptorQ" table="SeparationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SeparationDescriptorAggregate.EdFi.SeparationDescriptorQ" lazy="false" discriminator-value="edfi.SeparationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SeparationDescriptor" >
           <key>
             <column name="SeparationDescriptorId" />
           </key>
@@ -8320,8 +8674,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StaffEducationOrganizationEmploymentAssociationAggregate.EdFi.StaffEducationOrganizationEmploymentAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SeparationReasonDescriptorAggregate.EdFi.SeparationReasonDescriptorQ" table="SeparationReasonDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SeparationReasonDescriptorAggregate.EdFi.SeparationReasonDescriptorQ" lazy="false" discriminator-value="edfi.SeparationReasonDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SeparationReasonDescriptor" >
           <key>
             <column name="SeparationReasonDescriptorId" />
           </key>
@@ -8341,8 +8697,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StaffEducationOrganizationEmploymentAssociationAggregate.EdFi.StaffEducationOrganizationEmploymentAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ServiceDescriptorAggregate.EdFi.ServiceDescriptorQ" table="ServiceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.ServiceDescriptorAggregate.EdFi.ServiceDescriptorQ" lazy="false" discriminator-value="edfi.ServiceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="ServiceDescriptor" >
           <key>
             <column name="ServiceDescriptorId" />
           </key>
@@ -8362,8 +8720,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentProgramAssociationAggregate.EdFi.StudentProgramAssociationServiceQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SexDescriptorAggregate.EdFi.SexDescriptorQ" table="SexDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SexDescriptorAggregate.EdFi.SexDescriptorQ" lazy="false" discriminator-value="edfi.SexDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SexDescriptor" >
           <key>
             <column name="SexDescriptorId" />
           </key>
@@ -8432,8 +8792,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SourceSystemDescriptorAggregate.EdFi.SourceSystemDescriptorQ" table="SourceSystemDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SourceSystemDescriptorAggregate.EdFi.SourceSystemDescriptorQ" lazy="false" discriminator-value="edfi.SourceSystemDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SourceSystemDescriptor" >
           <key>
             <column name="SourceSystemDescriptorId" />
           </key>
@@ -8453,8 +8815,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.PersonAggregate.EdFi.PersonQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SpecialEducationExitReasonDescriptorAggregate.EdFi.SpecialEducationExitReasonDescriptorQ" table="SpecialEducationExitReasonDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SpecialEducationExitReasonDescriptorAggregate.EdFi.SpecialEducationExitReasonDescriptorQ" lazy="false" discriminator-value="edfi.SpecialEducationExitReasonDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SpecialEducationExitReasonDescriptor" >
           <key>
             <column name="SpecialEducationExitReasonDescriptorId" />
           </key>
@@ -8474,8 +8838,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSpecialEducationProgramAssociationAggregate.EdFi.StudentSpecialEducationProgramAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SpecialEducationProgramServiceDescriptorAggregate.EdFi.SpecialEducationProgramServiceDescriptorQ" table="SpecialEducationProgramServiceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SpecialEducationProgramServiceDescriptorAggregate.EdFi.SpecialEducationProgramServiceDescriptorQ" lazy="false" discriminator-value="edfi.SpecialEducationProgramServiceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SpecialEducationProgramServiceDescriptor" >
           <key>
             <column name="SpecialEducationProgramServiceDescriptorId" />
           </key>
@@ -8495,8 +8861,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSpecialEducationProgramAssociationAggregate.EdFi.StudentSpecialEducationProgramAssociationSpecialEducationProgramServiceQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SpecialEducationSettingDescriptorAggregate.EdFi.SpecialEducationSettingDescriptorQ" table="SpecialEducationSettingDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SpecialEducationSettingDescriptorAggregate.EdFi.SpecialEducationSettingDescriptorQ" lazy="false" discriminator-value="edfi.SpecialEducationSettingDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SpecialEducationSettingDescriptor" >
           <key>
             <column name="SpecialEducationSettingDescriptorId" />
           </key>
@@ -8516,8 +8884,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSpecialEducationProgramAssociationAggregate.EdFi.StudentSpecialEducationProgramAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffClassificationDescriptorAggregate.EdFi.StaffClassificationDescriptorQ" table="StaffClassificationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffClassificationDescriptorAggregate.EdFi.StaffClassificationDescriptorQ" lazy="false" discriminator-value="edfi.StaffClassificationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="StaffClassificationDescriptor" >
           <key>
             <column name="StaffClassificationDescriptorId" />
           </key>
@@ -8544,8 +8914,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StaffEducationOrganizationAssignmentAssociationAggregate.EdFi.StaffEducationOrganizationAssignmentAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffIdentificationSystemDescriptorAggregate.EdFi.StaffIdentificationSystemDescriptorQ" table="StaffIdentificationSystemDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffIdentificationSystemDescriptorAggregate.EdFi.StaffIdentificationSystemDescriptorQ" lazy="false" discriminator-value="edfi.StaffIdentificationSystemDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="StaffIdentificationSystemDescriptor" >
           <key>
             <column name="StaffIdentificationSystemDescriptorId" />
           </key>
@@ -8565,8 +8937,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StaffAggregate.EdFi.StaffIdentificationCodeQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffLeaveEventCategoryDescriptorAggregate.EdFi.StaffLeaveEventCategoryDescriptorQ" table="StaffLeaveEventCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffLeaveEventCategoryDescriptorAggregate.EdFi.StaffLeaveEventCategoryDescriptorQ" lazy="false" discriminator-value="edfi.StaffLeaveEventCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="StaffLeaveEventCategoryDescriptor" >
           <key>
             <column name="StaffLeaveEventCategoryDescriptorId" />
           </key>
@@ -8586,8 +8960,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StaffLeaveAggregate.EdFi.StaffLeaveQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.StateAbbreviationDescriptorAggregate.EdFi.StateAbbreviationDescriptorQ" table="StateAbbreviationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.StateAbbreviationDescriptorAggregate.EdFi.StateAbbreviationDescriptorQ" lazy="false" discriminator-value="edfi.StateAbbreviationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="StateAbbreviationDescriptor" >
           <key>
             <column name="StateAbbreviationDescriptorId" />
           </key>
@@ -8656,8 +9032,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationAddressQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentCharacteristicDescriptorAggregate.EdFi.StudentCharacteristicDescriptorQ" table="StudentCharacteristicDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentCharacteristicDescriptorAggregate.EdFi.StudentCharacteristicDescriptorQ" lazy="false" discriminator-value="edfi.StudentCharacteristicDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="StudentCharacteristicDescriptor" >
           <key>
             <column name="StudentCharacteristicDescriptorId" />
           </key>
@@ -8677,8 +9055,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationStudentCharacteristicQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentIdentificationSystemDescriptorAggregate.EdFi.StudentIdentificationSystemDescriptorQ" table="StudentIdentificationSystemDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentIdentificationSystemDescriptorAggregate.EdFi.StudentIdentificationSystemDescriptorQ" lazy="false" discriminator-value="edfi.StudentIdentificationSystemDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="StudentIdentificationSystemDescriptor" >
           <key>
             <column name="StudentIdentificationSystemDescriptorId" />
           </key>
@@ -8698,8 +9078,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationStudentIdentificationCodeQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentParticipationCodeDescriptorAggregate.EdFi.StudentParticipationCodeDescriptorQ" table="StudentParticipationCodeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentParticipationCodeDescriptorAggregate.EdFi.StudentParticipationCodeDescriptorQ" lazy="false" discriminator-value="edfi.StudentParticipationCodeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="StudentParticipationCodeDescriptor" >
           <key>
             <column name="StudentParticipationCodeDescriptorId" />
           </key>
@@ -8712,8 +9094,10 @@
           <!-- Aggregate references -->
 
           <!-- Collections -->
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SubmissionStatusDescriptorAggregate.EdFi.SubmissionStatusDescriptorQ" table="SubmissionStatusDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SubmissionStatusDescriptorAggregate.EdFi.SubmissionStatusDescriptorQ" lazy="false" discriminator-value="edfi.SubmissionStatusDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SubmissionStatusDescriptor" >
           <key>
             <column name="SubmissionStatusDescriptorId" />
           </key>
@@ -8733,8 +9117,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentGradebookEntryAggregate.EdFi.StudentGradebookEntryQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SupporterMilitaryConnectionDescriptorAggregate.EdFi.SupporterMilitaryConnectionDescriptorQ" table="SupporterMilitaryConnectionDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SupporterMilitaryConnectionDescriptorAggregate.EdFi.SupporterMilitaryConnectionDescriptorQ" lazy="false" discriminator-value="edfi.SupporterMilitaryConnectionDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SupporterMilitaryConnectionDescriptor" >
           <key>
             <column name="SupporterMilitaryConnectionDescriptorId" />
           </key>
@@ -8754,8 +9140,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyCategoryDescriptorAggregate.EdFi.SurveyCategoryDescriptorQ" table="SurveyCategoryDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyCategoryDescriptorAggregate.EdFi.SurveyCategoryDescriptorQ" lazy="false" discriminator-value="edfi.SurveyCategoryDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SurveyCategoryDescriptor" >
           <key>
             <column name="SurveyCategoryDescriptorId" />
           </key>
@@ -8775,8 +9163,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyAggregate.EdFi.SurveyQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyLevelDescriptorAggregate.EdFi.SurveyLevelDescriptorQ" table="SurveyLevelDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyLevelDescriptorAggregate.EdFi.SurveyLevelDescriptorQ" lazy="false" discriminator-value="edfi.SurveyLevelDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="SurveyLevelDescriptor" >
           <key>
             <column name="SurveyLevelDescriptorId" />
           </key>
@@ -8796,8 +9186,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyResponseAggregate.EdFi.SurveyResponseSurveyLevelQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.TeachingCredentialBasisDescriptorAggregate.EdFi.TeachingCredentialBasisDescriptorQ" table="TeachingCredentialBasisDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.TeachingCredentialBasisDescriptorAggregate.EdFi.TeachingCredentialBasisDescriptorQ" lazy="false" discriminator-value="edfi.TeachingCredentialBasisDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="TeachingCredentialBasisDescriptor" >
           <key>
             <column name="TeachingCredentialBasisDescriptorId" />
           </key>
@@ -8817,8 +9209,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.CredentialAggregate.EdFi.CredentialQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.TeachingCredentialDescriptorAggregate.EdFi.TeachingCredentialDescriptorQ" table="TeachingCredentialDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.TeachingCredentialDescriptorAggregate.EdFi.TeachingCredentialDescriptorQ" lazy="false" discriminator-value="edfi.TeachingCredentialDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="TeachingCredentialDescriptor" >
           <key>
             <column name="TeachingCredentialDescriptorId" />
           </key>
@@ -8838,8 +9232,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.CredentialAggregate.EdFi.CredentialQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.TechnicalSkillsAssessmentDescriptorAggregate.EdFi.TechnicalSkillsAssessmentDescriptorQ" table="TechnicalSkillsAssessmentDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.TechnicalSkillsAssessmentDescriptorAggregate.EdFi.TechnicalSkillsAssessmentDescriptorQ" lazy="false" discriminator-value="edfi.TechnicalSkillsAssessmentDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="TechnicalSkillsAssessmentDescriptor" >
           <key>
             <column name="TechnicalSkillsAssessmentDescriptorId" />
           </key>
@@ -8859,8 +9255,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentCTEProgramAssociationAggregate.EdFi.StudentCTEProgramAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.TelephoneNumberTypeDescriptorAggregate.EdFi.TelephoneNumberTypeDescriptorQ" table="TelephoneNumberTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.TelephoneNumberTypeDescriptorAggregate.EdFi.TelephoneNumberTypeDescriptorQ" lazy="false" discriminator-value="edfi.TelephoneNumberTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="TelephoneNumberTypeDescriptor" >
           <key>
             <column name="TelephoneNumberTypeDescriptorId" />
           </key>
@@ -8901,8 +9299,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationTelephoneQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.TermDescriptorAggregate.EdFi.TermDescriptorQ" table="TermDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.TermDescriptorAggregate.EdFi.TermDescriptorQ" lazy="false" discriminator-value="edfi.TermDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="TermDescriptor" >
           <key>
             <column name="TermDescriptorId" />
           </key>
@@ -8936,8 +9336,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationCohortYearQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.TitleIPartAParticipantDescriptorAggregate.EdFi.TitleIPartAParticipantDescriptorQ" table="TitleIPartAParticipantDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.TitleIPartAParticipantDescriptorAggregate.EdFi.TitleIPartAParticipantDescriptorQ" lazy="false" discriminator-value="edfi.TitleIPartAParticipantDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="TitleIPartAParticipantDescriptor" >
           <key>
             <column name="TitleIPartAParticipantDescriptorId" />
           </key>
@@ -8957,8 +9359,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentTitleIPartAProgramAssociationAggregate.EdFi.StudentTitleIPartAProgramAssociationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.TitleIPartAProgramServiceDescriptorAggregate.EdFi.TitleIPartAProgramServiceDescriptorQ" table="TitleIPartAProgramServiceDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.TitleIPartAProgramServiceDescriptorAggregate.EdFi.TitleIPartAProgramServiceDescriptorQ" lazy="false" discriminator-value="edfi.TitleIPartAProgramServiceDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="TitleIPartAProgramServiceDescriptor" >
           <key>
             <column name="TitleIPartAProgramServiceDescriptorId" />
           </key>
@@ -8978,8 +9382,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentTitleIPartAProgramAssociationAggregate.EdFi.StudentTitleIPartAProgramAssociationTitleIPartAProgramServiceQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.TitleIPartASchoolDesignationDescriptorAggregate.EdFi.TitleIPartASchoolDesignationDescriptorQ" table="TitleIPartASchoolDesignationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.TitleIPartASchoolDesignationDescriptorAggregate.EdFi.TitleIPartASchoolDesignationDescriptorQ" lazy="false" discriminator-value="edfi.TitleIPartASchoolDesignationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="TitleIPartASchoolDesignationDescriptor" >
           <key>
             <column name="TitleIPartASchoolDesignationDescriptorId" />
           </key>
@@ -8999,8 +9405,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.SchoolAggregate.EdFi.SchoolQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.TransportationPublicExpenseEligibilityTypeDescriptorAggregate.EdFi.TransportationPublicExpenseEligibilityTypeDescriptorQ" table="TransportationPublicExpenseEligibilityTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.TransportationPublicExpenseEligibilityTypeDescriptorAggregate.EdFi.TransportationPublicExpenseEligibilityTypeDescriptorQ" lazy="false" discriminator-value="edfi.TransportationPublicExpenseEligibilityTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="TransportationPublicExpenseEligibilityTypeDescriptor" >
           <key>
             <column name="TransportationPublicExpenseEligibilityTypeDescriptorId" />
           </key>
@@ -9020,8 +9428,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentTransportationAggregate.EdFi.StudentTransportationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.TransportationTypeDescriptorAggregate.EdFi.TransportationTypeDescriptorQ" table="TransportationTypeDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.TransportationTypeDescriptorAggregate.EdFi.TransportationTypeDescriptorQ" lazy="false" discriminator-value="edfi.TransportationTypeDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="TransportationTypeDescriptor" >
           <key>
             <column name="TransportationTypeDescriptorId" />
           </key>
@@ -9041,8 +9451,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentTransportationAggregate.EdFi.StudentTransportationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.TravelDayofWeekDescriptorAggregate.EdFi.TravelDayofWeekDescriptorQ" table="TravelDayofWeekDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.TravelDayofWeekDescriptorAggregate.EdFi.TravelDayofWeekDescriptorQ" lazy="false" discriminator-value="edfi.TravelDayofWeekDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="TravelDayofWeekDescriptor" >
           <key>
             <column name="TravelDayofWeekDescriptorId" />
           </key>
@@ -9062,8 +9474,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentTransportationAggregate.EdFi.StudentTransportationStudentBusDetailsTravelDayofWeekQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.TravelDirectionDescriptorAggregate.EdFi.TravelDirectionDescriptorQ" table="TravelDirectionDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.TravelDirectionDescriptorAggregate.EdFi.TravelDirectionDescriptorQ" lazy="false" discriminator-value="edfi.TravelDirectionDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="TravelDirectionDescriptor" >
           <key>
             <column name="TravelDirectionDescriptorId" />
           </key>
@@ -9083,8 +9497,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentTransportationAggregate.EdFi.StudentTransportationStudentBusDetailsTravelDirectionQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.TribalAffiliationDescriptorAggregate.EdFi.TribalAffiliationDescriptorQ" table="TribalAffiliationDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.TribalAffiliationDescriptorAggregate.EdFi.TribalAffiliationDescriptorQ" lazy="false" discriminator-value="edfi.TribalAffiliationDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="TribalAffiliationDescriptor" >
           <key>
             <column name="TribalAffiliationDescriptorId" />
           </key>
@@ -9111,8 +9527,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationTribalAffiliationQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.VisaDescriptorAggregate.EdFi.VisaDescriptorQ" table="VisaDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.VisaDescriptorAggregate.EdFi.VisaDescriptorQ" lazy="false" discriminator-value="edfi.VisaDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="VisaDescriptor" >
           <key>
             <column name="VisaDescriptorId" />
           </key>
@@ -9139,8 +9557,10 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAggregate.EdFi.StudentVisaQ" />
           </set>
 
-      </joined-subclass>
-    <joined-subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.WeaponDescriptorAggregate.EdFi.WeaponDescriptorQ" table="WeaponDescriptor" lazy="false">
+      </join>
+    </subclass>
+    <subclass name="EdFi.Ods.Entities.NHibernate.QueryModels.WeaponDescriptorAggregate.EdFi.WeaponDescriptorQ" lazy="false" discriminator-value="edfi.WeaponDescriptor" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
+      <join table="WeaponDescriptor" >
           <key>
             <column name="WeaponDescriptorId" />
           </key>
@@ -9160,7 +9580,8 @@
             <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.DisciplineIncidentAggregate.EdFi.DisciplineIncidentWeaponQ" />
           </set>
 
-      </joined-subclass>
+      </join>
+    </subclass>
 </class>
 
 
diff --git a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/5.1.0/DataStandard_510_ApprovalTests.Verify.Standard_Std_5.1.0_Models_Entities_EntitiesForQueries.generated.approved.cs b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/5.1.0/DataStandard_510_ApprovalTests.Verify.Standard_Std_5.1.0_Models_Entities_EntitiesForQueries.generated.approved.cs
index 229d54cf32..f892659182 100644
--- a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/5.1.0/DataStandard_510_ApprovalTests.Verify.Standard_Std_5.1.0_Models_Entities_EntitiesForQueries.generated.approved.cs
+++ b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/5.1.0/DataStandard_510_ApprovalTests.Verify.Standard_Std_5.1.0_Models_Entities_EntitiesForQueries.generated.approved.cs
@@ -6226,6 +6226,12 @@ public abstract class DescriptorQ : AggregateRootWithCompositeKey
         public virtual int DescriptorId { get; set; }
         // -------------------------------------------------------------
 
+        // =============================================================
+        //                          Discriminator
+        // -------------------------------------------------------------
+
+        public virtual string Discriminator { get; set; }
+
         // =============================================================
         //                          Properties
         // -------------------------------------------------------------
diff --git a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/5.1.0/DataStandard_510_ApprovalTests.Verify.Standard_Std_5.1.0_Resources_Resources.generated.approved.cs b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/5.1.0/DataStandard_510_ApprovalTests.Verify.Standard_Std_5.1.0_Resources_Resources.generated.approved.cs
index 48a2f165aa..20bc574c72 100644
--- a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/5.1.0/DataStandard_510_ApprovalTests.Verify.Standard_Std_5.1.0_Resources_Resources.generated.approved.cs
+++ b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/5.1.0/DataStandard_510_ApprovalTests.Verify.Standard_Std_5.1.0_Resources_Resources.generated.approved.cs
@@ -47645,6 +47645,12 @@ public class DescriptorReference : IResourceReference
         /// </summary>
         public Guid ResourceId { get; set; }
 
+        /// <summary>
+        /// Gets or sets the discriminator value which identifies the concrete sub-type of the referenced resource
+        /// when the referenced resource has been derived; otherwise <b>null</b>.
+        /// </summary>
+        public string Discriminator { get; set; }
+
 
         private Link _link;
 
@@ -47690,7 +47696,26 @@ private Link CreateLink()
                 Href = $"/ed-fi/descriptors/{ResourceId:n}"
             };
 
-            return link;
+            if (string.IsNullOrEmpty(Discriminator))
+                return link;
+
+            string[] linkParts = Discriminator.Split('.');
+
+            if (linkParts.Length < 2)
+                return link;
+
+            var resource = GeneratedArtifactStaticDependencies.ResourceModelProvider.GetResourceModel()
+                .GetResourceByFullName(new FullName(linkParts[0], linkParts[1]));
+
+            // return the default link if the relationship is already correct, and/or if the resource is not found.
+            if (resource == null || link.Rel == resource.Name)
+                return link;
+
+            return new Link
+            {
+                Rel = resource.Name,
+                Href = $"/{resource.SchemaUriSegment()}/{resource.PluralName.ToCamelCase()}/{ResourceId:n}"
+            };
         }
     } // Aggregate reference
 
diff --git a/Utilities/CodeGeneration/EdFi.Ods.CodeGen/Generators/EntityOrmMappings.cs b/Utilities/CodeGeneration/EdFi.Ods.CodeGen/Generators/EntityOrmMappings.cs
index 4993cde999..43748aad83 100644
--- a/Utilities/CodeGeneration/EdFi.Ods.CodeGen/Generators/EntityOrmMappings.cs
+++ b/Utilities/CodeGeneration/EdFi.Ods.CodeGen/Generators/EntityOrmMappings.cs
@@ -358,7 +358,6 @@ OrmDerivedEntity CreateOrmDerivedEntity(EntityAndContext entityAndContexts, Clas
                         return
                             new OrmDerivedEntity
                             {
-                                IsJoinedSubclass = e.IsDescriptorEntity,
                                 ClassName = className,
                                 ReferenceClassName = className + "ReferenceData",
                                 TableName = e.Name,
diff --git a/Utilities/CodeGeneration/EdFi.Ods.CodeGen/Models/Templates/OrmMapping.cs b/Utilities/CodeGeneration/EdFi.Ods.CodeGen/Models/Templates/OrmMapping.cs
index 9738593b37..61f755d29f 100644
--- a/Utilities/CodeGeneration/EdFi.Ods.CodeGen/Models/Templates/OrmMapping.cs
+++ b/Utilities/CodeGeneration/EdFi.Ods.CodeGen/Models/Templates/OrmMapping.cs
@@ -170,8 +170,6 @@ public class OrmCollection
 
     public class OrmDerivedEntity
     {
-        public bool IsJoinedSubclass { get; set; }
-
         public string ClassName { get; set; }
 
         public string ReferenceClassName { get; set; }
diff --git a/Utilities/CodeGeneration/EdFi.Ods.CodeGen/Mustache/EntityOrmMappings.mustache b/Utilities/CodeGeneration/EdFi.Ods.CodeGen/Mustache/EntityOrmMappings.mustache
index eb9bbb891a..104e1d43ca 100644
--- a/Utilities/CodeGeneration/EdFi.Ods.CodeGen/Mustache/EntityOrmMappings.mustache
+++ b/Utilities/CodeGeneration/EdFi.Ods.CodeGen/Mustache/EntityOrmMappings.mustache
@@ -143,13 +143,8 @@
       {{#HasDerivedEntities}}
     <!-- Derived classes -->
       {{#DerivedEntities}}
-      {{#IsJoinedSubclass}}
-    <joined-subclass name="{{ClassName}}" table="{{TableName}}" lazy="false"{{#SchemaName}} schema="{{SchemaName}}"{{/SchemaName}}>
-      {{/IsJoinedSubclass}}
-      {{^IsJoinedSubclass}}
     <subclass name="{{ClassName}}" lazy="false" discriminator-value="{{DiscriminatorValue}}" persister="EdFi.Ods.Common.Infrastructure.Persisters.DiscriminatedSubclassWithDynamicComponentEntityPersister, EdFi.Ods.Common">
       <join table="{{TableName}}" {{#SchemaName}} schema="{{SchemaName}}"{{/SchemaName}}>
-      {{/IsJoinedSubclass}}
           <key>
                     {{#KeyColumns}}
             <column name="{{Name}}" />
@@ -199,13 +194,8 @@
           </set>
 
                 {{/Collections}}
-     {{^IsJoinedSubclass}}
       </join>
     </subclass>
-     {{/IsJoinedSubclass}}
-     {{#IsJoinedSubclass}}
-      </joined-subclass>
-     {{/IsJoinedSubclass}}
      {{/DerivedEntities}}
      {{/HasDerivedEntities}}
 </class>