diff --git a/.editorconfig b/.editorconfig
index b5714601..8a4a4390 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -42,3 +42,11 @@ end_of_line = crlf
 [*.sh]
 end_of_line = lf
 
+[*.{cs,vb}]
+dotnet_sort_system_directives_first = true
+dotnet_separate_import_directive_groups = true
+dotnet_style_namespace_match_folder = true
+
+[*.cs]
+csharp_using_directive_placement = outside_namespace
+csharp_style_namespace_declarations = file_scoped:warning
\ No newline at end of file
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
index 2923cfc7..5fc52acd 100644
--- a/.github/workflows/dotnet.yml
+++ b/.github/workflows/dotnet.yml
@@ -103,7 +103,7 @@ jobs:
 
       - name: Deploy SQL Server Database to Azure Staging
         if: github.ref == 'refs/heads/develop'
-        uses: azure/sql-action@v2
+        uses: azure/sql-action@v2.1
         with:
           connection-string: ${{secrets.AZURE_SQL_CONNECTION_STAGING}}
           path: './InstructorIQ.dacpac'
@@ -111,7 +111,7 @@ jobs:
 
       - name: Deploy SQL Server Database to Azure Production
         if: github.ref == 'refs/heads/master'
-        uses: azure/sql-action@v2
+        uses: azure/sql-action@v2.1
         with:
           connection-string: ${{secrets.AZURE_SQL_CONNECTION_PRODUCTION}}
           path: './InstructorIQ.dacpac'
diff --git a/.gitignore b/.gitignore
index 0f78cfd3..cb9144b0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -257,3 +257,4 @@ build/
 client/dist/
 temp/
 coverage.opencover.xml
+*.clef
diff --git a/service/Directory.Build.props b/service/Directory.Build.props
new file mode 100644
index 00000000..8f295ad2
--- /dev/null
+++ b/service/Directory.Build.props
@@ -0,0 +1,27 @@
+<Project>
+  <PropertyGroup Label="Package">
+    <Product>InstructorIQ</Product>
+    <Description>Training calendar manangement</Description>
+    <Copyright>Copyright © $([System.DateTime]::Now.ToString(yyyy)) LoreSoft</Copyright>
+    <Authors>LoreSoft</Authors>
+    <NeutralLanguage>en-US</NeutralLanguage>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <PackageProjectUrl>https://github.com/loresoft/InstructorIQ</PackageProjectUrl>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <PackageIcon>logo.png</PackageIcon>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
+    <RepositoryType>git</RepositoryType>
+    <RepositoryUrl>https://github.com/loresoft/InstructorIQ</RepositoryUrl>
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <NoWarn>1591</NoWarn>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
+    <PackageReference Include="Injectio" Version="2.5.87" PrivateAssets="all" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Using Include="Injectio.Attributes" />
+  </ItemGroup>
+</Project>
diff --git a/service/InstructorIQ.sln b/service/InstructorIQ.sln
index fc4e1857..cc36663f 100644
--- a/service/InstructorIQ.sln
+++ b/service/InstructorIQ.sln
@@ -13,6 +13,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "InstructorIQ.WebApplication
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{64DEECE6-F644-428A-9094-3729E6A74698}"
 	ProjectSection(SolutionItems) = preProject
+		Directory.Build.props = Directory.Build.props
 		..\.github\workflows\dotnet.yml = ..\.github\workflows\dotnet.yml
 	EndProjectSection
 EndProject
diff --git a/service/src/InstructorIQ.Core/Behaviors/AuthenticateEntityIdentifierCommandBehavior.cs b/service/src/InstructorIQ.Core/Behaviors/AuthenticateEntityIdentifierCommandBehavior.cs
index cecc1a95..4370af2c 100644
--- a/service/src/InstructorIQ.Core/Behaviors/AuthenticateEntityIdentifierCommandBehavior.cs
+++ b/service/src/InstructorIQ.Core/Behaviors/AuthenticateEntityIdentifierCommandBehavior.cs
@@ -7,19 +7,18 @@
 
 using Microsoft.Extensions.Logging;
 
-namespace InstructorIQ.Core.Behaviors
+namespace InstructorIQ.Core.Behaviors;
+
+public class AuthenticateEntityIdentifierCommandBehavior<TKey, TReadModel>
+    : PipelineBehaviorBase<EntityIdentifierCommand<TKey, TReadModel>, TReadModel>
 {
-    public class AuthenticateEntityIdentifierCommandBehavior<TKey, TReadModel>
-        : PipelineBehaviorBase<EntityIdentifierCommand<TKey, TReadModel>, TReadModel>
+    public AuthenticateEntityIdentifierCommandBehavior(ILoggerFactory loggerFactory) : base(loggerFactory)
     {
-        public AuthenticateEntityIdentifierCommandBehavior(ILoggerFactory loggerFactory) : base(loggerFactory)
-        {
-        }
+    }
 
-        protected override async Task<TReadModel> Process(EntityIdentifierCommand<TKey, TReadModel> request, RequestHandlerDelegate<TReadModel> next, CancellationToken cancellationToken)
-        {
-            // continue pipeline
-            return await next().ConfigureAwait(false);
-        }
+    protected override async Task<TReadModel> Process(EntityIdentifierCommand<TKey, TReadModel> request, RequestHandlerDelegate<TReadModel> next, CancellationToken cancellationToken)
+    {
+        // continue pipeline
+        return await next().ConfigureAwait(false);
     }
 }
diff --git a/service/src/InstructorIQ.Core/Behaviors/TrackChangeEntityPatchCommandBehavior.cs b/service/src/InstructorIQ.Core/Behaviors/TrackChangeEntityPatchCommandBehavior.cs
index 2391574e..7645bbc1 100644
--- a/service/src/InstructorIQ.Core/Behaviors/TrackChangeEntityPatchCommandBehavior.cs
+++ b/service/src/InstructorIQ.Core/Behaviors/TrackChangeEntityPatchCommandBehavior.cs
@@ -7,20 +7,19 @@
 
 using Microsoft.Extensions.Logging;
 
-namespace InstructorIQ.Core.Behaviors
+namespace InstructorIQ.Core.Behaviors;
+
+public class TrackChangeEntityPatchCommandBehavior<TKey, TReadModel>
+    : PipelineBehaviorBase<EntityPatchCommand<TKey, TReadModel>, TReadModel>
 {
-    public class TrackChangeEntityPatchCommandBehavior<TKey, TReadModel>
-        : PipelineBehaviorBase<EntityPatchCommand<TKey, TReadModel>, TReadModel>
+    public TrackChangeEntityPatchCommandBehavior(ILoggerFactory loggerFactory) : base(loggerFactory)
     {
-        public TrackChangeEntityPatchCommandBehavior(ILoggerFactory loggerFactory) : base(loggerFactory)
-        {
-        }
-
-        protected override async Task<TReadModel> Process(EntityPatchCommand<TKey, TReadModel> request, RequestHandlerDelegate<TReadModel> next, CancellationToken cancellationToken)
-        {
-            // continue pipeline
-            return await next().ConfigureAwait(false);
-        }
+    }
 
+    protected override async Task<TReadModel> Process(EntityPatchCommand<TKey, TReadModel> request, RequestHandlerDelegate<TReadModel> next, CancellationToken cancellationToken)
+    {
+        // continue pipeline
+        return await next().ConfigureAwait(false);
     }
+
 }
diff --git a/service/src/InstructorIQ.Core/Behaviors/TrackChangeEntityUpdateCommandBehavior.cs b/service/src/InstructorIQ.Core/Behaviors/TrackChangeEntityUpdateCommandBehavior.cs
index b112f8a6..a7df8b3c 100644
--- a/service/src/InstructorIQ.Core/Behaviors/TrackChangeEntityUpdateCommandBehavior.cs
+++ b/service/src/InstructorIQ.Core/Behaviors/TrackChangeEntityUpdateCommandBehavior.cs
@@ -7,19 +7,18 @@
 
 using Microsoft.Extensions.Logging;
 
-namespace InstructorIQ.Core.Behaviors
+namespace InstructorIQ.Core.Behaviors;
+
+public class TrackChangeEntityUpdateCommandBehavior<TKey, TUpdateModel, TReadModel>
+    : PipelineBehaviorBase<EntityUpdateCommand<TKey, TUpdateModel, TReadModel>, TReadModel>
 {
-    public class TrackChangeEntityUpdateCommandBehavior<TKey, TUpdateModel, TReadModel>
-        : PipelineBehaviorBase<EntityUpdateCommand<TKey, TUpdateModel, TReadModel>, TReadModel>
+    public TrackChangeEntityUpdateCommandBehavior(ILoggerFactory loggerFactory) : base(loggerFactory)
     {
-        public TrackChangeEntityUpdateCommandBehavior(ILoggerFactory loggerFactory) : base(loggerFactory)
-        {
-        }
+    }
 
-        protected override async Task<TReadModel> Process(EntityUpdateCommand<TKey, TUpdateModel, TReadModel> request, RequestHandlerDelegate<TReadModel> next, CancellationToken cancellationToken)
-        {
-            // continue pipeline
-            return await next().ConfigureAwait(false);
-        }
+    protected override async Task<TReadModel> Process(EntityUpdateCommand<TKey, TUpdateModel, TReadModel> request, RequestHandlerDelegate<TReadModel> next, CancellationToken cancellationToken)
+    {
+        // continue pipeline
+        return await next().ConfigureAwait(false);
     }
 }
diff --git a/service/src/InstructorIQ.Core/Converters/TimeSpanConverter.cs b/service/src/InstructorIQ.Core/Converters/TimeSpanConverter.cs
index 03c066d1..31ab01eb 100644
--- a/service/src/InstructorIQ.Core/Converters/TimeSpanConverter.cs
+++ b/service/src/InstructorIQ.Core/Converters/TimeSpanConverter.cs
@@ -1,21 +1,20 @@
-using System;
+using System;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace InstructorIQ.Core.Converters
+namespace InstructorIQ.Core.Converters;
+
+public class TimeSpanConverter : JsonConverter<TimeSpan>
 {
-    public class TimeSpanConverter : JsonConverter<TimeSpan>
+    public override TimeSpan Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
     {
-        public override TimeSpan Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-        {
-            var stringValue = reader.GetString();
-            return TimeSpan.Parse(stringValue);
-        }
+        var stringValue = reader.GetString();
+        return TimeSpan.Parse(stringValue);
+    }
 
-        public override void Write(Utf8JsonWriter writer, TimeSpan value, JsonSerializerOptions options)
-        {
-            var stringValue = value.ToString();
-            writer.WriteStringValue(stringValue);
-        }
+    public override void Write(Utf8JsonWriter writer, TimeSpan value, JsonSerializerOptions options)
+    {
+        var stringValue = value.ToString();
+        writer.WriteStringValue(stringValue);
     }
 }
diff --git a/service/src/InstructorIQ.Core/Data/Constants/Role.cs b/service/src/InstructorIQ.Core/Data/Constants/Role.cs
index af562f7e..4686a61f 100644
--- a/service/src/InstructorIQ.Core/Data/Constants/Role.cs
+++ b/service/src/InstructorIQ.Core/Data/Constants/Role.cs
@@ -1,23 +1,22 @@
-using System;
+using System;
 
-namespace InstructorIQ.Core.Data.Constants
+namespace InstructorIQ.Core.Data.Constants;
+
+public static class Role
 {
-    public static class Role
-    {
-        ///<summary>Member for organization</summary>
-        public static readonly Guid Member = new Guid("d373fbb2-39eb-e711-87c1-708bcd56aa6d");
-        ///<summary>User that can attend sessions</summary>
-        public static readonly Guid Attendee = new Guid("d9fb92e7-a5e8-4fe3-86ba-16924e44fb86");
-        ///<summary>Instructor for organization</summary>
-        public static readonly Guid Instructor = new Guid("808c0ec0-39eb-e711-87c1-708bcd56aa6d");
-        ///<summary>Administrator for organization</summary>
-        public static readonly Guid Administrator = new Guid("8fa6aec8-39eb-e711-87c1-708bcd56aa6d");
+    ///<summary>Member for organization</summary>
+    public static readonly Guid Member = new Guid("d373fbb2-39eb-e711-87c1-708bcd56aa6d");
+    ///<summary>User that can attend sessions</summary>
+    public static readonly Guid Attendee = new Guid("d9fb92e7-a5e8-4fe3-86ba-16924e44fb86");
+    ///<summary>Instructor for organization</summary>
+    public static readonly Guid Instructor = new Guid("808c0ec0-39eb-e711-87c1-708bcd56aa6d");
+    ///<summary>Administrator for organization</summary>
+    public static readonly Guid Administrator = new Guid("8fa6aec8-39eb-e711-87c1-708bcd56aa6d");
 
-        public const string MemberName = "Member";
-        public const string AttendeeName = "Attendee";
-        public const string InstructorName = "Instructor";
-        public const string AdministratorName = "Administrator";
-        public const string GlobalAdministrator = "GlobalAdministrator";
+    public const string MemberName = "Member";
+    public const string AttendeeName = "Attendee";
+    public const string InstructorName = "Instructor";
+    public const string AdministratorName = "Administrator";
+    public const string GlobalAdministrator = "GlobalAdministrator";
 
-    }
 }
diff --git a/service/src/InstructorIQ.Core/Data/Constants/TemplateType.cs b/service/src/InstructorIQ.Core/Data/Constants/TemplateType.cs
index a927751b..d8cbf8b5 100644
--- a/service/src/InstructorIQ.Core/Data/Constants/TemplateType.cs
+++ b/service/src/InstructorIQ.Core/Data/Constants/TemplateType.cs
@@ -1,11 +1,10 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Text;
 
-namespace InstructorIQ.Core.Data.Constants
+namespace InstructorIQ.Core.Data.Constants;
+
+public static class TemplateType
 {
-    public static class TemplateType
-    {
-        public const string Editor = "Editor";
-    }
+    public const string Editor = "Editor";
 }
diff --git a/service/src/InstructorIQ.Core/Data/Constants/Tenant.cs b/service/src/InstructorIQ.Core/Data/Constants/Tenant.cs
index 5f4ae11d..6edcdf3d 100644
--- a/service/src/InstructorIQ.Core/Data/Constants/Tenant.cs
+++ b/service/src/InstructorIQ.Core/Data/Constants/Tenant.cs
@@ -1,12 +1,11 @@
-using System;
+using System;
 
-namespace InstructorIQ.Core.Data.Constants
+namespace InstructorIQ.Core.Data.Constants;
+
+public static class Tenant
 {
-    public static class Tenant
-    {
-        ///<summary>Test Organization</summary>
-        public static readonly Guid Test = new Guid("2a3080d2-a9ec-e711-87c2-708bcd56aa6d");
-        ///<summary>Demo Organization</summary>
-        public static readonly Guid Demo = new Guid("e8a8db6e-2feb-e711-87c1-708bcd56aa6d");
-    }
-}
\ No newline at end of file
+    ///<summary>Test Organization</summary>
+    public static readonly Guid Test = new Guid("2a3080d2-a9ec-e711-87c2-708bcd56aa6d");
+    ///<summary>Demo Organization</summary>
+    public static readonly Guid Demo = new Guid("e8a8db6e-2feb-e711-87c1-708bcd56aa6d");
+}
diff --git a/service/src/InstructorIQ.Core/Data/Constants/User.cs b/service/src/InstructorIQ.Core/Data/Constants/User.cs
index a2adf4c6..e92f46cb 100644
--- a/service/src/InstructorIQ.Core/Data/Constants/User.cs
+++ b/service/src/InstructorIQ.Core/Data/Constants/User.cs
@@ -1,12 +1,11 @@
-using System;
+using System;
 
-namespace InstructorIQ.Core.Data.Constants
+namespace InstructorIQ.Core.Data.Constants;
+
+public static class User
 {
-    public static class User
-    {
-        ///<summary>Test User</summary>
-        public static readonly System.Guid Test = new Guid("52ae0c20-c4de-e711-87bf-708bcd56aa6d");
-        ///<summary>InstructorIQ Support</summary>
-        public static readonly System.Guid Support = new Guid("2a31eec5-30eb-e711-87c1-708bcd56aa6d");
-    }
-}
\ No newline at end of file
+    ///<summary>Test User</summary>
+    public static readonly System.Guid Test = new Guid("52ae0c20-c4de-e711-87bf-708bcd56aa6d");
+    ///<summary>InstructorIQ Support</summary>
+    public static readonly System.Guid Support = new Guid("2a31eec5-30eb-e711-87c1-708bcd56aa6d");
+}
diff --git a/service/src/InstructorIQ.Core/Data/DataServiceModule.cs b/service/src/InstructorIQ.Core/Data/DataServiceModule.cs
index b2db2a7c..11f87a61 100644
--- a/service/src/InstructorIQ.Core/Data/DataServiceModule.cs
+++ b/service/src/InstructorIQ.Core/Data/DataServiceModule.cs
@@ -8,29 +8,28 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 
-namespace InstructorIQ.Core.Data
+namespace InstructorIQ.Core.Data;
+
+public class DataServiceModule
 {
-    public class DataServiceModule
-    {
 
-        [RegisterServices]
-        public void Register(IServiceCollection services)
+    [RegisterServices]
+    public void Register(IServiceCollection services)
+    {
+        services.AddDbContextPool<InstructorIQContext>((provider, options) =>
         {
-            services.AddDbContextPool<InstructorIQContext>((provider, options) =>
-            {
-                var configuration = provider.GetRequiredService<IConfiguration>();
-                var connectionString = configuration.GetConnectionString("InstructorIQ");
-                options.UseSqlServer(connectionString, providerOptions => providerOptions.EnableRetryOnFailure());
-            });
+            var configuration = provider.GetRequiredService<IConfiguration>();
+            var connectionString = configuration.GetConnectionString("InstructorIQ");
+            options.UseSqlServer(connectionString, providerOptions => providerOptions.EnableRetryOnFailure());
+        });
 
-            services.TryAddSingleton<IDataConfiguration>(provider =>
-            {
-                var configuration = provider.GetRequiredService<IConfiguration>();
-                var connectionString = configuration.GetConnectionString("InstructorIQ");
-                return new DataConfiguration(SqlClientFactory.Instance, connectionString);
-            });
+        services.TryAddSingleton<IDataConfiguration>(provider =>
+        {
+            var configuration = provider.GetRequiredService<IConfiguration>();
+            var connectionString = configuration.GetConnectionString("InstructorIQ");
+            return new DataConfiguration(SqlClientFactory.Instance, connectionString);
+        });
 
-            services.TryAddTransient<IDataSession, DataSession>();
-        }
+        services.TryAddTransient<IDataSession, DataSession>();
     }
 }
diff --git a/service/src/InstructorIQ.Core/Data/Entities/Attendance.cs b/service/src/InstructorIQ.Core/Data/Entities/Attendance.cs
index 0be861df..dc0ae334 100644
--- a/service/src/InstructorIQ.Core/Data/Entities/Attendance.cs
+++ b/service/src/InstructorIQ.Core/Data/Entities/Attendance.cs
@@ -1,149 +1,149 @@
 using System;
+
 using MediatR.CommandQuery.Definitions;
 
-namespace InstructorIQ.Core.Data.Entities
+namespace InstructorIQ.Core.Data.Entities;
+
+/// <summary>
+/// Entity class representing data for table 'Attendance'.
+/// </summary>
+public class Attendance : IHaveIdentifier<Guid>, ITrackCreated, ITrackUpdated, IHaveTenant<Guid>
 {
     /// <summary>
-    /// Entity class representing data for table 'Attendance'.
+    /// Initializes a new instance of the <see cref="Attendance"/> class.
     /// </summary>
-    public class Attendance : IHaveIdentifier<Guid>, ITrackCreated, ITrackUpdated, IHaveTenant<Guid>
+    public Attendance()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Attendance"/> class.
-        /// </summary>
-        public Attendance()
-        {
-            #region Generated Constructor
-            #endregion
-        }
-
-        #region Generated Properties
-        /// <summary>
-        /// Gets or sets the property value representing column 'Id'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Id'.
-        /// </value>
-        public Guid Id { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'SessionId'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'SessionId'.
-        /// </value>
-        public Guid SessionId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'Attended'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Attended'.
-        /// </value>
-        public DateTimeOffset Attended { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'AttendeeEmail'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'AttendeeEmail'.
-        /// </value>
-        public string AttendeeEmail { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'AttendeeName'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'AttendeeName'.
-        /// </value>
-        public string AttendeeName { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'Signature'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Signature'.
-        /// </value>
-        public string Signature { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'SignatureType'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'SignatureType'.
-        /// </value>
-        public string SignatureType { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'TenantId'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'TenantId'.
-        /// </value>
-        public Guid TenantId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'Created'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Created'.
-        /// </value>
-        public DateTimeOffset Created { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'CreatedBy'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'CreatedBy'.
-        /// </value>
-        public string CreatedBy { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'Updated'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Updated'.
-        /// </value>
-        public DateTimeOffset Updated { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'UpdatedBy'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'UpdatedBy'.
-        /// </value>
-        public string UpdatedBy { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'RowVersion'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'RowVersion'.
-        /// </value>
-        public Byte[] RowVersion { get; set; }
-
+        #region Generated Constructor
         #endregion
+    }
 
-        #region Generated Relationships
-        /// <summary>
-        /// Gets or sets the navigation property for entity <see cref="Session" />.
-        /// </summary>
-        /// <value>
-        /// The the navigation property for entity <see cref="Session" />.
-        /// </value>
-        /// <seealso cref="SessionId" />
-        public virtual Session Session { get; set; }
-
-        /// <summary>
-        /// Gets or sets the navigation property for entity <see cref="Tenant" />.
-        /// </summary>
-        /// <value>
-        /// The the navigation property for entity <see cref="Tenant" />.
-        /// </value>
-        /// <seealso cref="TenantId" />
-        public virtual Tenant Tenant { get; set; }
+    #region Generated Properties
+    /// <summary>
+    /// Gets or sets the property value representing column 'Id'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Id'.
+    /// </value>
+    public Guid Id { get; set; }
 
-        #endregion
+    /// <summary>
+    /// Gets or sets the property value representing column 'SessionId'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'SessionId'.
+    /// </value>
+    public Guid SessionId { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'Attended'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Attended'.
+    /// </value>
+    public DateTimeOffset Attended { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'AttendeeEmail'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'AttendeeEmail'.
+    /// </value>
+    public string AttendeeEmail { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'AttendeeName'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'AttendeeName'.
+    /// </value>
+    public string AttendeeName { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'Signature'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Signature'.
+    /// </value>
+    public string Signature { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'SignatureType'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'SignatureType'.
+    /// </value>
+    public string SignatureType { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'TenantId'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'TenantId'.
+    /// </value>
+    public Guid TenantId { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'Created'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Created'.
+    /// </value>
+    public DateTimeOffset Created { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'CreatedBy'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'CreatedBy'.
+    /// </value>
+    public string CreatedBy { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'Updated'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Updated'.
+    /// </value>
+    public DateTimeOffset Updated { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'UpdatedBy'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'UpdatedBy'.
+    /// </value>
+    public string UpdatedBy { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'RowVersion'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'RowVersion'.
+    /// </value>
+    public Byte[] RowVersion { get; set; }
+
+    #endregion
+
+    #region Generated Relationships
+    /// <summary>
+    /// Gets or sets the navigation property for entity <see cref="Session" />.
+    /// </summary>
+    /// <value>
+    /// The the navigation property for entity <see cref="Session" />.
+    /// </value>
+    /// <seealso cref="SessionId" />
+    public virtual Session Session { get; set; }
+
+    /// <summary>
+    /// Gets or sets the navigation property for entity <see cref="Tenant" />.
+    /// </summary>
+    /// <value>
+    /// The the navigation property for entity <see cref="Tenant" />.
+    /// </value>
+    /// <seealso cref="TenantId" />
+    public virtual Tenant Tenant { get; set; }
+
+    #endregion
 
-    }
 }
diff --git a/service/src/InstructorIQ.Core/Data/Entities/AuthenticationEvent.cs b/service/src/InstructorIQ.Core/Data/Entities/AuthenticationEvent.cs
index 77379196..17b172f3 100644
--- a/service/src/InstructorIQ.Core/Data/Entities/AuthenticationEvent.cs
+++ b/service/src/InstructorIQ.Core/Data/Entities/AuthenticationEvent.cs
@@ -1,164 +1,164 @@
 using System;
 using System.Collections.Generic;
+
 using MediatR.CommandQuery.Definitions;
 
-namespace InstructorIQ.Core.Data.Entities
+namespace InstructorIQ.Core.Data.Entities;
+
+/// <summary>
+/// Entity class representing data for table 'AuthenticationEvent'.
+/// </summary>
+public partial class AuthenticationEvent : IHaveIdentifier<Guid>, ITrackCreated, ITrackUpdated
 {
     /// <summary>
-    /// Entity class representing data for table 'AuthenticationEvent'.
+    /// Initializes a new instance of the <see cref="AuthenticationEvent"/> class.
     /// </summary>
-    public partial class AuthenticationEvent : IHaveIdentifier<Guid>, ITrackCreated, ITrackUpdated
+    public AuthenticationEvent()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AuthenticationEvent"/> class.
-        /// </summary>
-        public AuthenticationEvent()
-        {
-            #region Generated Constructor
-            #endregion
-        }
-
-        #region Generated Properties
-        /// <summary>
-        /// Gets or sets the property value representing column 'Id'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Id'.
-        /// </value>
-        public Guid Id { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'EmailAddress'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'EmailAddress'.
-        /// </value>
-        public string EmailAddress { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'UserName'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'UserName'.
-        /// </value>
-        public string UserName { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'UserAgent'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'UserAgent'.
-        /// </value>
-        public string UserAgent { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'Browser'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Browser'.
-        /// </value>
-        public string Browser { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'OperatingSystem'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'OperatingSystem'.
-        /// </value>
-        public string OperatingSystem { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'DeviceFamily'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'DeviceFamily'.
-        /// </value>
-        public string DeviceFamily { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'DeviceBrand'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'DeviceBrand'.
-        /// </value>
-        public string DeviceBrand { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'DeviceModel'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'DeviceModel'.
-        /// </value>
-        public string DeviceModel { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'IpAddress'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'IpAddress'.
-        /// </value>
-        public string IpAddress { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'IsSuccessful'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'IsSuccessful'.
-        /// </value>
-        public bool IsSuccessful { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'FailureMessage'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'FailureMessage'.
-        /// </value>
-        public string FailureMessage { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'Created'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Created'.
-        /// </value>
-        public DateTimeOffset Created { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'CreatedBy'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'CreatedBy'.
-        /// </value>
-        public string CreatedBy { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'Updated'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Updated'.
-        /// </value>
-        public DateTimeOffset Updated { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'UpdatedBy'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'UpdatedBy'.
-        /// </value>
-        public string UpdatedBy { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'RowVersion'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'RowVersion'.
-        /// </value>
-        public Byte[] RowVersion { get; set; }
-
+        #region Generated Constructor
         #endregion
+    }
 
-        #region Generated Relationships
-        #endregion
+    #region Generated Properties
+    /// <summary>
+    /// Gets or sets the property value representing column 'Id'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Id'.
+    /// </value>
+    public Guid Id { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'EmailAddress'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'EmailAddress'.
+    /// </value>
+    public string EmailAddress { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'UserName'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'UserName'.
+    /// </value>
+    public string UserName { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'UserAgent'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'UserAgent'.
+    /// </value>
+    public string UserAgent { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'Browser'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Browser'.
+    /// </value>
+    public string Browser { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'OperatingSystem'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'OperatingSystem'.
+    /// </value>
+    public string OperatingSystem { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'DeviceFamily'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'DeviceFamily'.
+    /// </value>
+    public string DeviceFamily { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'DeviceBrand'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'DeviceBrand'.
+    /// </value>
+    public string DeviceBrand { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'DeviceModel'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'DeviceModel'.
+    /// </value>
+    public string DeviceModel { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'IpAddress'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'IpAddress'.
+    /// </value>
+    public string IpAddress { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'IsSuccessful'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'IsSuccessful'.
+    /// </value>
+    public bool IsSuccessful { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'FailureMessage'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'FailureMessage'.
+    /// </value>
+    public string FailureMessage { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'Created'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Created'.
+    /// </value>
+    public DateTimeOffset Created { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'CreatedBy'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'CreatedBy'.
+    /// </value>
+    public string CreatedBy { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'Updated'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Updated'.
+    /// </value>
+    public DateTimeOffset Updated { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'UpdatedBy'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'UpdatedBy'.
+    /// </value>
+    public string UpdatedBy { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'RowVersion'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'RowVersion'.
+    /// </value>
+    public Byte[] RowVersion { get; set; }
+
+    #endregion
+
+    #region Generated Relationships
+    #endregion
 
-    }
 }
diff --git a/service/src/InstructorIQ.Core/Data/Entities/Discussion.cs b/service/src/InstructorIQ.Core/Data/Entities/Discussion.cs
index 1d4a02ef..288cd368 100644
--- a/service/src/InstructorIQ.Core/Data/Entities/Discussion.cs
+++ b/service/src/InstructorIQ.Core/Data/Entities/Discussion.cs
@@ -1,214 +1,214 @@
 using System;
 using System.Collections.Generic;
+
 using MediatR.CommandQuery.Definitions;
 
-namespace InstructorIQ.Core.Data.Entities
+namespace InstructorIQ.Core.Data.Entities;
+
+/// <summary>
+/// Entity class representing data for table 'Discussion'.
+/// </summary>
+public partial class Discussion : IHaveIdentifier<Guid>, ITrackCreated, ITrackUpdated, IHaveTenant<Guid>
 {
     /// <summary>
-    /// Entity class representing data for table 'Discussion'.
+    /// Initializes a new instance of the <see cref="Discussion"/> class.
     /// </summary>
-    public partial class Discussion : IHaveIdentifier<Guid>, ITrackCreated, ITrackUpdated, IHaveTenant<Guid>
+    public Discussion()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Discussion"/> class.
-        /// </summary>
-        public Discussion()
-        {
-            #region Generated Constructor
-            #endregion
-        }
-
-        #region Generated Properties
-        /// <summary>
-        /// Gets or sets the property value representing column 'Id'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Id'.
-        /// </value>
-        public Guid Id { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'TopicId'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'TopicId'.
-        /// </value>
-        public Guid TopicId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'TenantId'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'TenantId'.
-        /// </value>
-        public Guid TenantId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'Message'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Message'.
-        /// </value>
-        public string Message { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'MessageDate'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'MessageDate'.
-        /// </value>
-        public DateTimeOffset MessageDate { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'EmailAddress'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'EmailAddress'.
-        /// </value>
-        public string EmailAddress { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'DisplayName'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'DisplayName'.
-        /// </value>
-        public string DisplayName { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'UserAgent'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'UserAgent'.
-        /// </value>
-        public string UserAgent { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'Browser'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Browser'.
-        /// </value>
-        public string Browser { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'OperatingSystem'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'OperatingSystem'.
-        /// </value>
-        public string OperatingSystem { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'DeviceFamily'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'DeviceFamily'.
-        /// </value>
-        public string DeviceFamily { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'DeviceBrand'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'DeviceBrand'.
-        /// </value>
-        public string DeviceBrand { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'DeviceModel'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'DeviceModel'.
-        /// </value>
-        public string DeviceModel { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'IpAddress'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'IpAddress'.
-        /// </value>
-        public string IpAddress { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'Created'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Created'.
-        /// </value>
-        public DateTimeOffset Created { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'CreatedBy'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'CreatedBy'.
-        /// </value>
-        public string CreatedBy { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'Updated'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Updated'.
-        /// </value>
-        public DateTimeOffset Updated { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'UpdatedBy'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'UpdatedBy'.
-        /// </value>
-        public string UpdatedBy { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'RowVersion'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'RowVersion'.
-        /// </value>
-        public Byte[] RowVersion { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'PeriodStart'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'PeriodStart'.
-        /// </value>
-        public DateTime PeriodStart { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'PeriodEnd'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'PeriodEnd'.
-        /// </value>
-        public DateTime PeriodEnd { get; set; }
-
+        #region Generated Constructor
         #endregion
+    }
 
-        #region Generated Relationships
-        /// <summary>
-        /// Gets or sets the navigation property for entity <see cref="Tenant" />.
-        /// </summary>
-        /// <value>
-        /// The the navigation property for entity <see cref="Tenant" />.
-        /// </value>
-        /// <seealso cref="TenantId" />
-        public virtual Tenant Tenant { get; set; }
-
-        /// <summary>
-        /// Gets or sets the navigation property for entity <see cref="Topic" />.
-        /// </summary>
-        /// <value>
-        /// The the navigation property for entity <see cref="Topic" />.
-        /// </value>
-        /// <seealso cref="TopicId" />
-        public virtual Topic Topic { get; set; }
+    #region Generated Properties
+    /// <summary>
+    /// Gets or sets the property value representing column 'Id'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Id'.
+    /// </value>
+    public Guid Id { get; set; }
 
-        #endregion
+    /// <summary>
+    /// Gets or sets the property value representing column 'TopicId'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'TopicId'.
+    /// </value>
+    public Guid TopicId { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'TenantId'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'TenantId'.
+    /// </value>
+    public Guid TenantId { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'Message'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Message'.
+    /// </value>
+    public string Message { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'MessageDate'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'MessageDate'.
+    /// </value>
+    public DateTimeOffset MessageDate { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'EmailAddress'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'EmailAddress'.
+    /// </value>
+    public string EmailAddress { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'DisplayName'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'DisplayName'.
+    /// </value>
+    public string DisplayName { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'UserAgent'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'UserAgent'.
+    /// </value>
+    public string UserAgent { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'Browser'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Browser'.
+    /// </value>
+    public string Browser { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'OperatingSystem'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'OperatingSystem'.
+    /// </value>
+    public string OperatingSystem { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'DeviceFamily'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'DeviceFamily'.
+    /// </value>
+    public string DeviceFamily { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'DeviceBrand'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'DeviceBrand'.
+    /// </value>
+    public string DeviceBrand { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'DeviceModel'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'DeviceModel'.
+    /// </value>
+    public string DeviceModel { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'IpAddress'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'IpAddress'.
+    /// </value>
+    public string IpAddress { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'Created'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Created'.
+    /// </value>
+    public DateTimeOffset Created { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'CreatedBy'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'CreatedBy'.
+    /// </value>
+    public string CreatedBy { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'Updated'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Updated'.
+    /// </value>
+    public DateTimeOffset Updated { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'UpdatedBy'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'UpdatedBy'.
+    /// </value>
+    public string UpdatedBy { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'RowVersion'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'RowVersion'.
+    /// </value>
+    public Byte[] RowVersion { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'PeriodStart'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'PeriodStart'.
+    /// </value>
+    public DateTime PeriodStart { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'PeriodEnd'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'PeriodEnd'.
+    /// </value>
+    public DateTime PeriodEnd { get; set; }
+
+    #endregion
+
+    #region Generated Relationships
+    /// <summary>
+    /// Gets or sets the navigation property for entity <see cref="Tenant" />.
+    /// </summary>
+    /// <value>
+    /// The the navigation property for entity <see cref="Tenant" />.
+    /// </value>
+    /// <seealso cref="TenantId" />
+    public virtual Tenant Tenant { get; set; }
+
+    /// <summary>
+    /// Gets or sets the navigation property for entity <see cref="Topic" />.
+    /// </summary>
+    /// <value>
+    /// The the navigation property for entity <see cref="Topic" />.
+    /// </value>
+    /// <seealso cref="TopicId" />
+    public virtual Topic Topic { get; set; }
+
+    #endregion
 
-    }
 }
diff --git a/service/src/InstructorIQ.Core/Data/Entities/EmailDelivery.cs b/service/src/InstructorIQ.Core/Data/Entities/EmailDelivery.cs
index 5f129658..24134e6b 100644
--- a/service/src/InstructorIQ.Core/Data/Entities/EmailDelivery.cs
+++ b/service/src/InstructorIQ.Core/Data/Entities/EmailDelivery.cs
@@ -1,189 +1,189 @@
 using System;
 using System.Collections.Generic;
+
 using MediatR.CommandQuery.Definitions;
 
-namespace InstructorIQ.Core.Data.Entities
+namespace InstructorIQ.Core.Data.Entities;
+
+/// <summary>
+/// Entity class representing data for table 'EmailDelivery'.
+/// </summary>
+public partial class EmailDelivery : IHaveIdentifier<Guid>, ITrackCreated, ITrackUpdated
 {
     /// <summary>
-    /// Entity class representing data for table 'EmailDelivery'.
+    /// Initializes a new instance of the <see cref="EmailDelivery"/> class.
     /// </summary>
-    public partial class EmailDelivery : IHaveIdentifier<Guid>, ITrackCreated, ITrackUpdated
+    public EmailDelivery()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EmailDelivery"/> class.
-        /// </summary>
-        public EmailDelivery()
-        {
-            #region Generated Constructor
-            #endregion
-        }
-
-        #region Generated Properties
-        /// <summary>
-        /// Gets or sets the property value representing column 'Id'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Id'.
-        /// </value>
-        public Guid Id { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'IsProcessing'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'IsProcessing'.
-        /// </value>
-        public bool IsProcessing { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'IsDelivered'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'IsDelivered'.
-        /// </value>
-        public bool IsDelivered { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'Delivered'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Delivered'.
-        /// </value>
-        public DateTimeOffset? Delivered { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'Attempts'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Attempts'.
-        /// </value>
-        public int Attempts { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'LastAttempt'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'LastAttempt'.
-        /// </value>
-        public DateTimeOffset? LastAttempt { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'NextAttempt'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'NextAttempt'.
-        /// </value>
-        public DateTimeOffset? NextAttempt { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'SmtpLog'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'SmtpLog'.
-        /// </value>
-        public string SmtpLog { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'Error'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Error'.
-        /// </value>
-        public string Error { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'From'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'From'.
-        /// </value>
-        public string From { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'To'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'To'.
-        /// </value>
-        public string To { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'Subject'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Subject'.
-        /// </value>
-        public string Subject { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'MimeMessage'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'MimeMessage'.
-        /// </value>
-        public Byte[] MimeMessage { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'TenantId'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'TenantId'.
-        /// </value>
-        public Guid? TenantId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'Created'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Created'.
-        /// </value>
-        public DateTimeOffset Created { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'CreatedBy'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'CreatedBy'.
-        /// </value>
-        public string CreatedBy { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'Updated'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Updated'.
-        /// </value>
-        public DateTimeOffset Updated { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'UpdatedBy'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'UpdatedBy'.
-        /// </value>
-        public string UpdatedBy { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'RowVersion'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'RowVersion'.
-        /// </value>
-        public Byte[] RowVersion { get; set; }
-
+        #region Generated Constructor
         #endregion
+    }
 
-        #region Generated Relationships
-        /// <summary>
-        /// Gets or sets the navigation property for entity <see cref="Tenant" />.
-        /// </summary>
-        /// <value>
-        /// The the navigation property for entity <see cref="Tenant" />.
-        /// </value>
-        /// <seealso cref="TenantId" />
-        public virtual Tenant Tenant { get; set; }
+    #region Generated Properties
+    /// <summary>
+    /// Gets or sets the property value representing column 'Id'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Id'.
+    /// </value>
+    public Guid Id { get; set; }
 
-        #endregion
+    /// <summary>
+    /// Gets or sets the property value representing column 'IsProcessing'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'IsProcessing'.
+    /// </value>
+    public bool IsProcessing { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'IsDelivered'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'IsDelivered'.
+    /// </value>
+    public bool IsDelivered { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'Delivered'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Delivered'.
+    /// </value>
+    public DateTimeOffset? Delivered { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'Attempts'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Attempts'.
+    /// </value>
+    public int Attempts { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'LastAttempt'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'LastAttempt'.
+    /// </value>
+    public DateTimeOffset? LastAttempt { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'NextAttempt'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'NextAttempt'.
+    /// </value>
+    public DateTimeOffset? NextAttempt { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'SmtpLog'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'SmtpLog'.
+    /// </value>
+    public string SmtpLog { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'Error'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Error'.
+    /// </value>
+    public string Error { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'From'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'From'.
+    /// </value>
+    public string From { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'To'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'To'.
+    /// </value>
+    public string To { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'Subject'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Subject'.
+    /// </value>
+    public string Subject { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'MimeMessage'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'MimeMessage'.
+    /// </value>
+    public Byte[] MimeMessage { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'TenantId'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'TenantId'.
+    /// </value>
+    public Guid? TenantId { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'Created'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Created'.
+    /// </value>
+    public DateTimeOffset Created { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'CreatedBy'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'CreatedBy'.
+    /// </value>
+    public string CreatedBy { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'Updated'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Updated'.
+    /// </value>
+    public DateTimeOffset Updated { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'UpdatedBy'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'UpdatedBy'.
+    /// </value>
+    public string UpdatedBy { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'RowVersion'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'RowVersion'.
+    /// </value>
+    public Byte[] RowVersion { get; set; }
+
+    #endregion
+
+    #region Generated Relationships
+    /// <summary>
+    /// Gets or sets the navigation property for entity <see cref="Tenant" />.
+    /// </summary>
+    /// <value>
+    /// The the navigation property for entity <see cref="Tenant" />.
+    /// </value>
+    /// <seealso cref="TenantId" />
+    public virtual Tenant Tenant { get; set; }
+
+    #endregion
 
-    }
 }
diff --git a/service/src/InstructorIQ.Core/Data/Entities/EmailTemplate.cs b/service/src/InstructorIQ.Core/Data/Entities/EmailTemplate.cs
index d73e1789..d3c6d61e 100644
--- a/service/src/InstructorIQ.Core/Data/Entities/EmailTemplate.cs
+++ b/service/src/InstructorIQ.Core/Data/Entities/EmailTemplate.cs
@@ -1,158 +1,159 @@
 using System;
 using System.Collections.Generic;
+
 using InstructorIQ.Core.Services;
+
 using MediatR.CommandQuery.Definitions;
 
-namespace InstructorIQ.Core.Data.Entities
+namespace InstructorIQ.Core.Data.Entities;
+
+/// <summary>
+/// Entity class representing data for table 'EmailTemplate'.
+/// </summary>
+public class EmailTemplate : IHaveIdentifier<Guid>, ITrackCreated, ITrackUpdated, IEmailTemplate
 {
     /// <summary>
-    /// Entity class representing data for table 'EmailTemplate'.
+    /// Initializes a new instance of the <see cref="EmailTemplate"/> class.
     /// </summary>
-    public class EmailTemplate : IHaveIdentifier<Guid>, ITrackCreated, ITrackUpdated, IEmailTemplate
+    public EmailTemplate()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EmailTemplate"/> class.
-        /// </summary>
-        public EmailTemplate()
-        {
-            #region Generated Constructor
-            #endregion
-        }
-
-        #region Generated Properties
-        /// <summary>
-        /// Gets or sets the property value representing column 'Id'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Id'.
-        /// </value>
-        public Guid Id { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'Key'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Key'.
-        /// </value>
-        public string Key { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'FromAddress'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'FromAddress'.
-        /// </value>
-        public string FromAddress { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'FromName'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'FromName'.
-        /// </value>
-        public string FromName { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'ReplyToAddress'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'ReplyToAddress'.
-        /// </value>
-        public string ReplyToAddress { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'ReplyToName'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'ReplyToName'.
-        /// </value>
-        public string ReplyToName { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'Subject'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Subject'.
-        /// </value>
-        public string Subject { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'TextBody'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'TextBody'.
-        /// </value>
-        public string TextBody { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'HtmlBody'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'HtmlBody'.
-        /// </value>
-        public string HtmlBody { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'TenantId'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'TenantId'.
-        /// </value>
-        public Guid? TenantId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'Created'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Created'.
-        /// </value>
-        public DateTimeOffset Created { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'CreatedBy'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'CreatedBy'.
-        /// </value>
-        public string CreatedBy { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'Updated'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Updated'.
-        /// </value>
-        public DateTimeOffset Updated { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'UpdatedBy'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'UpdatedBy'.
-        /// </value>
-        public string UpdatedBy { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'RowVersion'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'RowVersion'.
-        /// </value>
-        public Byte[] RowVersion { get; set; }
-
+        #region Generated Constructor
         #endregion
+    }
+
+    #region Generated Properties
+    /// <summary>
+    /// Gets or sets the property value representing column 'Id'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Id'.
+    /// </value>
+    public Guid Id { get; set; }
 
-        #region Generated Relationships
-        /// <summary>
-        /// Gets or sets the navigation property for entity <see cref="Tenant" />.
-        /// </summary>
-        /// <value>
-        /// The the navigation property for entity <see cref="Tenant" />.
-        /// </value>
-        /// <seealso cref="TenantId" />
-        public virtual Tenant Tenant { get; set; }
+    /// <summary>
+    /// Gets or sets the property value representing column 'Key'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Key'.
+    /// </value>
+    public string Key { get; set; }
 
-        #endregion
+    /// <summary>
+    /// Gets or sets the property value representing column 'FromAddress'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'FromAddress'.
+    /// </value>
+    public string FromAddress { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'FromName'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'FromName'.
+    /// </value>
+    public string FromName { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'ReplyToAddress'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'ReplyToAddress'.
+    /// </value>
+    public string ReplyToAddress { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'ReplyToName'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'ReplyToName'.
+    /// </value>
+    public string ReplyToName { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'Subject'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Subject'.
+    /// </value>
+    public string Subject { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'TextBody'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'TextBody'.
+    /// </value>
+    public string TextBody { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'HtmlBody'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'HtmlBody'.
+    /// </value>
+    public string HtmlBody { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'TenantId'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'TenantId'.
+    /// </value>
+    public Guid? TenantId { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'Created'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Created'.
+    /// </value>
+    public DateTimeOffset Created { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'CreatedBy'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'CreatedBy'.
+    /// </value>
+    public string CreatedBy { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'Updated'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Updated'.
+    /// </value>
+    public DateTimeOffset Updated { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'UpdatedBy'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'UpdatedBy'.
+    /// </value>
+    public string UpdatedBy { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'RowVersion'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'RowVersion'.
+    /// </value>
+    public Byte[] RowVersion { get; set; }
+
+    #endregion
+
+    #region Generated Relationships
+    /// <summary>
+    /// Gets or sets the navigation property for entity <see cref="Tenant" />.
+    /// </summary>
+    /// <value>
+    /// The the navigation property for entity <see cref="Tenant" />.
+    /// </value>
+    /// <seealso cref="TenantId" />
+    public virtual Tenant Tenant { get; set; }
+
+    #endregion
 
-    }
 }
diff --git a/service/src/InstructorIQ.Core/Data/Entities/Group.cs b/service/src/InstructorIQ.Core/Data/Entities/Group.cs
index b58dd1b5..1ac32432 100644
--- a/service/src/InstructorIQ.Core/Data/Entities/Group.cs
+++ b/service/src/InstructorIQ.Core/Data/Entities/Group.cs
@@ -1,150 +1,150 @@
 using System;
 using System.Collections.Generic;
+
 using MediatR.CommandQuery.Definitions;
 
-namespace InstructorIQ.Core.Data.Entities
+namespace InstructorIQ.Core.Data.Entities;
+
+/// <summary>
+/// Entity class representing data for table 'Group'.
+/// </summary>
+public class Group : IHaveIdentifier<Guid>, ITrackCreated, ITrackUpdated, IHaveTenant<Guid>
 {
     /// <summary>
-    /// Entity class representing data for table 'Group'.
+    /// Initializes a new instance of the <see cref="Group"/> class.
     /// </summary>
-    public class Group : IHaveIdentifier<Guid>, ITrackCreated, ITrackUpdated, IHaveTenant<Guid>
+    public Group()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Group"/> class.
-        /// </summary>
-        public Group()
-        {
-            #region Generated Constructor
-            Sessions = new HashSet<Session>();
-            #endregion
-        }
-
-        #region Generated Properties
-        /// <summary>
-        /// Gets or sets the property value representing column 'Id'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Id'.
-        /// </value>
-        public Guid Id { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'Name'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Name'.
-        /// </value>
-        public string Name { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'Description'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Description'.
-        /// </value>
-        public string Description { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'Sequence'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Sequence'.
-        /// </value>
-        public int Sequence { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'DisplayOrder'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'DisplayOrder'.
-        /// </value>
-        public int DisplayOrder { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'TenantId'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'TenantId'.
-        /// </value>
-        public Guid TenantId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'Created'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Created'.
-        /// </value>
-        public DateTimeOffset Created { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'CreatedBy'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'CreatedBy'.
-        /// </value>
-        public string CreatedBy { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'Updated'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Updated'.
-        /// </value>
-        public DateTimeOffset Updated { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'UpdatedBy'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'UpdatedBy'.
-        /// </value>
-        public string UpdatedBy { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'RowVersion'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'RowVersion'.
-        /// </value>
-        public Byte[] RowVersion { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'PeriodStart'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'PeriodStart'.
-        /// </value>
-        public DateTime PeriodStart { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'PeriodEnd'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'PeriodEnd'.
-        /// </value>
-        public DateTime PeriodEnd { get; set; }
-
+        #region Generated Constructor
+        Sessions = new HashSet<Session>();
         #endregion
+    }
 
-        #region Generated Relationships
-        /// <summary>
-        /// Gets or sets the navigation collection for entity <see cref="Session" />.
-        /// </summary>
-        /// <value>
-        /// The the navigation collection for entity <see cref="Session" />.
-        /// </value>
-        public virtual ICollection<Session> Sessions { get; set; }
-
-        /// <summary>
-        /// Gets or sets the navigation property for entity <see cref="Tenant" />.
-        /// </summary>
-        /// <value>
-        /// The the navigation property for entity <see cref="Tenant" />.
-        /// </value>
-        /// <seealso cref="TenantId" />
-        public virtual Tenant Tenant { get; set; }
+    #region Generated Properties
+    /// <summary>
+    /// Gets or sets the property value representing column 'Id'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Id'.
+    /// </value>
+    public Guid Id { get; set; }
 
-        #endregion
+    /// <summary>
+    /// Gets or sets the property value representing column 'Name'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Name'.
+    /// </value>
+    public string Name { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'Description'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Description'.
+    /// </value>
+    public string Description { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'Sequence'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Sequence'.
+    /// </value>
+    public int Sequence { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'DisplayOrder'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'DisplayOrder'.
+    /// </value>
+    public int DisplayOrder { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'TenantId'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'TenantId'.
+    /// </value>
+    public Guid TenantId { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'Created'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Created'.
+    /// </value>
+    public DateTimeOffset Created { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'CreatedBy'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'CreatedBy'.
+    /// </value>
+    public string CreatedBy { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'Updated'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Updated'.
+    /// </value>
+    public DateTimeOffset Updated { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'UpdatedBy'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'UpdatedBy'.
+    /// </value>
+    public string UpdatedBy { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'RowVersion'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'RowVersion'.
+    /// </value>
+    public Byte[] RowVersion { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'PeriodStart'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'PeriodStart'.
+    /// </value>
+    public DateTime PeriodStart { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'PeriodEnd'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'PeriodEnd'.
+    /// </value>
+    public DateTime PeriodEnd { get; set; }
+
+    #endregion
+
+    #region Generated Relationships
+    /// <summary>
+    /// Gets or sets the navigation collection for entity <see cref="Session" />.
+    /// </summary>
+    /// <value>
+    /// The the navigation collection for entity <see cref="Session" />.
+    /// </value>
+    public virtual ICollection<Session> Sessions { get; set; }
+
+    /// <summary>
+    /// Gets or sets the navigation property for entity <see cref="Tenant" />.
+    /// </summary>
+    /// <value>
+    /// The the navigation property for entity <see cref="Tenant" />.
+    /// </value>
+    /// <seealso cref="TenantId" />
+    public virtual Tenant Tenant { get; set; }
+
+    #endregion
 
-    }
 }
diff --git a/service/src/InstructorIQ.Core/Data/Entities/HistoryRecord.cs b/service/src/InstructorIQ.Core/Data/Entities/HistoryRecord.cs
index 51ab8ab9..a54664d4 100644
--- a/service/src/InstructorIQ.Core/Data/Entities/HistoryRecord.cs
+++ b/service/src/InstructorIQ.Core/Data/Entities/HistoryRecord.cs
@@ -1,204 +1,204 @@
 using System;
 using System.Collections.Generic;
+
 using MediatR.CommandQuery.Definitions;
 
-namespace InstructorIQ.Core.Data.Entities
+namespace InstructorIQ.Core.Data.Entities;
+
+/// <summary>
+/// Entity class representing data for table 'HistoryRecord'.
+/// </summary>
+public partial class HistoryRecord : IHaveIdentifier<Guid>, ITrackCreated, ITrackUpdated
 {
     /// <summary>
-    /// Entity class representing data for table 'HistoryRecord'.
+    /// Initializes a new instance of the <see cref="HistoryRecord"/> class.
     /// </summary>
-    public partial class HistoryRecord : IHaveIdentifier<Guid>, ITrackCreated, ITrackUpdated
+    public HistoryRecord()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="HistoryRecord"/> class.
-        /// </summary>
-        public HistoryRecord()
-        {
-            #region Generated Constructor
-            #endregion
-        }
-
-        #region Generated Properties
-        /// <summary>
-        /// Gets or sets the property value representing column 'Id'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Id'.
-        /// </value>
-        public Guid Id { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'Key'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Key'.
-        /// </value>
-        public Guid Key { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'Entity'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Entity'.
-        /// </value>
-        public string Entity { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'ParentKey'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'ParentKey'.
-        /// </value>
-        public Guid? ParentKey { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'ParentEntity'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'ParentEntity'.
-        /// </value>
-        public string ParentEntity { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'Changed'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Changed'.
-        /// </value>
-        public DateTimeOffset Changed { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'ChangedBy'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'ChangedBy'.
-        /// </value>
-        public string ChangedBy { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'PropertyName'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'PropertyName'.
-        /// </value>
-        public string PropertyName { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'DisplayName'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'DisplayName'.
-        /// </value>
-        public string DisplayName { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'Path'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Path'.
-        /// </value>
-        public string Path { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'Operation'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Operation'.
-        /// </value>
-        public string Operation { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'OriginalValue'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'OriginalValue'.
-        /// </value>
-        public string OriginalValue { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'OriginalFormatted'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'OriginalFormatted'.
-        /// </value>
-        public string OriginalFormatted { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'OriginalType'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'OriginalType'.
-        /// </value>
-        public string OriginalType { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'CurrentValue'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'CurrentValue'.
-        /// </value>
-        public string CurrentValue { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'CurrentFormatted'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'CurrentFormatted'.
-        /// </value>
-        public string CurrentFormatted { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'CurrentType'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'CurrentType'.
-        /// </value>
-        public string CurrentType { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'Created'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Created'.
-        /// </value>
-        public DateTimeOffset Created { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'CreatedBy'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'CreatedBy'.
-        /// </value>
-        public string CreatedBy { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'Updated'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Updated'.
-        /// </value>
-        public DateTimeOffset Updated { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'UpdatedBy'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'UpdatedBy'.
-        /// </value>
-        public string UpdatedBy { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'RowVersion'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'RowVersion'.
-        /// </value>
-        public Byte[] RowVersion { get; set; }
-
+        #region Generated Constructor
         #endregion
+    }
 
-        #region Generated Relationships
-        #endregion
+    #region Generated Properties
+    /// <summary>
+    /// Gets or sets the property value representing column 'Id'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Id'.
+    /// </value>
+    public Guid Id { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'Key'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Key'.
+    /// </value>
+    public Guid Key { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'Entity'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Entity'.
+    /// </value>
+    public string Entity { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'ParentKey'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'ParentKey'.
+    /// </value>
+    public Guid? ParentKey { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'ParentEntity'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'ParentEntity'.
+    /// </value>
+    public string ParentEntity { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'Changed'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Changed'.
+    /// </value>
+    public DateTimeOffset Changed { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'ChangedBy'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'ChangedBy'.
+    /// </value>
+    public string ChangedBy { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'PropertyName'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'PropertyName'.
+    /// </value>
+    public string PropertyName { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'DisplayName'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'DisplayName'.
+    /// </value>
+    public string DisplayName { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'Path'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Path'.
+    /// </value>
+    public string Path { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'Operation'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Operation'.
+    /// </value>
+    public string Operation { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'OriginalValue'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'OriginalValue'.
+    /// </value>
+    public string OriginalValue { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'OriginalFormatted'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'OriginalFormatted'.
+    /// </value>
+    public string OriginalFormatted { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'OriginalType'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'OriginalType'.
+    /// </value>
+    public string OriginalType { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'CurrentValue'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'CurrentValue'.
+    /// </value>
+    public string CurrentValue { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'CurrentFormatted'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'CurrentFormatted'.
+    /// </value>
+    public string CurrentFormatted { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'CurrentType'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'CurrentType'.
+    /// </value>
+    public string CurrentType { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'Created'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Created'.
+    /// </value>
+    public DateTimeOffset Created { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'CreatedBy'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'CreatedBy'.
+    /// </value>
+    public string CreatedBy { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'Updated'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Updated'.
+    /// </value>
+    public DateTimeOffset Updated { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'UpdatedBy'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'UpdatedBy'.
+    /// </value>
+    public string UpdatedBy { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'RowVersion'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'RowVersion'.
+    /// </value>
+    public Byte[] RowVersion { get; set; }
+
+    #endregion
+
+    #region Generated Relationships
+    #endregion
 
-    }
 }
diff --git a/service/src/InstructorIQ.Core/Data/Entities/ImportJob.cs b/service/src/InstructorIQ.Core/Data/Entities/ImportJob.cs
index 49823389..a797879f 100644
--- a/service/src/InstructorIQ.Core/Data/Entities/ImportJob.cs
+++ b/service/src/InstructorIQ.Core/Data/Entities/ImportJob.cs
@@ -1,116 +1,115 @@
 using System;
 using System.Collections.Generic;
 
-namespace InstructorIQ.Core.Data.Entities
+namespace InstructorIQ.Core.Data.Entities;
+
+/// <summary>
+/// Entity class representing data for table 'ImportJob'.
+/// </summary>
+public partial class ImportJob
 {
     /// <summary>
-    /// Entity class representing data for table 'ImportJob'.
+    /// Initializes a new instance of the <see cref="ImportJob"/> class.
     /// </summary>
-    public partial class ImportJob
+    public ImportJob()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ImportJob"/> class.
-        /// </summary>
-        public ImportJob()
-        {
-            #region Generated Constructor
-            #endregion
-        }
-
-        #region Generated Properties
-        /// <summary>
-        /// Gets or sets the property value representing column 'Id'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Id'.
-        /// </value>
-        public Guid Id { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'Type'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Type'.
-        /// </value>
-        public string Type { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'TenantId'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'TenantId'.
-        /// </value>
-        public Guid TenantId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'MappingJson'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'MappingJson'.
-        /// </value>
-        public string MappingJson { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'StorageFile'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'StorageFile'.
-        /// </value>
-        public string StorageFile { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'Created'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Created'.
-        /// </value>
-        public DateTimeOffset Created { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'CreatedBy'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'CreatedBy'.
-        /// </value>
-        public string CreatedBy { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'Updated'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Updated'.
-        /// </value>
-        public DateTimeOffset Updated { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'UpdatedBy'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'UpdatedBy'.
-        /// </value>
-        public string UpdatedBy { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'RowVersion'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'RowVersion'.
-        /// </value>
-        public Byte[] RowVersion { get; set; }
-
+        #region Generated Constructor
         #endregion
+    }
 
-        #region Generated Relationships
-        /// <summary>
-        /// Gets or sets the navigation property for entity <see cref="Tenant" />.
-        /// </summary>
-        /// <value>
-        /// The the navigation property for entity <see cref="Tenant" />.
-        /// </value>
-        /// <seealso cref="TenantId" />
-        public virtual Tenant Tenant { get; set; }
+    #region Generated Properties
+    /// <summary>
+    /// Gets or sets the property value representing column 'Id'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Id'.
+    /// </value>
+    public Guid Id { get; set; }
 
-        #endregion
+    /// <summary>
+    /// Gets or sets the property value representing column 'Type'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Type'.
+    /// </value>
+    public string Type { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'TenantId'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'TenantId'.
+    /// </value>
+    public Guid TenantId { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'MappingJson'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'MappingJson'.
+    /// </value>
+    public string MappingJson { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'StorageFile'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'StorageFile'.
+    /// </value>
+    public string StorageFile { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'Created'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Created'.
+    /// </value>
+    public DateTimeOffset Created { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'CreatedBy'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'CreatedBy'.
+    /// </value>
+    public string CreatedBy { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'Updated'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Updated'.
+    /// </value>
+    public DateTimeOffset Updated { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'UpdatedBy'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'UpdatedBy'.
+    /// </value>
+    public string UpdatedBy { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'RowVersion'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'RowVersion'.
+    /// </value>
+    public Byte[] RowVersion { get; set; }
+
+    #endregion
+
+    #region Generated Relationships
+    /// <summary>
+    /// Gets or sets the navigation property for entity <see cref="Tenant" />.
+    /// </summary>
+    /// <value>
+    /// The the navigation property for entity <see cref="Tenant" />.
+    /// </value>
+    /// <seealso cref="TenantId" />
+    public virtual Tenant Tenant { get; set; }
+
+    #endregion
 
-    }
 }
diff --git a/service/src/InstructorIQ.Core/Data/Entities/InstructorRole.cs b/service/src/InstructorIQ.Core/Data/Entities/InstructorRole.cs
index 2691661e..bac1c3a6 100644
--- a/service/src/InstructorIQ.Core/Data/Entities/InstructorRole.cs
+++ b/service/src/InstructorIQ.Core/Data/Entities/InstructorRole.cs
@@ -1,127 +1,127 @@
 using System;
 using System.Collections.Generic;
+
 using MediatR.CommandQuery.Definitions;
 
-namespace InstructorIQ.Core.Data.Entities
+namespace InstructorIQ.Core.Data.Entities;
+
+/// <summary>
+/// Entity class representing data for table 'InstructorRole'.
+/// </summary>
+public class InstructorRole : IHaveIdentifier<Guid>, ITrackCreated, ITrackUpdated, IHaveTenant<Guid>
 {
     /// <summary>
-    /// Entity class representing data for table 'InstructorRole'.
+    /// Initializes a new instance of the <see cref="InstructorRole"/> class.
     /// </summary>
-    public class InstructorRole : IHaveIdentifier<Guid>, ITrackCreated, ITrackUpdated, IHaveTenant<Guid>
+    public InstructorRole()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="InstructorRole"/> class.
-        /// </summary>
-        public InstructorRole()
-        {
-            #region Generated Constructor
-            SessionInstructors = new HashSet<SessionInstructor>();
-            TopicInstructors = new HashSet<TopicInstructor>();
-            #endregion
-        }
-
-        #region Generated Properties
-        /// <summary>
-        /// Gets or sets the property value representing column 'Id'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Id'.
-        /// </value>
-        public Guid Id { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'Name'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Name'.
-        /// </value>
-        public string Name { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'Description'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Description'.
-        /// </value>
-        public string Description { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'TenantId'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'TenantId'.
-        /// </value>
-        public Guid TenantId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'Created'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Created'.
-        /// </value>
-        public DateTimeOffset Created { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'CreatedBy'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'CreatedBy'.
-        /// </value>
-        public string CreatedBy { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'Updated'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Updated'.
-        /// </value>
-        public DateTimeOffset Updated { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'UpdatedBy'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'UpdatedBy'.
-        /// </value>
-        public string UpdatedBy { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'RowVersion'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'RowVersion'.
-        /// </value>
-        public Byte[] RowVersion { get; set; }
-
+        #region Generated Constructor
+        SessionInstructors = new HashSet<SessionInstructor>();
+        TopicInstructors = new HashSet<TopicInstructor>();
         #endregion
+    }
 
-        #region Generated Relationships
-        /// <summary>
-        /// Gets or sets the navigation collection for entity <see cref="SessionInstructor" />.
-        /// </summary>
-        /// <value>
-        /// The the navigation collection for entity <see cref="SessionInstructor" />.
-        /// </value>
-        public virtual ICollection<SessionInstructor> SessionInstructors { get; set; }
-
-        /// <summary>
-        /// Gets or sets the navigation property for entity <see cref="Tenant" />.
-        /// </summary>
-        /// <value>
-        /// The the navigation property for entity <see cref="Tenant" />.
-        /// </value>
-        /// <seealso cref="TenantId" />
-        public virtual Tenant Tenant { get; set; }
-
-        /// <summary>
-        /// Gets or sets the navigation collection for entity <see cref="TopicInstructor" />.
-        /// </summary>
-        /// <value>
-        /// The the navigation collection for entity <see cref="TopicInstructor" />.
-        /// </value>
-        public virtual ICollection<TopicInstructor> TopicInstructors { get; set; }
+    #region Generated Properties
+    /// <summary>
+    /// Gets or sets the property value representing column 'Id'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Id'.
+    /// </value>
+    public Guid Id { get; set; }
 
-        #endregion
+    /// <summary>
+    /// Gets or sets the property value representing column 'Name'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Name'.
+    /// </value>
+    public string Name { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'Description'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Description'.
+    /// </value>
+    public string Description { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'TenantId'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'TenantId'.
+    /// </value>
+    public Guid TenantId { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'Created'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Created'.
+    /// </value>
+    public DateTimeOffset Created { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'CreatedBy'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'CreatedBy'.
+    /// </value>
+    public string CreatedBy { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'Updated'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Updated'.
+    /// </value>
+    public DateTimeOffset Updated { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'UpdatedBy'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'UpdatedBy'.
+    /// </value>
+    public string UpdatedBy { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'RowVersion'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'RowVersion'.
+    /// </value>
+    public Byte[] RowVersion { get; set; }
+
+    #endregion
+
+    #region Generated Relationships
+    /// <summary>
+    /// Gets or sets the navigation collection for entity <see cref="SessionInstructor" />.
+    /// </summary>
+    /// <value>
+    /// The the navigation collection for entity <see cref="SessionInstructor" />.
+    /// </value>
+    public virtual ICollection<SessionInstructor> SessionInstructors { get; set; }
+
+    /// <summary>
+    /// Gets or sets the navigation property for entity <see cref="Tenant" />.
+    /// </summary>
+    /// <value>
+    /// The the navigation property for entity <see cref="Tenant" />.
+    /// </value>
+    /// <seealso cref="TenantId" />
+    public virtual Tenant Tenant { get; set; }
+
+    /// <summary>
+    /// Gets or sets the navigation collection for entity <see cref="TopicInstructor" />.
+    /// </summary>
+    /// <value>
+    /// The the navigation collection for entity <see cref="TopicInstructor" />.
+    /// </value>
+    public virtual ICollection<TopicInstructor> TopicInstructors { get; set; }
+
+    #endregion
 
-    }
 }
diff --git a/service/src/InstructorIQ.Core/Data/Entities/LinkToken.cs b/service/src/InstructorIQ.Core/Data/Entities/LinkToken.cs
index 7bdd04ef..a8834467 100644
--- a/service/src/InstructorIQ.Core/Data/Entities/LinkToken.cs
+++ b/service/src/InstructorIQ.Core/Data/Entities/LinkToken.cs
@@ -1,100 +1,99 @@
 using System;
 using System.Collections.Generic;
 
-namespace InstructorIQ.Core.Data.Entities
+namespace InstructorIQ.Core.Data.Entities;
+
+/// <summary>
+/// Entity class representing data for table 'LinkToken'.
+/// </summary>
+public partial class LinkToken
 {
     /// <summary>
-    /// Entity class representing data for table 'LinkToken'.
+    /// Initializes a new instance of the <see cref="LinkToken"/> class.
     /// </summary>
-    public partial class LinkToken
+    public LinkToken()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="LinkToken"/> class.
-        /// </summary>
-        public LinkToken()
-        {
-            #region Generated Constructor
-            #endregion
-        }
+        #region Generated Constructor
+        #endregion
+    }
 
-        #region Generated Properties
-        /// <summary>
-        /// Gets or sets the property value representing column 'Id'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Id'.
-        /// </value>
-        public Guid Id { get; set; }
+    #region Generated Properties
+    /// <summary>
+    /// Gets or sets the property value representing column 'Id'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Id'.
+    /// </value>
+    public Guid Id { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value representing column 'TokenHash'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'TokenHash'.
-        /// </value>
-        public string TokenHash { get; set; }
+    /// <summary>
+    /// Gets or sets the property value representing column 'TokenHash'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'TokenHash'.
+    /// </value>
+    public string TokenHash { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value representing column 'UserName'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'UserName'.
-        /// </value>
-        public string UserName { get; set; }
+    /// <summary>
+    /// Gets or sets the property value representing column 'UserName'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'UserName'.
+    /// </value>
+    public string UserName { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value representing column 'Url'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Url'.
-        /// </value>
-        public string Url { get; set; }
+    /// <summary>
+    /// Gets or sets the property value representing column 'Url'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Url'.
+    /// </value>
+    public string Url { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value representing column 'TenantId'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'TenantId'.
-        /// </value>
-        public Guid? TenantId { get; set; }
+    /// <summary>
+    /// Gets or sets the property value representing column 'TenantId'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'TenantId'.
+    /// </value>
+    public Guid? TenantId { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value representing column 'Issued'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Issued'.
-        /// </value>
-        public DateTimeOffset Issued { get; set; }
+    /// <summary>
+    /// Gets or sets the property value representing column 'Issued'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Issued'.
+    /// </value>
+    public DateTimeOffset Issued { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value representing column 'Used'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Used'.
-        /// </value>
-        public DateTimeOffset? Used { get; set; }
+    /// <summary>
+    /// Gets or sets the property value representing column 'Used'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Used'.
+    /// </value>
+    public DateTimeOffset? Used { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value representing column 'Expires'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Expires'.
-        /// </value>
-        public DateTimeOffset? Expires { get; set; }
+    /// <summary>
+    /// Gets or sets the property value representing column 'Expires'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Expires'.
+    /// </value>
+    public DateTimeOffset? Expires { get; set; }
 
-        #endregion
+    #endregion
 
-        #region Generated Relationships
-        /// <summary>
-        /// Gets or sets the navigation property for entity <see cref="Tenant" />.
-        /// </summary>
-        /// <value>
-        /// The the navigation property for entity <see cref="Tenant" />.
-        /// </value>
-        /// <seealso cref="TenantId" />
-        public virtual Tenant Tenant { get; set; }
+    #region Generated Relationships
+    /// <summary>
+    /// Gets or sets the navigation property for entity <see cref="Tenant" />.
+    /// </summary>
+    /// <value>
+    /// The the navigation property for entity <see cref="Tenant" />.
+    /// </value>
+    /// <seealso cref="TenantId" />
+    public virtual Tenant Tenant { get; set; }
 
-        #endregion
+    #endregion
 
-    }
 }
diff --git a/service/src/InstructorIQ.Core/Data/Entities/Location.cs b/service/src/InstructorIQ.Core/Data/Entities/Location.cs
index 3d944329..3d51c858 100644
--- a/service/src/InstructorIQ.Core/Data/Entities/Location.cs
+++ b/service/src/InstructorIQ.Core/Data/Entities/Location.cs
@@ -1,222 +1,222 @@
 using System;
 using System.Collections.Generic;
+
 using MediatR.CommandQuery.Definitions;
 
-namespace InstructorIQ.Core.Data.Entities
+namespace InstructorIQ.Core.Data.Entities;
+
+/// <summary>
+/// Entity class representing data for table 'Location'.
+/// </summary>
+public class Location : IHaveIdentifier<Guid>, ITrackCreated, ITrackUpdated, IHaveTenant<Guid>
 {
     /// <summary>
-    /// Entity class representing data for table 'Location'.
+    /// Initializes a new instance of the <see cref="Location"/> class.
     /// </summary>
-    public class Location : IHaveIdentifier<Guid>, ITrackCreated, ITrackUpdated, IHaveTenant<Guid>
+    public Location()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Location"/> class.
-        /// </summary>
-        public Location()
-        {
-            #region Generated Constructor
-            Sessions = new HashSet<Session>();
-            #endregion
-        }
-
-        #region Generated Properties
-        /// <summary>
-        /// Gets or sets the property value representing column 'Id'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Id'.
-        /// </value>
-        public Guid Id { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'Name'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Name'.
-        /// </value>
-        public string Name { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'Description'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Description'.
-        /// </value>
-        public string Description { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'AddressLine1'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'AddressLine1'.
-        /// </value>
-        public string AddressLine1 { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'AddressLine2'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'AddressLine2'.
-        /// </value>
-        public string AddressLine2 { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'AddressLine3'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'AddressLine3'.
-        /// </value>
-        public string AddressLine3 { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'City'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'City'.
-        /// </value>
-        public string City { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'StateProvince'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'StateProvince'.
-        /// </value>
-        public string StateProvince { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'PostalCode'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'PostalCode'.
-        /// </value>
-        public string PostalCode { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'ContactName'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'ContactName'.
-        /// </value>
-        public string ContactName { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'ContactEmail'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'ContactEmail'.
-        /// </value>
-        public string ContactEmail { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'ContactPhone'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'ContactPhone'.
-        /// </value>
-        public string ContactPhone { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'Latitude'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Latitude'.
-        /// </value>
-        public decimal? Latitude { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'Longitude'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Longitude'.
-        /// </value>
-        public decimal? Longitude { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'TenantId'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'TenantId'.
-        /// </value>
-        public Guid TenantId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'Created'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Created'.
-        /// </value>
-        public DateTimeOffset Created { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'CreatedBy'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'CreatedBy'.
-        /// </value>
-        public string CreatedBy { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'Updated'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Updated'.
-        /// </value>
-        public DateTimeOffset Updated { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'UpdatedBy'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'UpdatedBy'.
-        /// </value>
-        public string UpdatedBy { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'RowVersion'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'RowVersion'.
-        /// </value>
-        public Byte[] RowVersion { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'PeriodStart'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'PeriodStart'.
-        /// </value>
-        public DateTime PeriodStart { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'PeriodEnd'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'PeriodEnd'.
-        /// </value>
-        public DateTime PeriodEnd { get; set; }
-
+        #region Generated Constructor
+        Sessions = new HashSet<Session>();
         #endregion
+    }
 
-        #region Generated Relationships
-        /// <summary>
-        /// Gets or sets the navigation collection for entity <see cref="Session" />.
-        /// </summary>
-        /// <value>
-        /// The the navigation collection for entity <see cref="Session" />.
-        /// </value>
-        public virtual ICollection<Session> Sessions { get; set; }
-
-        /// <summary>
-        /// Gets or sets the navigation property for entity <see cref="Tenant" />.
-        /// </summary>
-        /// <value>
-        /// The the navigation property for entity <see cref="Tenant" />.
-        /// </value>
-        /// <seealso cref="TenantId" />
-        public virtual Tenant Tenant { get; set; }
+    #region Generated Properties
+    /// <summary>
+    /// Gets or sets the property value representing column 'Id'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Id'.
+    /// </value>
+    public Guid Id { get; set; }
 
-        #endregion
+    /// <summary>
+    /// Gets or sets the property value representing column 'Name'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Name'.
+    /// </value>
+    public string Name { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'Description'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Description'.
+    /// </value>
+    public string Description { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'AddressLine1'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'AddressLine1'.
+    /// </value>
+    public string AddressLine1 { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'AddressLine2'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'AddressLine2'.
+    /// </value>
+    public string AddressLine2 { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'AddressLine3'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'AddressLine3'.
+    /// </value>
+    public string AddressLine3 { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'City'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'City'.
+    /// </value>
+    public string City { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'StateProvince'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'StateProvince'.
+    /// </value>
+    public string StateProvince { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'PostalCode'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'PostalCode'.
+    /// </value>
+    public string PostalCode { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'ContactName'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'ContactName'.
+    /// </value>
+    public string ContactName { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'ContactEmail'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'ContactEmail'.
+    /// </value>
+    public string ContactEmail { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'ContactPhone'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'ContactPhone'.
+    /// </value>
+    public string ContactPhone { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'Latitude'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Latitude'.
+    /// </value>
+    public decimal? Latitude { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'Longitude'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Longitude'.
+    /// </value>
+    public decimal? Longitude { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'TenantId'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'TenantId'.
+    /// </value>
+    public Guid TenantId { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'Created'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Created'.
+    /// </value>
+    public DateTimeOffset Created { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'CreatedBy'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'CreatedBy'.
+    /// </value>
+    public string CreatedBy { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'Updated'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Updated'.
+    /// </value>
+    public DateTimeOffset Updated { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'UpdatedBy'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'UpdatedBy'.
+    /// </value>
+    public string UpdatedBy { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'RowVersion'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'RowVersion'.
+    /// </value>
+    public Byte[] RowVersion { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'PeriodStart'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'PeriodStart'.
+    /// </value>
+    public DateTime PeriodStart { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'PeriodEnd'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'PeriodEnd'.
+    /// </value>
+    public DateTime PeriodEnd { get; set; }
+
+    #endregion
+
+    #region Generated Relationships
+    /// <summary>
+    /// Gets or sets the navigation collection for entity <see cref="Session" />.
+    /// </summary>
+    /// <value>
+    /// The the navigation collection for entity <see cref="Session" />.
+    /// </value>
+    public virtual ICollection<Session> Sessions { get; set; }
+
+    /// <summary>
+    /// Gets or sets the navigation property for entity <see cref="Tenant" />.
+    /// </summary>
+    /// <value>
+    /// The the navigation property for entity <see cref="Tenant" />.
+    /// </value>
+    /// <seealso cref="TenantId" />
+    public virtual Tenant Tenant { get; set; }
+
+    #endregion
 
-    }
 }
diff --git a/service/src/InstructorIQ.Core/Data/Entities/Notification.cs b/service/src/InstructorIQ.Core/Data/Entities/Notification.cs
index 0a8dc05b..c7424235 100644
--- a/service/src/InstructorIQ.Core/Data/Entities/Notification.cs
+++ b/service/src/InstructorIQ.Core/Data/Entities/Notification.cs
@@ -1,125 +1,125 @@
 using System;
 using System.Collections.Generic;
+
 using MediatR.CommandQuery.Definitions;
 
-namespace InstructorIQ.Core.Data.Entities
+namespace InstructorIQ.Core.Data.Entities;
+
+/// <summary>
+/// Entity class representing data for table 'Notification'.
+/// </summary>
+public partial class Notification : IHaveIdentifier<Guid>, ITrackCreated, ITrackUpdated
 {
     /// <summary>
-    /// Entity class representing data for table 'Notification'.
+    /// Initializes a new instance of the <see cref="Notification"/> class.
     /// </summary>
-    public partial class Notification : IHaveIdentifier<Guid>, ITrackCreated, ITrackUpdated
+    public Notification()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Notification"/> class.
-        /// </summary>
-        public Notification()
-        {
-            #region Generated Constructor
-            #endregion
-        }
-
-        #region Generated Properties
-        /// <summary>
-        /// Gets or sets the property value representing column 'Id'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Id'.
-        /// </value>
-        public Guid Id { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'Type'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Type'.
-        /// </value>
-        public string Type { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'Message'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Message'.
-        /// </value>
-        public string Message { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'UserName'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'UserName'.
-        /// </value>
-        public string UserName { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'Read'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Read'.
-        /// </value>
-        public DateTimeOffset? Read { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'TenantId'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'TenantId'.
-        /// </value>
-        public Guid TenantId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'Created'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Created'.
-        /// </value>
-        public DateTimeOffset Created { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'CreatedBy'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'CreatedBy'.
-        /// </value>
-        public string CreatedBy { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'Updated'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Updated'.
-        /// </value>
-        public DateTimeOffset Updated { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'UpdatedBy'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'UpdatedBy'.
-        /// </value>
-        public string UpdatedBy { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'RowVersion'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'RowVersion'.
-        /// </value>
-        public Byte[] RowVersion { get; set; }
-
+        #region Generated Constructor
         #endregion
+    }
 
-        #region Generated Relationships
-        /// <summary>
-        /// Gets or sets the navigation property for entity <see cref="Tenant" />.
-        /// </summary>
-        /// <value>
-        /// The the navigation property for entity <see cref="Tenant" />.
-        /// </value>
-        /// <seealso cref="TenantId" />
-        public virtual Tenant Tenant { get; set; }
+    #region Generated Properties
+    /// <summary>
+    /// Gets or sets the property value representing column 'Id'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Id'.
+    /// </value>
+    public Guid Id { get; set; }
 
-        #endregion
+    /// <summary>
+    /// Gets or sets the property value representing column 'Type'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Type'.
+    /// </value>
+    public string Type { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'Message'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Message'.
+    /// </value>
+    public string Message { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'UserName'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'UserName'.
+    /// </value>
+    public string UserName { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'Read'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Read'.
+    /// </value>
+    public DateTimeOffset? Read { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'TenantId'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'TenantId'.
+    /// </value>
+    public Guid TenantId { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'Created'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Created'.
+    /// </value>
+    public DateTimeOffset Created { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'CreatedBy'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'CreatedBy'.
+    /// </value>
+    public string CreatedBy { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'Updated'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Updated'.
+    /// </value>
+    public DateTimeOffset Updated { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'UpdatedBy'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'UpdatedBy'.
+    /// </value>
+    public string UpdatedBy { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'RowVersion'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'RowVersion'.
+    /// </value>
+    public Byte[] RowVersion { get; set; }
+
+    #endregion
+
+    #region Generated Relationships
+    /// <summary>
+    /// Gets or sets the navigation property for entity <see cref="Tenant" />.
+    /// </summary>
+    /// <value>
+    /// The the navigation property for entity <see cref="Tenant" />.
+    /// </value>
+    /// <seealso cref="TenantId" />
+    public virtual Tenant Tenant { get; set; }
+
+    #endregion
 
-    }
 }
diff --git a/service/src/InstructorIQ.Core/Data/Entities/RefreshToken.cs b/service/src/InstructorIQ.Core/Data/Entities/RefreshToken.cs
index aba0dcc7..7b0cd38b 100644
--- a/service/src/InstructorIQ.Core/Data/Entities/RefreshToken.cs
+++ b/service/src/InstructorIQ.Core/Data/Entities/RefreshToken.cs
@@ -1,84 +1,84 @@
 using System;
 using System.Collections.Generic;
+
 using MediatR.CommandQuery.Definitions;
 
-namespace InstructorIQ.Core.Data.Entities
+namespace InstructorIQ.Core.Data.Entities;
+
+/// <summary>
+/// Entity class representing data for table 'RefreshToken'.
+/// </summary>
+public partial class RefreshToken : IHaveIdentifier<Guid>
 {
     /// <summary>
-    /// Entity class representing data for table 'RefreshToken'.
+    /// Initializes a new instance of the <see cref="RefreshToken"/> class.
     /// </summary>
-    public partial class RefreshToken : IHaveIdentifier<Guid>
+    public RefreshToken()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RefreshToken"/> class.
-        /// </summary>
-        public RefreshToken()
-        {
-            #region Generated Constructor
-            #endregion
-        }
+        #region Generated Constructor
+        #endregion
+    }
 
-        #region Generated Properties
-        /// <summary>
-        /// Gets or sets the property value representing column 'Id'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Id'.
-        /// </value>
-        public Guid Id { get; set; }
+    #region Generated Properties
+    /// <summary>
+    /// Gets or sets the property value representing column 'Id'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Id'.
+    /// </value>
+    public Guid Id { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value representing column 'TokenHash'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'TokenHash'.
-        /// </value>
-        public string TokenHash { get; set; }
+    /// <summary>
+    /// Gets or sets the property value representing column 'TokenHash'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'TokenHash'.
+    /// </value>
+    public string TokenHash { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value representing column 'UserName'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'UserName'.
-        /// </value>
-        public string UserName { get; set; }
+    /// <summary>
+    /// Gets or sets the property value representing column 'UserName'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'UserName'.
+    /// </value>
+    public string UserName { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value representing column 'ClientId'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'ClientId'.
-        /// </value>
-        public string ClientId { get; set; }
+    /// <summary>
+    /// Gets or sets the property value representing column 'ClientId'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'ClientId'.
+    /// </value>
+    public string ClientId { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value representing column 'ProtectedTicket'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'ProtectedTicket'.
-        /// </value>
-        public string ProtectedTicket { get; set; }
+    /// <summary>
+    /// Gets or sets the property value representing column 'ProtectedTicket'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'ProtectedTicket'.
+    /// </value>
+    public string ProtectedTicket { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value representing column 'Issued'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Issued'.
-        /// </value>
-        public DateTimeOffset Issued { get; set; }
+    /// <summary>
+    /// Gets or sets the property value representing column 'Issued'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Issued'.
+    /// </value>
+    public DateTimeOffset Issued { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value representing column 'Expires'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Expires'.
-        /// </value>
-        public DateTimeOffset? Expires { get; set; }
+    /// <summary>
+    /// Gets or sets the property value representing column 'Expires'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Expires'.
+    /// </value>
+    public DateTimeOffset? Expires { get; set; }
 
-        #endregion
+    #endregion
 
-        #region Generated Relationships
-        #endregion
+    #region Generated Relationships
+    #endregion
 
-    }
 }
diff --git a/service/src/InstructorIQ.Core/Data/Entities/Role.cs b/service/src/InstructorIQ.Core/Data/Entities/Role.cs
index 240fd31b..7c5307c0 100644
--- a/service/src/InstructorIQ.Core/Data/Entities/Role.cs
+++ b/service/src/InstructorIQ.Core/Data/Entities/Role.cs
@@ -1,26 +1,27 @@
-using MediatR.CommandQuery.Definitions;
-using Microsoft.AspNetCore.Identity;
 using System;
 using System.Collections.Generic;
 
-namespace InstructorIQ.Core.Data.Entities
+using MediatR.CommandQuery.Definitions;
+
+using Microsoft.AspNetCore.Identity;
+
+namespace InstructorIQ.Core.Data.Entities;
+
+/// <summary>
+/// Entity class representing data for table 'Role'.
+/// </summary>
+public class Role : IdentityRole<Guid>, IHaveIdentifier<Guid>
 {
-    /// <summary>
-    /// Entity class representing data for table 'Role'.
-    /// </summary>
-    public class Role : IdentityRole<Guid>, IHaveIdentifier<Guid>
+    public Role() : this(null)
     {
-        public Role() : this(null)
-        {
-        }
+    }
 
-        public Role(string roleName) : base(roleName)
-        {
-            TenantUserRoles = new HashSet<TenantUserRole>();
-        }
+    public Role(string roleName) : base(roleName)
+    {
+        TenantUserRoles = new HashSet<TenantUserRole>();
+    }
 
-        public string Description { get; set; }
+    public string Description { get; set; }
 
-        public virtual ICollection<TenantUserRole> TenantUserRoles { get; set; }
-    }
+    public virtual ICollection<TenantUserRole> TenantUserRoles { get; set; }
 }
diff --git a/service/src/InstructorIQ.Core/Data/Entities/RoleClaim.cs b/service/src/InstructorIQ.Core/Data/Entities/RoleClaim.cs
index d6b564ad..35099975 100644
--- a/service/src/InstructorIQ.Core/Data/Entities/RoleClaim.cs
+++ b/service/src/InstructorIQ.Core/Data/Entities/RoleClaim.cs
@@ -1,12 +1,12 @@
 using System;
+
 using Microsoft.AspNetCore.Identity;
 
-namespace InstructorIQ.Core.Data.Entities
+namespace InstructorIQ.Core.Data.Entities;
+
+/// <summary>
+/// Entity class representing data for table 'RoleClaim'.
+/// </summary>
+public class RoleClaim : IdentityRoleClaim<Guid>
 {
-    /// <summary>
-    /// Entity class representing data for table 'RoleClaim'.
-    /// </summary>
-    public class RoleClaim : IdentityRoleClaim<Guid>
-    {
-    }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.Core/Data/Entities/Session.cs b/service/src/InstructorIQ.Core/Data/Entities/Session.cs
index f63d2ca7..167d5144 100644
--- a/service/src/InstructorIQ.Core/Data/Entities/Session.cs
+++ b/service/src/InstructorIQ.Core/Data/Entities/Session.cs
@@ -1,227 +1,227 @@
 using System;
 using System.Collections.Generic;
+
 using MediatR.CommandQuery.Definitions;
 
-namespace InstructorIQ.Core.Data.Entities
+namespace InstructorIQ.Core.Data.Entities;
+
+/// <summary>
+/// Entity class representing data for table 'Session'.
+/// </summary>
+public class Session : IHaveIdentifier<Guid>, ITrackCreated, ITrackUpdated, IHaveTenant<Guid>
 {
     /// <summary>
-    /// Entity class representing data for table 'Session'.
+    /// Initializes a new instance of the <see cref="Session"/> class.
     /// </summary>
-    public class Session : IHaveIdentifier<Guid>, ITrackCreated, ITrackUpdated, IHaveTenant<Guid>
+    public Session()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Session"/> class.
-        /// </summary>
-        public Session()
-        {
-            #region Generated Constructor
-            Attendances = new HashSet<Attendance>();
-            SessionInstructors = new HashSet<SessionInstructor>();
-            #endregion
-        }
-
-        #region Generated Properties
-        /// <summary>
-        /// Gets or sets the property value representing column 'Id'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Id'.
-        /// </value>
-        public Guid Id { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'Note'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Note'.
-        /// </value>
-        public string Note { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'StartDate'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'StartDate'.
-        /// </value>
-        public DateTime? StartDate { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'StartTime'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'StartTime'.
-        /// </value>
-        public TimeSpan? StartTime { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'EndDate'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'EndDate'.
-        /// </value>
-        public DateTime? EndDate { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'EndTime'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'EndTime'.
-        /// </value>
-        public TimeSpan? EndTime { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'TenantId'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'TenantId'.
-        /// </value>
-        public Guid TenantId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'TopicId'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'TopicId'.
-        /// </value>
-        public Guid TopicId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'LocationId'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'LocationId'.
-        /// </value>
-        public Guid? LocationId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'GroupId'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'GroupId'.
-        /// </value>
-        public Guid? GroupId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'LeadInstructorId'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'LeadInstructorId'.
-        /// </value>
-        public Guid? LeadInstructorId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'Created'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Created'.
-        /// </value>
-        public DateTimeOffset Created { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'CreatedBy'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'CreatedBy'.
-        /// </value>
-        public string CreatedBy { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'Updated'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Updated'.
-        /// </value>
-        public DateTimeOffset Updated { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'UpdatedBy'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'UpdatedBy'.
-        /// </value>
-        public string UpdatedBy { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'RowVersion'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'RowVersion'.
-        /// </value>
-        public Byte[] RowVersion { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'PeriodStart'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'PeriodStart'.
-        /// </value>
-        public DateTime PeriodStart { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'PeriodEnd'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'PeriodEnd'.
-        /// </value>
-        public DateTime PeriodEnd { get; set; }
-
+        #region Generated Constructor
+        Attendances = new HashSet<Attendance>();
+        SessionInstructors = new HashSet<SessionInstructor>();
         #endregion
+    }
 
-        #region Generated Relationships
-        /// <summary>
-        /// Gets or sets the navigation collection for entity <see cref="Attendance" />.
-        /// </summary>
-        /// <value>
-        /// The the navigation collection for entity <see cref="Attendance" />.
-        /// </value>
-        public virtual ICollection<Attendance> Attendances { get; set; }
-
-        /// <summary>
-        /// Gets or sets the navigation property for entity <see cref="Group" />.
-        /// </summary>
-        /// <value>
-        /// The the navigation property for entity <see cref="Group" />.
-        /// </value>
-        /// <seealso cref="GroupId" />
-        public virtual Group Group { get; set; }
-
-        /// <summary>
-        /// Gets or sets the navigation property for entity <see cref="Location" />.
-        /// </summary>
-        /// <value>
-        /// The the navigation property for entity <see cref="Location" />.
-        /// </value>
-        /// <seealso cref="LocationId" />
-        public virtual Location Location { get; set; }
-
-        /// <summary>
-        /// Gets or sets the navigation collection for entity <see cref="SessionInstructor" />.
-        /// </summary>
-        /// <value>
-        /// The the navigation collection for entity <see cref="SessionInstructor" />.
-        /// </value>
-        public virtual ICollection<SessionInstructor> SessionInstructors { get; set; }
-
-        /// <summary>
-        /// Gets or sets the navigation property for entity <see cref="Tenant" />.
-        /// </summary>
-        /// <value>
-        /// The the navigation property for entity <see cref="Tenant" />.
-        /// </value>
-        /// <seealso cref="TenantId" />
-        public virtual Tenant Tenant { get; set; }
-
-        /// <summary>
-        /// Gets or sets the navigation property for entity <see cref="Topic" />.
-        /// </summary>
-        /// <value>
-        /// The the navigation property for entity <see cref="Topic" />.
-        /// </value>
-        /// <seealso cref="TopicId" />
-        public virtual Topic Topic { get; set; }
+    #region Generated Properties
+    /// <summary>
+    /// Gets or sets the property value representing column 'Id'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Id'.
+    /// </value>
+    public Guid Id { get; set; }
 
-        #endregion
+    /// <summary>
+    /// Gets or sets the property value representing column 'Note'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Note'.
+    /// </value>
+    public string Note { get; set; }
 
-        public virtual User LeadInstructor { get; set; }
-    }
+    /// <summary>
+    /// Gets or sets the property value representing column 'StartDate'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'StartDate'.
+    /// </value>
+    public DateTime? StartDate { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'StartTime'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'StartTime'.
+    /// </value>
+    public TimeSpan? StartTime { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'EndDate'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'EndDate'.
+    /// </value>
+    public DateTime? EndDate { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'EndTime'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'EndTime'.
+    /// </value>
+    public TimeSpan? EndTime { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'TenantId'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'TenantId'.
+    /// </value>
+    public Guid TenantId { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'TopicId'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'TopicId'.
+    /// </value>
+    public Guid TopicId { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'LocationId'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'LocationId'.
+    /// </value>
+    public Guid? LocationId { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'GroupId'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'GroupId'.
+    /// </value>
+    public Guid? GroupId { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'LeadInstructorId'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'LeadInstructorId'.
+    /// </value>
+    public Guid? LeadInstructorId { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'Created'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Created'.
+    /// </value>
+    public DateTimeOffset Created { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'CreatedBy'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'CreatedBy'.
+    /// </value>
+    public string CreatedBy { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'Updated'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Updated'.
+    /// </value>
+    public DateTimeOffset Updated { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'UpdatedBy'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'UpdatedBy'.
+    /// </value>
+    public string UpdatedBy { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'RowVersion'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'RowVersion'.
+    /// </value>
+    public Byte[] RowVersion { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'PeriodStart'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'PeriodStart'.
+    /// </value>
+    public DateTime PeriodStart { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'PeriodEnd'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'PeriodEnd'.
+    /// </value>
+    public DateTime PeriodEnd { get; set; }
+
+    #endregion
+
+    #region Generated Relationships
+    /// <summary>
+    /// Gets or sets the navigation collection for entity <see cref="Attendance" />.
+    /// </summary>
+    /// <value>
+    /// The the navigation collection for entity <see cref="Attendance" />.
+    /// </value>
+    public virtual ICollection<Attendance> Attendances { get; set; }
+
+    /// <summary>
+    /// Gets or sets the navigation property for entity <see cref="Group" />.
+    /// </summary>
+    /// <value>
+    /// The the navigation property for entity <see cref="Group" />.
+    /// </value>
+    /// <seealso cref="GroupId" />
+    public virtual Group Group { get; set; }
+
+    /// <summary>
+    /// Gets or sets the navigation property for entity <see cref="Location" />.
+    /// </summary>
+    /// <value>
+    /// The the navigation property for entity <see cref="Location" />.
+    /// </value>
+    /// <seealso cref="LocationId" />
+    public virtual Location Location { get; set; }
+
+    /// <summary>
+    /// Gets or sets the navigation collection for entity <see cref="SessionInstructor" />.
+    /// </summary>
+    /// <value>
+    /// The the navigation collection for entity <see cref="SessionInstructor" />.
+    /// </value>
+    public virtual ICollection<SessionInstructor> SessionInstructors { get; set; }
+
+    /// <summary>
+    /// Gets or sets the navigation property for entity <see cref="Tenant" />.
+    /// </summary>
+    /// <value>
+    /// The the navigation property for entity <see cref="Tenant" />.
+    /// </value>
+    /// <seealso cref="TenantId" />
+    public virtual Tenant Tenant { get; set; }
+
+    /// <summary>
+    /// Gets or sets the navigation property for entity <see cref="Topic" />.
+    /// </summary>
+    /// <value>
+    /// The the navigation property for entity <see cref="Topic" />.
+    /// </value>
+    /// <seealso cref="TopicId" />
+    public virtual Topic Topic { get; set; }
+
+    #endregion
+
+    public virtual User LeadInstructor { get; set; }
 }
diff --git a/service/src/InstructorIQ.Core/Data/Entities/SessionInstructor.cs b/service/src/InstructorIQ.Core/Data/Entities/SessionInstructor.cs
index 5636f6f8..90dd8752 100644
--- a/service/src/InstructorIQ.Core/Data/Entities/SessionInstructor.cs
+++ b/service/src/InstructorIQ.Core/Data/Entities/SessionInstructor.cs
@@ -1,135 +1,135 @@
 using System;
 using System.Collections.Generic;
+
 using MediatR.CommandQuery.Definitions;
 
-namespace InstructorIQ.Core.Data.Entities
+namespace InstructorIQ.Core.Data.Entities;
+
+/// <summary>
+/// Entity class representing data for table 'SessionInstructor'.
+/// </summary>
+public class SessionInstructor : IHaveIdentifier<Guid>
 {
     /// <summary>
-    /// Entity class representing data for table 'SessionInstructor'.
+    /// Initializes a new instance of the <see cref="SessionInstructor"/> class.
     /// </summary>
-    public class SessionInstructor : IHaveIdentifier<Guid>
+    public SessionInstructor()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SessionInstructor"/> class.
-        /// </summary>
-        public SessionInstructor()
-        {
-            #region Generated Constructor
-            #endregion
-        }
-
-        #region Generated Properties
-        /// <summary>
-        /// Gets or sets the property value representing column 'Id'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Id'.
-        /// </value>
-        public Guid Id { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'SessionId'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'SessionId'.
-        /// </value>
-        public Guid SessionId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'InstructorId'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'InstructorId'.
-        /// </value>
-        public Guid InstructorId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'InstructorRoleId'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'InstructorRoleId'.
-        /// </value>
-        public Guid? InstructorRoleId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'Created'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Created'.
-        /// </value>
-        public DateTimeOffset Created { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'CreatedBy'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'CreatedBy'.
-        /// </value>
-        public string CreatedBy { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'Updated'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Updated'.
-        /// </value>
-        public DateTimeOffset Updated { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'UpdatedBy'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'UpdatedBy'.
-        /// </value>
-        public string UpdatedBy { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'RowVersion'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'RowVersion'.
-        /// </value>
-        public Byte[] RowVersion { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'PeriodStart'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'PeriodStart'.
-        /// </value>
-        public DateTime PeriodStart { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'PeriodEnd'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'PeriodEnd'.
-        /// </value>
-        public DateTime PeriodEnd { get; set; }
-
+        #region Generated Constructor
         #endregion
+    }
 
-        #region Generated Relationships
-        /// <summary>
-        /// Gets or sets the navigation property for entity <see cref="InstructorRole" />.
-        /// </summary>
-        /// <value>
-        /// The the navigation property for entity <see cref="InstructorRole" />.
-        /// </value>
-        /// <seealso cref="InstructorRoleId" />
-        public virtual InstructorRole InstructorRole { get; set; }
-
-        /// <summary>
-        /// Gets or sets the navigation property for entity <see cref="Session" />.
-        /// </summary>
-        /// <value>
-        /// The the navigation property for entity <see cref="Session" />.
-        /// </value>
-        /// <seealso cref="SessionId" />
-        public virtual Session Session { get; set; }
+    #region Generated Properties
+    /// <summary>
+    /// Gets or sets the property value representing column 'Id'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Id'.
+    /// </value>
+    public Guid Id { get; set; }
 
-        #endregion
+    /// <summary>
+    /// Gets or sets the property value representing column 'SessionId'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'SessionId'.
+    /// </value>
+    public Guid SessionId { get; set; }
 
-        public virtual User Instructor { get; set; }
-    }
+    /// <summary>
+    /// Gets or sets the property value representing column 'InstructorId'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'InstructorId'.
+    /// </value>
+    public Guid InstructorId { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'InstructorRoleId'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'InstructorRoleId'.
+    /// </value>
+    public Guid? InstructorRoleId { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'Created'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Created'.
+    /// </value>
+    public DateTimeOffset Created { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'CreatedBy'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'CreatedBy'.
+    /// </value>
+    public string CreatedBy { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'Updated'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Updated'.
+    /// </value>
+    public DateTimeOffset Updated { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'UpdatedBy'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'UpdatedBy'.
+    /// </value>
+    public string UpdatedBy { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'RowVersion'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'RowVersion'.
+    /// </value>
+    public Byte[] RowVersion { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'PeriodStart'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'PeriodStart'.
+    /// </value>
+    public DateTime PeriodStart { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'PeriodEnd'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'PeriodEnd'.
+    /// </value>
+    public DateTime PeriodEnd { get; set; }
+
+    #endregion
+
+    #region Generated Relationships
+    /// <summary>
+    /// Gets or sets the navigation property for entity <see cref="InstructorRole" />.
+    /// </summary>
+    /// <value>
+    /// The the navigation property for entity <see cref="InstructorRole" />.
+    /// </value>
+    /// <seealso cref="InstructorRoleId" />
+    public virtual InstructorRole InstructorRole { get; set; }
+
+    /// <summary>
+    /// Gets or sets the navigation property for entity <see cref="Session" />.
+    /// </summary>
+    /// <value>
+    /// The the navigation property for entity <see cref="Session" />.
+    /// </value>
+    /// <seealso cref="SessionId" />
+    public virtual Session Session { get; set; }
+
+    #endregion
+
+    public virtual User Instructor { get; set; }
 }
diff --git a/service/src/InstructorIQ.Core/Data/Entities/SignUp.cs b/service/src/InstructorIQ.Core/Data/Entities/SignUp.cs
index c6a1f2fb..b82f9ecf 100644
--- a/service/src/InstructorIQ.Core/Data/Entities/SignUp.cs
+++ b/service/src/InstructorIQ.Core/Data/Entities/SignUp.cs
@@ -1,118 +1,118 @@
 using System;
 using System.Collections.Generic;
+
 using MediatR.CommandQuery.Definitions;
 
-namespace InstructorIQ.Core.Data.Entities
+namespace InstructorIQ.Core.Data.Entities;
+
+/// <summary>
+/// Entity class representing data for table 'InstructorSignUp'.
+/// </summary>
+public partial class SignUp : IHaveIdentifier<Guid>, ITrackCreated, ITrackUpdated, IHaveTenant<Guid>
 {
     /// <summary>
-    /// Entity class representing data for table 'InstructorSignUp'.
+    /// Initializes a new instance of the <see cref="SignUp"/> class.
     /// </summary>
-    public partial class SignUp : IHaveIdentifier<Guid>, ITrackCreated, ITrackUpdated, IHaveTenant<Guid>
+    public SignUp()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SignUp"/> class.
-        /// </summary>
-        public SignUp()
-        {
-            #region Generated Constructor
-            SignUpTopics = new HashSet<SignUpTopic>();
-            #endregion
-        }
-
-        #region Generated Properties
-        /// <summary>
-        /// Gets or sets the property value representing column 'Id'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Id'.
-        /// </value>
-        public Guid Id { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'Name'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Name'.
-        /// </value>
-        public string Name { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'Description'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Description'.
-        /// </value>
-        public string Description { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'TenantId'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'TenantId'.
-        /// </value>
-        public Guid TenantId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'Created'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Created'.
-        /// </value>
-        public DateTimeOffset Created { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'CreatedBy'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'CreatedBy'.
-        /// </value>
-        public string CreatedBy { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'Updated'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Updated'.
-        /// </value>
-        public DateTimeOffset Updated { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'UpdatedBy'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'UpdatedBy'.
-        /// </value>
-        public string UpdatedBy { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'RowVersion'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'RowVersion'.
-        /// </value>
-        public Byte[] RowVersion { get; set; }
-
+        #region Generated Constructor
+        SignUpTopics = new HashSet<SignUpTopic>();
         #endregion
+    }
 
-        #region Generated Relationships
-        /// <summary>
-        /// Gets or sets the navigation collection for entity <see cref="SignUpTopic" />.
-        /// </summary>
-        /// <value>
-        /// The the navigation collection for entity <see cref="SignUpTopic" />.
-        /// </value>
-        public virtual ICollection<SignUpTopic> SignUpTopics { get; set; }
-
-        /// <summary>
-        /// Gets or sets the navigation property for entity <see cref="Tenant" />.
-        /// </summary>
-        /// <value>
-        /// The the navigation property for entity <see cref="Tenant" />.
-        /// </value>
-        /// <seealso cref="TenantId" />
-        public virtual Tenant Tenant { get; set; }
+    #region Generated Properties
+    /// <summary>
+    /// Gets or sets the property value representing column 'Id'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Id'.
+    /// </value>
+    public Guid Id { get; set; }
 
-        #endregion
+    /// <summary>
+    /// Gets or sets the property value representing column 'Name'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Name'.
+    /// </value>
+    public string Name { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'Description'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Description'.
+    /// </value>
+    public string Description { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'TenantId'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'TenantId'.
+    /// </value>
+    public Guid TenantId { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'Created'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Created'.
+    /// </value>
+    public DateTimeOffset Created { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'CreatedBy'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'CreatedBy'.
+    /// </value>
+    public string CreatedBy { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'Updated'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Updated'.
+    /// </value>
+    public DateTimeOffset Updated { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'UpdatedBy'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'UpdatedBy'.
+    /// </value>
+    public string UpdatedBy { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'RowVersion'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'RowVersion'.
+    /// </value>
+    public Byte[] RowVersion { get; set; }
+
+    #endregion
+
+    #region Generated Relationships
+    /// <summary>
+    /// Gets or sets the navigation collection for entity <see cref="SignUpTopic" />.
+    /// </summary>
+    /// <value>
+    /// The the navigation collection for entity <see cref="SignUpTopic" />.
+    /// </value>
+    public virtual ICollection<SignUpTopic> SignUpTopics { get; set; }
+
+    /// <summary>
+    /// Gets or sets the navigation property for entity <see cref="Tenant" />.
+    /// </summary>
+    /// <value>
+    /// The the navigation property for entity <see cref="Tenant" />.
+    /// </value>
+    /// <seealso cref="TenantId" />
+    public virtual Tenant Tenant { get; set; }
+
+    #endregion
 
-    }
 }
diff --git a/service/src/InstructorIQ.Core/Data/Entities/SignUpTopic.cs b/service/src/InstructorIQ.Core/Data/Entities/SignUpTopic.cs
index ca62bebd..7dcafe8c 100644
--- a/service/src/InstructorIQ.Core/Data/Entities/SignUpTopic.cs
+++ b/service/src/InstructorIQ.Core/Data/Entities/SignUpTopic.cs
@@ -1,110 +1,110 @@
 using System;
 using System.Collections.Generic;
+
 using MediatR.CommandQuery.Definitions;
 
-namespace InstructorIQ.Core.Data.Entities
+namespace InstructorIQ.Core.Data.Entities;
+
+/// <summary>
+/// Entity class representing data for table 'InstructorSignUpTopic'.
+/// </summary>
+public partial class SignUpTopic : IHaveIdentifier<Guid>, ITrackCreated, ITrackUpdated
 {
     /// <summary>
-    /// Entity class representing data for table 'InstructorSignUpTopic'.
+    /// Initializes a new instance of the <see cref="SignUpTopic"/> class.
     /// </summary>
-    public partial class SignUpTopic : IHaveIdentifier<Guid>, ITrackCreated, ITrackUpdated
+    public SignUpTopic()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SignUpTopic"/> class.
-        /// </summary>
-        public SignUpTopic()
-        {
-            #region Generated Constructor
-            #endregion
-        }
-
-        #region Generated Properties
-        /// <summary>
-        /// Gets or sets the property value representing column 'Id'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Id'.
-        /// </value>
-        public Guid Id { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'SignUpId'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'SignUpId'.
-        /// </value>
-        public Guid SignUpId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'TopicId'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'TopicId'.
-        /// </value>
-        public Guid TopicId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'Created'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Created'.
-        /// </value>
-        public DateTimeOffset Created { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'CreatedBy'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'CreatedBy'.
-        /// </value>
-        public string CreatedBy { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'Updated'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Updated'.
-        /// </value>
-        public DateTimeOffset Updated { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'UpdatedBy'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'UpdatedBy'.
-        /// </value>
-        public string UpdatedBy { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'RowVersion'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'RowVersion'.
-        /// </value>
-        public Byte[] RowVersion { get; set; }
-
+        #region Generated Constructor
         #endregion
+    }
 
-        #region Generated Relationships
-        /// <summary>
-        /// Gets or sets the navigation property for entity <see cref="SignUp" />.
-        /// </summary>
-        /// <value>
-        /// The the navigation property for entity <see cref="SignUp" />.
-        /// </value>
-        /// <seealso cref="SignUpId" />
-        public virtual SignUp SignUp { get; set; }
-
-        /// <summary>
-        /// Gets or sets the navigation property for entity <see cref="Topic" />.
-        /// </summary>
-        /// <value>
-        /// The the navigation property for entity <see cref="Topic" />.
-        /// </value>
-        /// <seealso cref="TopicId" />
-        public virtual Topic Topic { get; set; }
+    #region Generated Properties
+    /// <summary>
+    /// Gets or sets the property value representing column 'Id'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Id'.
+    /// </value>
+    public Guid Id { get; set; }
 
-        #endregion
+    /// <summary>
+    /// Gets or sets the property value representing column 'SignUpId'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'SignUpId'.
+    /// </value>
+    public Guid SignUpId { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'TopicId'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'TopicId'.
+    /// </value>
+    public Guid TopicId { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'Created'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Created'.
+    /// </value>
+    public DateTimeOffset Created { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'CreatedBy'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'CreatedBy'.
+    /// </value>
+    public string CreatedBy { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'Updated'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Updated'.
+    /// </value>
+    public DateTimeOffset Updated { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'UpdatedBy'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'UpdatedBy'.
+    /// </value>
+    public string UpdatedBy { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'RowVersion'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'RowVersion'.
+    /// </value>
+    public Byte[] RowVersion { get; set; }
+
+    #endregion
+
+    #region Generated Relationships
+    /// <summary>
+    /// Gets or sets the navigation property for entity <see cref="SignUp" />.
+    /// </summary>
+    /// <value>
+    /// The the navigation property for entity <see cref="SignUp" />.
+    /// </value>
+    /// <seealso cref="SignUpId" />
+    public virtual SignUp SignUp { get; set; }
+
+    /// <summary>
+    /// Gets or sets the navigation property for entity <see cref="Topic" />.
+    /// </summary>
+    /// <value>
+    /// The the navigation property for entity <see cref="Topic" />.
+    /// </value>
+    /// <seealso cref="TopicId" />
+    public virtual Topic Topic { get; set; }
+
+    #endregion
 
-    }
 }
diff --git a/service/src/InstructorIQ.Core/Data/Entities/Template.cs b/service/src/InstructorIQ.Core/Data/Entities/Template.cs
index b4cd8edb..c437a1d7 100644
--- a/service/src/InstructorIQ.Core/Data/Entities/Template.cs
+++ b/service/src/InstructorIQ.Core/Data/Entities/Template.cs
@@ -1,141 +1,141 @@
 using System;
 using System.Collections.Generic;
+
 using MediatR.CommandQuery.Definitions;
 
-namespace InstructorIQ.Core.Data.Entities
+namespace InstructorIQ.Core.Data.Entities;
+
+/// <summary>
+/// Entity class representing data for table 'Template'.
+/// </summary>
+public class Template : IHaveIdentifier<Guid>, ITrackCreated, ITrackUpdated, IHaveTenant<Guid>
 {
     /// <summary>
-    /// Entity class representing data for table 'Template'.
+    /// Initializes a new instance of the <see cref="Template"/> class.
     /// </summary>
-    public class Template : IHaveIdentifier<Guid>, ITrackCreated, ITrackUpdated, IHaveTenant<Guid>
+    public Template()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Template"/> class.
-        /// </summary>
-        public Template()
-        {
-            #region Generated Constructor
-            #endregion
-        }
-
-        #region Generated Properties
-        /// <summary>
-        /// Gets or sets the property value representing column 'Id'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Id'.
-        /// </value>
-        public Guid Id { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'Name'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Name'.
-        /// </value>
-        public string Name { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'Description'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Description'.
-        /// </value>
-        public string Description { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'TemplateBody'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'TemplateBody'.
-        /// </value>
-        public string TemplateBody { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'TemplateType'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'TemplateType'.
-        /// </value>
-        public string TemplateType { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'TenantId'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'TenantId'.
-        /// </value>
-        public Guid TenantId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'Created'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Created'.
-        /// </value>
-        public DateTimeOffset Created { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'CreatedBy'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'CreatedBy'.
-        /// </value>
-        public string CreatedBy { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'Updated'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Updated'.
-        /// </value>
-        public DateTimeOffset Updated { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'UpdatedBy'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'UpdatedBy'.
-        /// </value>
-        public string UpdatedBy { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'RowVersion'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'RowVersion'.
-        /// </value>
-        public Byte[] RowVersion { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'PeriodStart'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'PeriodStart'.
-        /// </value>
-        public DateTime PeriodStart { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'PeriodEnd'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'PeriodEnd'.
-        /// </value>
-        public DateTime PeriodEnd { get; set; }
-
+        #region Generated Constructor
         #endregion
+    }
 
-        #region Generated Relationships
-        /// <summary>
-        /// Gets or sets the navigation property for entity <see cref="Tenant" />.
-        /// </summary>
-        /// <value>
-        /// The the navigation property for entity <see cref="Tenant" />.
-        /// </value>
-        /// <seealso cref="TenantId" />
-        public virtual Tenant Tenant { get; set; }
+    #region Generated Properties
+    /// <summary>
+    /// Gets or sets the property value representing column 'Id'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Id'.
+    /// </value>
+    public Guid Id { get; set; }
 
-        #endregion
+    /// <summary>
+    /// Gets or sets the property value representing column 'Name'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Name'.
+    /// </value>
+    public string Name { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'Description'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Description'.
+    /// </value>
+    public string Description { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'TemplateBody'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'TemplateBody'.
+    /// </value>
+    public string TemplateBody { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'TemplateType'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'TemplateType'.
+    /// </value>
+    public string TemplateType { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'TenantId'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'TenantId'.
+    /// </value>
+    public Guid TenantId { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'Created'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Created'.
+    /// </value>
+    public DateTimeOffset Created { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'CreatedBy'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'CreatedBy'.
+    /// </value>
+    public string CreatedBy { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'Updated'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Updated'.
+    /// </value>
+    public DateTimeOffset Updated { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'UpdatedBy'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'UpdatedBy'.
+    /// </value>
+    public string UpdatedBy { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'RowVersion'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'RowVersion'.
+    /// </value>
+    public Byte[] RowVersion { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'PeriodStart'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'PeriodStart'.
+    /// </value>
+    public DateTime PeriodStart { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'PeriodEnd'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'PeriodEnd'.
+    /// </value>
+    public DateTime PeriodEnd { get; set; }
+
+    #endregion
+
+    #region Generated Relationships
+    /// <summary>
+    /// Gets or sets the navigation property for entity <see cref="Tenant" />.
+    /// </summary>
+    /// <value>
+    /// The the navigation property for entity <see cref="Tenant" />.
+    /// </value>
+    /// <seealso cref="TenantId" />
+    public virtual Tenant Tenant { get; set; }
+
+    #endregion
 
-    }
 }
diff --git a/service/src/InstructorIQ.Core/Data/Entities/Tenant.cs b/service/src/InstructorIQ.Core/Data/Entities/Tenant.cs
index a1389590..55692496 100644
--- a/service/src/InstructorIQ.Core/Data/Entities/Tenant.cs
+++ b/service/src/InstructorIQ.Core/Data/Entities/Tenant.cs
@@ -1,291 +1,291 @@
 using System;
 using System.Collections.Generic;
+
 using MediatR.CommandQuery.Definitions;
 
-namespace InstructorIQ.Core.Data.Entities
+namespace InstructorIQ.Core.Data.Entities;
+
+/// <summary>
+/// Entity class representing data for table 'Tenant'.
+/// </summary>
+public partial class Tenant : IHaveIdentifier<Guid>
 {
     /// <summary>
-    /// Entity class representing data for table 'Tenant'.
+    /// Initializes a new instance of the <see cref="Tenant"/> class.
     /// </summary>
-    public partial class Tenant : IHaveIdentifier<Guid>
+    public Tenant()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Tenant"/> class.
-        /// </summary>
-        public Tenant()
-        {
-            #region Generated Constructor
-            Attendances = new HashSet<Attendance>();
-            Discussions = new HashSet<Discussion>();
-            EmailDeliveries = new HashSet<EmailDelivery>();
-            EmailTemplates = new HashSet<EmailTemplate>();
-            Groups = new HashSet<Group>();
-            ImportJobs = new HashSet<ImportJob>();
-            InstructorRoles = new HashSet<InstructorRole>();
-            LinkTokens = new HashSet<LinkToken>();
-            Locations = new HashSet<Location>();
-            Notifications = new HashSet<Notification>();
-            Sessions = new HashSet<Session>();
-            SignUps = new HashSet<SignUp>();
-            Templates = new HashSet<Template>();
-            TenantUserRoles = new HashSet<TenantUserRole>();
-            Topics = new HashSet<Topic>();
-            #endregion
-        }
-
-        #region Generated Properties
-        /// <summary>
-        /// Gets or sets the property value representing column 'Id'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Id'.
-        /// </value>
-        public Guid Id { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'Name'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Name'.
-        /// </value>
-        public string Name { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'Slug'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Slug'.
-        /// </value>
-        public string Slug { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'Description'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Description'.
-        /// </value>
-        public string Description { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'City'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'City'.
-        /// </value>
-        public string City { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'StateProvince'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'StateProvince'.
-        /// </value>
-        public string StateProvince { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'TimeZone'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'TimeZone'.
-        /// </value>
-        public string TimeZone { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'DomainName'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'DomainName'.
-        /// </value>
-        public string DomainName { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'IsDeleted'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'IsDeleted'.
-        /// </value>
-        public bool IsDeleted { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'Created'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Created'.
-        /// </value>
-        public DateTimeOffset Created { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'CreatedBy'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'CreatedBy'.
-        /// </value>
-        public string CreatedBy { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'Updated'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Updated'.
-        /// </value>
-        public DateTimeOffset Updated { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'UpdatedBy'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'UpdatedBy'.
-        /// </value>
-        public string UpdatedBy { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'RowVersion'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'RowVersion'.
-        /// </value>
-        public Byte[] RowVersion { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'PeriodStart'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'PeriodStart'.
-        /// </value>
-        public DateTime PeriodStart { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'PeriodEnd'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'PeriodEnd'.
-        /// </value>
-        public DateTime PeriodEnd { get; set; }
-
+        #region Generated Constructor
+        Attendances = new HashSet<Attendance>();
+        Discussions = new HashSet<Discussion>();
+        EmailDeliveries = new HashSet<EmailDelivery>();
+        EmailTemplates = new HashSet<EmailTemplate>();
+        Groups = new HashSet<Group>();
+        ImportJobs = new HashSet<ImportJob>();
+        InstructorRoles = new HashSet<InstructorRole>();
+        LinkTokens = new HashSet<LinkToken>();
+        Locations = new HashSet<Location>();
+        Notifications = new HashSet<Notification>();
+        Sessions = new HashSet<Session>();
+        SignUps = new HashSet<SignUp>();
+        Templates = new HashSet<Template>();
+        TenantUserRoles = new HashSet<TenantUserRole>();
+        Topics = new HashSet<Topic>();
         #endregion
+    }
 
-        #region Generated Relationships
-        /// <summary>
-        /// Gets or sets the navigation collection for entity <see cref="Attendance" />.
-        /// </summary>
-        /// <value>
-        /// The the navigation collection for entity <see cref="Attendance" />.
-        /// </value>
-        public virtual ICollection<Attendance> Attendances { get; set; }
-
-        /// <summary>
-        /// Gets or sets the navigation collection for entity <see cref="Discussion" />.
-        /// </summary>
-        /// <value>
-        /// The the navigation collection for entity <see cref="Discussion" />.
-        /// </value>
-        public virtual ICollection<Discussion> Discussions { get; set; }
-
-        /// <summary>
-        /// Gets or sets the navigation collection for entity <see cref="EmailDelivery" />.
-        /// </summary>
-        /// <value>
-        /// The the navigation collection for entity <see cref="EmailDelivery" />.
-        /// </value>
-        public virtual ICollection<EmailDelivery> EmailDeliveries { get; set; }
-
-        /// <summary>
-        /// Gets or sets the navigation collection for entity <see cref="EmailTemplate" />.
-        /// </summary>
-        /// <value>
-        /// The the navigation collection for entity <see cref="EmailTemplate" />.
-        /// </value>
-        public virtual ICollection<EmailTemplate> EmailTemplates { get; set; }
-
-        /// <summary>
-        /// Gets or sets the navigation collection for entity <see cref="Group" />.
-        /// </summary>
-        /// <value>
-        /// The the navigation collection for entity <see cref="Group" />.
-        /// </value>
-        public virtual ICollection<Group> Groups { get; set; }
-
-        /// <summary>
-        /// Gets or sets the navigation collection for entity <see cref="ImportJob" />.
-        /// </summary>
-        /// <value>
-        /// The the navigation collection for entity <see cref="ImportJob" />.
-        /// </value>
-        public virtual ICollection<ImportJob> ImportJobs { get; set; }
-
-        /// <summary>
-        /// Gets or sets the navigation collection for entity <see cref="InstructorRole" />.
-        /// </summary>
-        /// <value>
-        /// The the navigation collection for entity <see cref="InstructorRole" />.
-        /// </value>
-        public virtual ICollection<InstructorRole> InstructorRoles { get; set; }
-
-        /// <summary>
-        /// Gets or sets the navigation collection for entity <see cref="LinkToken" />.
-        /// </summary>
-        /// <value>
-        /// The the navigation collection for entity <see cref="LinkToken" />.
-        /// </value>
-        public virtual ICollection<LinkToken> LinkTokens { get; set; }
-
-        /// <summary>
-        /// Gets or sets the navigation collection for entity <see cref="Location" />.
-        /// </summary>
-        /// <value>
-        /// The the navigation collection for entity <see cref="Location" />.
-        /// </value>
-        public virtual ICollection<Location> Locations { get; set; }
-
-        /// <summary>
-        /// Gets or sets the navigation collection for entity <see cref="Notification" />.
-        /// </summary>
-        /// <value>
-        /// The the navigation collection for entity <see cref="Notification" />.
-        /// </value>
-        public virtual ICollection<Notification> Notifications { get; set; }
-
-        /// <summary>
-        /// Gets or sets the navigation collection for entity <see cref="Session" />.
-        /// </summary>
-        /// <value>
-        /// The the navigation collection for entity <see cref="Session" />.
-        /// </value>
-        public virtual ICollection<Session> Sessions { get; set; }
-
-        /// <summary>
-        /// Gets or sets the navigation collection for entity <see cref="SignUp" />.
-        /// </summary>
-        /// <value>
-        /// The the navigation collection for entity <see cref="SignUp" />.
-        /// </value>
-        public virtual ICollection<SignUp> SignUps { get; set; }
-
-        /// <summary>
-        /// Gets or sets the navigation collection for entity <see cref="Template" />.
-        /// </summary>
-        /// <value>
-        /// The the navigation collection for entity <see cref="Template" />.
-        /// </value>
-        public virtual ICollection<Template> Templates { get; set; }
-
-        /// <summary>
-        /// Gets or sets the navigation collection for entity <see cref="TenantUserRole" />.
-        /// </summary>
-        /// <value>
-        /// The the navigation collection for entity <see cref="TenantUserRole" />.
-        /// </value>
-        public virtual ICollection<TenantUserRole> TenantUserRoles { get; set; }
-
-        /// <summary>
-        /// Gets or sets the navigation collection for entity <see cref="Topic" />.
-        /// </summary>
-        /// <value>
-        /// The the navigation collection for entity <see cref="Topic" />.
-        /// </value>
-        public virtual ICollection<Topic> Topics { get; set; }
+    #region Generated Properties
+    /// <summary>
+    /// Gets or sets the property value representing column 'Id'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Id'.
+    /// </value>
+    public Guid Id { get; set; }
 
-        #endregion
+    /// <summary>
+    /// Gets or sets the property value representing column 'Name'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Name'.
+    /// </value>
+    public string Name { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'Slug'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Slug'.
+    /// </value>
+    public string Slug { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'Description'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Description'.
+    /// </value>
+    public string Description { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'City'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'City'.
+    /// </value>
+    public string City { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'StateProvince'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'StateProvince'.
+    /// </value>
+    public string StateProvince { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'TimeZone'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'TimeZone'.
+    /// </value>
+    public string TimeZone { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'DomainName'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'DomainName'.
+    /// </value>
+    public string DomainName { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'IsDeleted'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'IsDeleted'.
+    /// </value>
+    public bool IsDeleted { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'Created'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Created'.
+    /// </value>
+    public DateTimeOffset Created { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'CreatedBy'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'CreatedBy'.
+    /// </value>
+    public string CreatedBy { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'Updated'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Updated'.
+    /// </value>
+    public DateTimeOffset Updated { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'UpdatedBy'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'UpdatedBy'.
+    /// </value>
+    public string UpdatedBy { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'RowVersion'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'RowVersion'.
+    /// </value>
+    public Byte[] RowVersion { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'PeriodStart'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'PeriodStart'.
+    /// </value>
+    public DateTime PeriodStart { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'PeriodEnd'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'PeriodEnd'.
+    /// </value>
+    public DateTime PeriodEnd { get; set; }
+
+    #endregion
+
+    #region Generated Relationships
+    /// <summary>
+    /// Gets or sets the navigation collection for entity <see cref="Attendance" />.
+    /// </summary>
+    /// <value>
+    /// The the navigation collection for entity <see cref="Attendance" />.
+    /// </value>
+    public virtual ICollection<Attendance> Attendances { get; set; }
+
+    /// <summary>
+    /// Gets or sets the navigation collection for entity <see cref="Discussion" />.
+    /// </summary>
+    /// <value>
+    /// The the navigation collection for entity <see cref="Discussion" />.
+    /// </value>
+    public virtual ICollection<Discussion> Discussions { get; set; }
+
+    /// <summary>
+    /// Gets or sets the navigation collection for entity <see cref="EmailDelivery" />.
+    /// </summary>
+    /// <value>
+    /// The the navigation collection for entity <see cref="EmailDelivery" />.
+    /// </value>
+    public virtual ICollection<EmailDelivery> EmailDeliveries { get; set; }
+
+    /// <summary>
+    /// Gets or sets the navigation collection for entity <see cref="EmailTemplate" />.
+    /// </summary>
+    /// <value>
+    /// The the navigation collection for entity <see cref="EmailTemplate" />.
+    /// </value>
+    public virtual ICollection<EmailTemplate> EmailTemplates { get; set; }
+
+    /// <summary>
+    /// Gets or sets the navigation collection for entity <see cref="Group" />.
+    /// </summary>
+    /// <value>
+    /// The the navigation collection for entity <see cref="Group" />.
+    /// </value>
+    public virtual ICollection<Group> Groups { get; set; }
+
+    /// <summary>
+    /// Gets or sets the navigation collection for entity <see cref="ImportJob" />.
+    /// </summary>
+    /// <value>
+    /// The the navigation collection for entity <see cref="ImportJob" />.
+    /// </value>
+    public virtual ICollection<ImportJob> ImportJobs { get; set; }
+
+    /// <summary>
+    /// Gets or sets the navigation collection for entity <see cref="InstructorRole" />.
+    /// </summary>
+    /// <value>
+    /// The the navigation collection for entity <see cref="InstructorRole" />.
+    /// </value>
+    public virtual ICollection<InstructorRole> InstructorRoles { get; set; }
+
+    /// <summary>
+    /// Gets or sets the navigation collection for entity <see cref="LinkToken" />.
+    /// </summary>
+    /// <value>
+    /// The the navigation collection for entity <see cref="LinkToken" />.
+    /// </value>
+    public virtual ICollection<LinkToken> LinkTokens { get; set; }
+
+    /// <summary>
+    /// Gets or sets the navigation collection for entity <see cref="Location" />.
+    /// </summary>
+    /// <value>
+    /// The the navigation collection for entity <see cref="Location" />.
+    /// </value>
+    public virtual ICollection<Location> Locations { get; set; }
+
+    /// <summary>
+    /// Gets or sets the navigation collection for entity <see cref="Notification" />.
+    /// </summary>
+    /// <value>
+    /// The the navigation collection for entity <see cref="Notification" />.
+    /// </value>
+    public virtual ICollection<Notification> Notifications { get; set; }
+
+    /// <summary>
+    /// Gets or sets the navigation collection for entity <see cref="Session" />.
+    /// </summary>
+    /// <value>
+    /// The the navigation collection for entity <see cref="Session" />.
+    /// </value>
+    public virtual ICollection<Session> Sessions { get; set; }
+
+    /// <summary>
+    /// Gets or sets the navigation collection for entity <see cref="SignUp" />.
+    /// </summary>
+    /// <value>
+    /// The the navigation collection for entity <see cref="SignUp" />.
+    /// </value>
+    public virtual ICollection<SignUp> SignUps { get; set; }
+
+    /// <summary>
+    /// Gets or sets the navigation collection for entity <see cref="Template" />.
+    /// </summary>
+    /// <value>
+    /// The the navigation collection for entity <see cref="Template" />.
+    /// </value>
+    public virtual ICollection<Template> Templates { get; set; }
+
+    /// <summary>
+    /// Gets or sets the navigation collection for entity <see cref="TenantUserRole" />.
+    /// </summary>
+    /// <value>
+    /// The the navigation collection for entity <see cref="TenantUserRole" />.
+    /// </value>
+    public virtual ICollection<TenantUserRole> TenantUserRoles { get; set; }
+
+    /// <summary>
+    /// Gets or sets the navigation collection for entity <see cref="Topic" />.
+    /// </summary>
+    /// <value>
+    /// The the navigation collection for entity <see cref="Topic" />.
+    /// </value>
+    public virtual ICollection<Topic> Topics { get; set; }
+
+    #endregion
 
-    }
 }
diff --git a/service/src/InstructorIQ.Core/Data/Entities/TenantUserRole.cs b/service/src/InstructorIQ.Core/Data/Entities/TenantUserRole.cs
index 5c540944..114c22e9 100644
--- a/service/src/InstructorIQ.Core/Data/Entities/TenantUserRole.cs
+++ b/service/src/InstructorIQ.Core/Data/Entities/TenantUserRole.cs
@@ -1,71 +1,70 @@
 using System;
 using System.Collections.Generic;
 
-namespace InstructorIQ.Core.Data.Entities
+namespace InstructorIQ.Core.Data.Entities;
+
+/// <summary>
+/// Entity class representing data for table 'TenantUserRole'.
+/// </summary>
+public partial class TenantUserRole
 {
     /// <summary>
-    /// Entity class representing data for table 'TenantUserRole'.
+    /// Initializes a new instance of the <see cref="TenantUserRole"/> class.
     /// </summary>
-    public partial class TenantUserRole
+    public TenantUserRole()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TenantUserRole"/> class.
-        /// </summary>
-        public TenantUserRole()
-        {
-            #region Generated Constructor
-            #endregion
-        }
+        #region Generated Constructor
+        #endregion
+    }
 
-        #region Generated Properties
-        /// <summary>
-        /// Gets or sets the property value representing column 'Id'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Id'.
-        /// </value>
-        public Guid Id { get; set; }
+    #region Generated Properties
+    /// <summary>
+    /// Gets or sets the property value representing column 'Id'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Id'.
+    /// </value>
+    public Guid Id { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value representing column 'TenantId'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'TenantId'.
-        /// </value>
-        public Guid TenantId { get; set; }
+    /// <summary>
+    /// Gets or sets the property value representing column 'TenantId'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'TenantId'.
+    /// </value>
+    public Guid TenantId { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value representing column 'UserId'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'UserId'.
-        /// </value>
-        public Guid UserId { get; set; }
+    /// <summary>
+    /// Gets or sets the property value representing column 'UserId'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'UserId'.
+    /// </value>
+    public Guid UserId { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value representing column 'RoleId'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'RoleId'.
-        /// </value>
-        public Guid RoleId { get; set; }
+    /// <summary>
+    /// Gets or sets the property value representing column 'RoleId'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'RoleId'.
+    /// </value>
+    public Guid RoleId { get; set; }
 
-        #endregion
+    #endregion
 
-        #region Generated Relationships
-        /// <summary>
-        /// Gets or sets the navigation property for entity <see cref="Tenant" />.
-        /// </summary>
-        /// <value>
-        /// The the navigation property for entity <see cref="Tenant" />.
-        /// </value>
-        /// <seealso cref="TenantId" />
-        public virtual Tenant Tenant { get; set; }
+    #region Generated Relationships
+    /// <summary>
+    /// Gets or sets the navigation property for entity <see cref="Tenant" />.
+    /// </summary>
+    /// <value>
+    /// The the navigation property for entity <see cref="Tenant" />.
+    /// </value>
+    /// <seealso cref="TenantId" />
+    public virtual Tenant Tenant { get; set; }
 
-        #endregion
+    #endregion
 
-        public virtual User User { get; set; }
+    public virtual User User { get; set; }
 
-        public virtual Role Role { get; set; }
-    }
+    public virtual Role Role { get; set; }
 }
diff --git a/service/src/InstructorIQ.Core/Data/Entities/Topic.cs b/service/src/InstructorIQ.Core/Data/Entities/Topic.cs
index fdda5f4d..f54ce42a 100644
--- a/service/src/InstructorIQ.Core/Data/Entities/Topic.cs
+++ b/service/src/InstructorIQ.Core/Data/Entities/Topic.cs
@@ -1,234 +1,234 @@
 using System;
 using System.Collections.Generic;
+
 using MediatR.CommandQuery.Definitions;
 
-namespace InstructorIQ.Core.Data.Entities
+namespace InstructorIQ.Core.Data.Entities;
+
+/// <summary>
+/// Entity class representing data for table 'Topic'.
+/// </summary>
+public class Topic : IHaveIdentifier<Guid>, ITrackCreated, ITrackUpdated, IHaveTenant<Guid>
 {
     /// <summary>
-    /// Entity class representing data for table 'Topic'.
+    /// Initializes a new instance of the <see cref="Topic"/> class.
     /// </summary>
-    public class Topic : IHaveIdentifier<Guid>, ITrackCreated, ITrackUpdated, IHaveTenant<Guid>
+    public Topic()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Topic"/> class.
-        /// </summary>
-        public Topic()
-        {
-            #region Generated Constructor
-            Discussions = new HashSet<Discussion>();
-            Sessions = new HashSet<Session>();
-            SignUpTopics = new HashSet<SignUpTopic>();
-            TopicInstructors = new HashSet<TopicInstructor>();
-            #endregion
-        }
-
-        #region Generated Properties
-        /// <summary>
-        /// Gets or sets the property value representing column 'Id'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Id'.
-        /// </value>
-        public Guid Id { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'Title'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Title'.
-        /// </value>
-        public string Title { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'Summary'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Summary'.
-        /// </value>
-        public string Summary { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'Description'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Description'.
-        /// </value>
-        public string Description { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'TenantId'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'TenantId'.
-        /// </value>
-        public Guid TenantId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'LeadInstructorId'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'LeadInstructorId'.
-        /// </value>
-        public Guid? LeadInstructorId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'LessonPlan'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'LessonPlan'.
-        /// </value>
-        public string LessonPlan { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'Notes'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Notes'.
-        /// </value>
-        public string Notes { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'IsRequired'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'IsRequired'.
-        /// </value>
-        public bool IsRequired { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'IsPublished'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'IsPublished'.
-        /// </value>
-        public bool IsPublished { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'InstructorSlots'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'InstructorSlots'.
-        /// </value>
-        public int? InstructorSlots { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'CalendarYear'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'CalendarYear'.
-        /// </value>
-        public short CalendarYear { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'TargetMonth'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'TargetMonth'.
-        /// </value>
-        public short? TargetMonth { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'Created'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Created'.
-        /// </value>
-        public DateTimeOffset Created { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'CreatedBy'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'CreatedBy'.
-        /// </value>
-        public string CreatedBy { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'Updated'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Updated'.
-        /// </value>
-        public DateTimeOffset Updated { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'UpdatedBy'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'UpdatedBy'.
-        /// </value>
-        public string UpdatedBy { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'RowVersion'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'RowVersion'.
-        /// </value>
-        public Byte[] RowVersion { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'PeriodStart'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'PeriodStart'.
-        /// </value>
-        public DateTime PeriodStart { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'PeriodEnd'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'PeriodEnd'.
-        /// </value>
-        public DateTime PeriodEnd { get; set; }
-
+        #region Generated Constructor
+        Discussions = new HashSet<Discussion>();
+        Sessions = new HashSet<Session>();
+        SignUpTopics = new HashSet<SignUpTopic>();
+        TopicInstructors = new HashSet<TopicInstructor>();
         #endregion
+    }
 
-        #region Generated Relationships
-        /// <summary>
-        /// Gets or sets the navigation collection for entity <see cref="Discussion" />.
-        /// </summary>
-        /// <value>
-        /// The the navigation collection for entity <see cref="Discussion" />.
-        /// </value>
-        public virtual ICollection<Discussion> Discussions { get; set; }
-
-        /// <summary>
-        /// Gets or sets the navigation collection for entity <see cref="Session" />.
-        /// </summary>
-        /// <value>
-        /// The the navigation collection for entity <see cref="Session" />.
-        /// </value>
-        public virtual ICollection<Session> Sessions { get; set; }
-
-        /// <summary>
-        /// Gets or sets the navigation collection for entity <see cref="SignUpTopic" />.
-        /// </summary>
-        /// <value>
-        /// The the navigation collection for entity <see cref="SignUpTopic" />.
-        /// </value>
-        public virtual ICollection<SignUpTopic> SignUpTopics { get; set; }
-
-        /// <summary>
-        /// Gets or sets the navigation property for entity <see cref="Tenant" />.
-        /// </summary>
-        /// <value>
-        /// The the navigation property for entity <see cref="Tenant" />.
-        /// </value>
-        /// <seealso cref="TenantId" />
-        public virtual Tenant Tenant { get; set; }
-
-        /// <summary>
-        /// Gets or sets the navigation collection for entity <see cref="TopicInstructor" />.
-        /// </summary>
-        /// <value>
-        /// The the navigation collection for entity <see cref="TopicInstructor" />.
-        /// </value>
-        public virtual ICollection<TopicInstructor> TopicInstructors { get; set; }
+    #region Generated Properties
+    /// <summary>
+    /// Gets or sets the property value representing column 'Id'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Id'.
+    /// </value>
+    public Guid Id { get; set; }
 
-        #endregion
+    /// <summary>
+    /// Gets or sets the property value representing column 'Title'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Title'.
+    /// </value>
+    public string Title { get; set; }
 
-        public virtual User LeadInstructor { get; set; }
-    }
+    /// <summary>
+    /// Gets or sets the property value representing column 'Summary'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Summary'.
+    /// </value>
+    public string Summary { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'Description'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Description'.
+    /// </value>
+    public string Description { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'TenantId'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'TenantId'.
+    /// </value>
+    public Guid TenantId { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'LeadInstructorId'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'LeadInstructorId'.
+    /// </value>
+    public Guid? LeadInstructorId { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'LessonPlan'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'LessonPlan'.
+    /// </value>
+    public string LessonPlan { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'Notes'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Notes'.
+    /// </value>
+    public string Notes { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'IsRequired'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'IsRequired'.
+    /// </value>
+    public bool IsRequired { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'IsPublished'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'IsPublished'.
+    /// </value>
+    public bool IsPublished { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'InstructorSlots'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'InstructorSlots'.
+    /// </value>
+    public int? InstructorSlots { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'CalendarYear'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'CalendarYear'.
+    /// </value>
+    public short CalendarYear { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'TargetMonth'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'TargetMonth'.
+    /// </value>
+    public short? TargetMonth { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'Created'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Created'.
+    /// </value>
+    public DateTimeOffset Created { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'CreatedBy'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'CreatedBy'.
+    /// </value>
+    public string CreatedBy { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'Updated'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Updated'.
+    /// </value>
+    public DateTimeOffset Updated { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'UpdatedBy'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'UpdatedBy'.
+    /// </value>
+    public string UpdatedBy { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'RowVersion'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'RowVersion'.
+    /// </value>
+    public Byte[] RowVersion { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'PeriodStart'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'PeriodStart'.
+    /// </value>
+    public DateTime PeriodStart { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'PeriodEnd'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'PeriodEnd'.
+    /// </value>
+    public DateTime PeriodEnd { get; set; }
+
+    #endregion
+
+    #region Generated Relationships
+    /// <summary>
+    /// Gets or sets the navigation collection for entity <see cref="Discussion" />.
+    /// </summary>
+    /// <value>
+    /// The the navigation collection for entity <see cref="Discussion" />.
+    /// </value>
+    public virtual ICollection<Discussion> Discussions { get; set; }
+
+    /// <summary>
+    /// Gets or sets the navigation collection for entity <see cref="Session" />.
+    /// </summary>
+    /// <value>
+    /// The the navigation collection for entity <see cref="Session" />.
+    /// </value>
+    public virtual ICollection<Session> Sessions { get; set; }
+
+    /// <summary>
+    /// Gets or sets the navigation collection for entity <see cref="SignUpTopic" />.
+    /// </summary>
+    /// <value>
+    /// The the navigation collection for entity <see cref="SignUpTopic" />.
+    /// </value>
+    public virtual ICollection<SignUpTopic> SignUpTopics { get; set; }
+
+    /// <summary>
+    /// Gets or sets the navigation property for entity <see cref="Tenant" />.
+    /// </summary>
+    /// <value>
+    /// The the navigation property for entity <see cref="Tenant" />.
+    /// </value>
+    /// <seealso cref="TenantId" />
+    public virtual Tenant Tenant { get; set; }
+
+    /// <summary>
+    /// Gets or sets the navigation collection for entity <see cref="TopicInstructor" />.
+    /// </summary>
+    /// <value>
+    /// The the navigation collection for entity <see cref="TopicInstructor" />.
+    /// </value>
+    public virtual ICollection<TopicInstructor> TopicInstructors { get; set; }
+
+    #endregion
+
+    public virtual User LeadInstructor { get; set; }
 }
diff --git a/service/src/InstructorIQ.Core/Data/Entities/TopicInstructor.cs b/service/src/InstructorIQ.Core/Data/Entities/TopicInstructor.cs
index 36dac82c..be24c954 100644
--- a/service/src/InstructorIQ.Core/Data/Entities/TopicInstructor.cs
+++ b/service/src/InstructorIQ.Core/Data/Entities/TopicInstructor.cs
@@ -1,135 +1,135 @@
 using System;
 using System.Collections.Generic;
+
 using MediatR.CommandQuery.Definitions;
 
-namespace InstructorIQ.Core.Data.Entities
+namespace InstructorIQ.Core.Data.Entities;
+
+/// <summary>
+/// Entity class representing data for table 'TopicInstructor'.
+/// </summary>
+public partial class TopicInstructor : IHaveIdentifier<Guid>, ITrackCreated, ITrackUpdated
 {
     /// <summary>
-    /// Entity class representing data for table 'TopicInstructor'.
+    /// Initializes a new instance of the <see cref="TopicInstructor"/> class.
     /// </summary>
-    public partial class TopicInstructor : IHaveIdentifier<Guid>, ITrackCreated, ITrackUpdated
+    public TopicInstructor()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TopicInstructor"/> class.
-        /// </summary>
-        public TopicInstructor()
-        {
-            #region Generated Constructor
-            #endregion
-        }
-
-        #region Generated Properties
-        /// <summary>
-        /// Gets or sets the property value representing column 'Id'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Id'.
-        /// </value>
-        public Guid Id { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'TopicId'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'TopicId'.
-        /// </value>
-        public Guid TopicId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'InstructorId'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'InstructorId'.
-        /// </value>
-        public Guid InstructorId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'InstructorRoleId'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'InstructorRoleId'.
-        /// </value>
-        public Guid? InstructorRoleId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'Created'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Created'.
-        /// </value>
-        public DateTimeOffset Created { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'CreatedBy'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'CreatedBy'.
-        /// </value>
-        public string CreatedBy { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'Updated'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'Updated'.
-        /// </value>
-        public DateTimeOffset Updated { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'UpdatedBy'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'UpdatedBy'.
-        /// </value>
-        public string UpdatedBy { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'RowVersion'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'RowVersion'.
-        /// </value>
-        public Byte[] RowVersion { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'PeriodStart'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'PeriodStart'.
-        /// </value>
-        public DateTime PeriodStart { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value representing column 'PeriodEnd'.
-        /// </summary>
-        /// <value>
-        /// The property value representing column 'PeriodEnd'.
-        /// </value>
-        public DateTime PeriodEnd { get; set; }
-
+        #region Generated Constructor
         #endregion
+    }
 
-        #region Generated Relationships
-        /// <summary>
-        /// Gets or sets the navigation property for entity <see cref="InstructorRole" />.
-        /// </summary>
-        /// <value>
-        /// The the navigation property for entity <see cref="InstructorRole" />.
-        /// </value>
-        /// <seealso cref="InstructorRoleId" />
-        public virtual InstructorRole InstructorRole { get; set; }
-
-        /// <summary>
-        /// Gets or sets the navigation property for entity <see cref="Topic" />.
-        /// </summary>
-        /// <value>
-        /// The the navigation property for entity <see cref="Topic" />.
-        /// </value>
-        /// <seealso cref="TopicId" />
-        public virtual Topic Topic { get; set; }
+    #region Generated Properties
+    /// <summary>
+    /// Gets or sets the property value representing column 'Id'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Id'.
+    /// </value>
+    public Guid Id { get; set; }
 
-        #endregion
+    /// <summary>
+    /// Gets or sets the property value representing column 'TopicId'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'TopicId'.
+    /// </value>
+    public Guid TopicId { get; set; }
 
-        public virtual User Instructor { get; set; }
-    }
+    /// <summary>
+    /// Gets or sets the property value representing column 'InstructorId'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'InstructorId'.
+    /// </value>
+    public Guid InstructorId { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'InstructorRoleId'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'InstructorRoleId'.
+    /// </value>
+    public Guid? InstructorRoleId { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'Created'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Created'.
+    /// </value>
+    public DateTimeOffset Created { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'CreatedBy'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'CreatedBy'.
+    /// </value>
+    public string CreatedBy { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'Updated'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'Updated'.
+    /// </value>
+    public DateTimeOffset Updated { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'UpdatedBy'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'UpdatedBy'.
+    /// </value>
+    public string UpdatedBy { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'RowVersion'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'RowVersion'.
+    /// </value>
+    public Byte[] RowVersion { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'PeriodStart'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'PeriodStart'.
+    /// </value>
+    public DateTime PeriodStart { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value representing column 'PeriodEnd'.
+    /// </summary>
+    /// <value>
+    /// The property value representing column 'PeriodEnd'.
+    /// </value>
+    public DateTime PeriodEnd { get; set; }
+
+    #endregion
+
+    #region Generated Relationships
+    /// <summary>
+    /// Gets or sets the navigation property for entity <see cref="InstructorRole" />.
+    /// </summary>
+    /// <value>
+    /// The the navigation property for entity <see cref="InstructorRole" />.
+    /// </value>
+    /// <seealso cref="InstructorRoleId" />
+    public virtual InstructorRole InstructorRole { get; set; }
+
+    /// <summary>
+    /// Gets or sets the navigation property for entity <see cref="Topic" />.
+    /// </summary>
+    /// <value>
+    /// The the navigation property for entity <see cref="Topic" />.
+    /// </value>
+    /// <seealso cref="TopicId" />
+    public virtual Topic Topic { get; set; }
+
+    #endregion
+
+    public virtual User Instructor { get; set; }
 }
diff --git a/service/src/InstructorIQ.Core/Data/Entities/User.cs b/service/src/InstructorIQ.Core/Data/Entities/User.cs
index 8ef8989d..806e1adc 100644
--- a/service/src/InstructorIQ.Core/Data/Entities/User.cs
+++ b/service/src/InstructorIQ.Core/Data/Entities/User.cs
@@ -1,53 +1,54 @@
 using System;
 using System.Collections.Generic;
+
 using MediatR.CommandQuery.Definitions;
+
 using Microsoft.AspNetCore.Identity;
 
-namespace InstructorIQ.Core.Data.Entities
+namespace InstructorIQ.Core.Data.Entities;
+
+/// <summary>
+/// Entity class representing data for table 'User'.
+/// </summary>
+public class User : IdentityUser<Guid>, IHaveIdentifier<Guid>
 {
-    /// <summary>
-    /// Entity class representing data for table 'User'.
-    /// </summary>
-    public class User : IdentityUser<Guid>, IHaveIdentifier<Guid>
+    public User() : this(null)
     {
-        public User() : this(null)
-        {
-        }
+    }
 
-        public User(string userName) : base(userName)
-        {
-            LeadTopics = new HashSet<Topic>();
-            TopicInstructors = new HashSet<TopicInstructor>();
-            LeadSessions = new HashSet<Session>();
-            SessionInstructors = new HashSet<SessionInstructor>();
-            TenantUserRoles = new HashSet<TenantUserRole>();
-        }
+    public User(string userName) : base(userName)
+    {
+        LeadTopics = new HashSet<Topic>();
+        TopicInstructors = new HashSet<TopicInstructor>();
+        LeadSessions = new HashSet<Session>();
+        SessionInstructors = new HashSet<SessionInstructor>();
+        TenantUserRoles = new HashSet<TenantUserRole>();
+    }
 
-        public string GivenName { get; set; }
+    public string GivenName { get; set; }
 
-        public string MiddleName { get; set; }
+    public string MiddleName { get; set; }
 
-        public string FamilyName { get; set; }
+    public string FamilyName { get; set; }
 
-        public string DisplayName { get; set; } = string.Empty;
+    public string DisplayName { get; set; } = string.Empty;
 
-        public string SortName { get; set; } = string.Empty;
+    public string SortName { get; set; } = string.Empty;
 
-        public string JobTitle { get; set; }
+    public string JobTitle { get; set; }
 
-        public Guid? LastTenantId { get; set; }
+    public Guid? LastTenantId { get; set; }
 
-        public bool IsGlobalAdministrator { get; set; }
+    public bool IsGlobalAdministrator { get; set; }
 
 
-        public virtual ICollection<Topic> LeadTopics { get; set; }
+    public virtual ICollection<Topic> LeadTopics { get; set; }
 
-        public virtual ICollection<TopicInstructor> TopicInstructors { get; set; }
+    public virtual ICollection<TopicInstructor> TopicInstructors { get; set; }
 
-        public virtual ICollection<Session> LeadSessions { get; set; }
+    public virtual ICollection<Session> LeadSessions { get; set; }
 
-        public virtual ICollection<SessionInstructor> SessionInstructors { get; set; }
+    public virtual ICollection<SessionInstructor> SessionInstructors { get; set; }
 
-        public virtual ICollection<TenantUserRole> TenantUserRoles { get; set; }
-    }
+    public virtual ICollection<TenantUserRole> TenantUserRoles { get; set; }
 }
diff --git a/service/src/InstructorIQ.Core/Data/Entities/UserClaim.cs b/service/src/InstructorIQ.Core/Data/Entities/UserClaim.cs
index 8415bd76..793fe2a0 100644
--- a/service/src/InstructorIQ.Core/Data/Entities/UserClaim.cs
+++ b/service/src/InstructorIQ.Core/Data/Entities/UserClaim.cs
@@ -1,12 +1,12 @@
 using System;
+
 using Microsoft.AspNetCore.Identity;
 
-namespace InstructorIQ.Core.Data.Entities
+namespace InstructorIQ.Core.Data.Entities;
+
+/// <summary>
+/// Entity class representing data for table 'UserClaim'.
+/// </summary>
+public class UserClaim : IdentityUserClaim<Guid>
 {
-    /// <summary>
-    /// Entity class representing data for table 'UserClaim'.
-    /// </summary>
-    public class UserClaim : IdentityUserClaim<Guid>
-    {
-    }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.Core/Data/Entities/UserLogin.cs b/service/src/InstructorIQ.Core/Data/Entities/UserLogin.cs
index 4bf6e010..f886f003 100644
--- a/service/src/InstructorIQ.Core/Data/Entities/UserLogin.cs
+++ b/service/src/InstructorIQ.Core/Data/Entities/UserLogin.cs
@@ -1,12 +1,12 @@
 using System;
+
 using Microsoft.AspNetCore.Identity;
 
-namespace InstructorIQ.Core.Data.Entities
+namespace InstructorIQ.Core.Data.Entities;
+
+/// <summary>
+/// Entity class representing data for table 'UserLogin'.
+/// </summary>
+public class UserLogin : IdentityUserLogin<Guid>
 {
-    /// <summary>
-    /// Entity class representing data for table 'UserLogin'.
-    /// </summary>
-    public class UserLogin : IdentityUserLogin<Guid>
-    {
-    }
 }
diff --git a/service/src/InstructorIQ.Core/Data/Entities/UserRole.cs b/service/src/InstructorIQ.Core/Data/Entities/UserRole.cs
index ddfa96a0..81e0167c 100644
--- a/service/src/InstructorIQ.Core/Data/Entities/UserRole.cs
+++ b/service/src/InstructorIQ.Core/Data/Entities/UserRole.cs
@@ -1,12 +1,12 @@
 using System;
+
 using Microsoft.AspNetCore.Identity;
 
-namespace InstructorIQ.Core.Data.Entities
+namespace InstructorIQ.Core.Data.Entities;
+
+/// <summary>
+/// Entity class representing data for table 'UserRole'.
+/// </summary>
+public class UserRole : IdentityUserRole<Guid>
 {
-    /// <summary>
-    /// Entity class representing data for table 'UserRole'.
-    /// </summary>
-    public class UserRole : IdentityUserRole<Guid>
-    {
-    }
 }
diff --git a/service/src/InstructorIQ.Core/Data/Entities/UserToken.cs b/service/src/InstructorIQ.Core/Data/Entities/UserToken.cs
index 61f07d9d..2f78ade5 100644
--- a/service/src/InstructorIQ.Core/Data/Entities/UserToken.cs
+++ b/service/src/InstructorIQ.Core/Data/Entities/UserToken.cs
@@ -1,12 +1,12 @@
 using System;
+
 using Microsoft.AspNetCore.Identity;
 
-namespace InstructorIQ.Core.Data.Entities
+namespace InstructorIQ.Core.Data.Entities;
+
+/// <summary>
+/// Entity class representing data for table 'UserToken'.
+/// </summary>
+public class UserToken : IdentityUserToken<Guid>
 {
-    /// <summary>
-    /// Entity class representing data for table 'UserToken'.
-    /// </summary>
-    public class UserToken : IdentityUserToken<Guid>
-    {
-    }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.Core/Data/InstructorIQContext.cs b/service/src/InstructorIQ.Core/Data/InstructorIQContext.cs
index 3c1a2796..cdab26b2 100644
--- a/service/src/InstructorIQ.Core/Data/InstructorIQContext.cs
+++ b/service/src/InstructorIQ.Core/Data/InstructorIQContext.cs
@@ -1,245 +1,246 @@
 using System;
+
 using InstructorIQ.Core.Data.Entities;
+
 using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata;
 
-namespace InstructorIQ.Core.Data
+namespace InstructorIQ.Core.Data;
+
+/// <summary>
+/// A <see cref="DbContext" /> instance represents a session with the database and can be used to query and save instances of entities.
+/// </summary>
+public class InstructorIQContext : IdentityDbContext<User, Role, Guid, UserClaim, UserRole, UserLogin, RoleClaim, UserToken>
 {
     /// <summary>
-    /// A <see cref="DbContext" /> instance represents a session with the database and can be used to query and save instances of entities.
+    /// Initializes a new instance of the <see cref="InstructorIQContext"/> class.
     /// </summary>
-    public class InstructorIQContext : IdentityDbContext<User, Role, Guid, UserClaim, UserRole, UserLogin, RoleClaim, UserToken>
+    /// <param name="options">The options to be used by this <see cref="DbContext" />.</param>
+    public InstructorIQContext(DbContextOptions<InstructorIQContext> options)
+        : base(options)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="InstructorIQContext"/> class.
-        /// </summary>
-        /// <param name="options">The options to be used by this <see cref="DbContext" />.</param>
-        public InstructorIQContext(DbContextOptions<InstructorIQContext> options)
-            : base(options)
-        {
-        }
-
-        #region Generated Properties
-        /// <summary>
-        /// Gets or sets the <see cref="T:Microsoft.EntityFrameworkCore.DbSet`1" /> that can be used to query and save instances of <see cref="InstructorIQ.Core.Data.Entities.Attendance"/>.
-        /// </summary>
-        /// <value>
-        /// The <see cref="T:Microsoft.EntityFrameworkCore.DbSet`1" /> that can be used to query and save instances of <see cref="InstructorIQ.Core.Data.Entities.Attendance"/>.
-        /// </value>
-        public virtual DbSet<InstructorIQ.Core.Data.Entities.Attendance> Attendances { get; set; }
-
-        /// <summary>
-        /// Gets or sets the <see cref="T:Microsoft.EntityFrameworkCore.DbSet`1" /> that can be used to query and save instances of <see cref="InstructorIQ.Core.Data.Entities.AuthenticationEvent"/>.
-        /// </summary>
-        /// <value>
-        /// The <see cref="T:Microsoft.EntityFrameworkCore.DbSet`1" /> that can be used to query and save instances of <see cref="InstructorIQ.Core.Data.Entities.AuthenticationEvent"/>.
-        /// </value>
-        public virtual DbSet<InstructorIQ.Core.Data.Entities.AuthenticationEvent> AuthenticationEvents { get; set; }
-
-        /// <summary>
-        /// Gets or sets the <see cref="T:Microsoft.EntityFrameworkCore.DbSet`1" /> that can be used to query and save instances of <see cref="InstructorIQ.Core.Data.Entities.Discussion"/>.
-        /// </summary>
-        /// <value>
-        /// The <see cref="T:Microsoft.EntityFrameworkCore.DbSet`1" /> that can be used to query and save instances of <see cref="InstructorIQ.Core.Data.Entities.Discussion"/>.
-        /// </value>
-        public virtual DbSet<InstructorIQ.Core.Data.Entities.Discussion> Discussions { get; set; }
-
-        /// <summary>
-        /// Gets or sets the <see cref="T:Microsoft.EntityFrameworkCore.DbSet`1" /> that can be used to query and save instances of <see cref="InstructorIQ.Core.Data.Entities.EmailDelivery"/>.
-        /// </summary>
-        /// <value>
-        /// The <see cref="T:Microsoft.EntityFrameworkCore.DbSet`1" /> that can be used to query and save instances of <see cref="InstructorIQ.Core.Data.Entities.EmailDelivery"/>.
-        /// </value>
-        public virtual DbSet<InstructorIQ.Core.Data.Entities.EmailDelivery> EmailDeliveries { get; set; }
-
-        /// <summary>
-        /// Gets or sets the <see cref="T:Microsoft.EntityFrameworkCore.DbSet`1" /> that can be used to query and save instances of <see cref="InstructorIQ.Core.Data.Entities.EmailTemplate"/>.
-        /// </summary>
-        /// <value>
-        /// The <see cref="T:Microsoft.EntityFrameworkCore.DbSet`1" /> that can be used to query and save instances of <see cref="InstructorIQ.Core.Data.Entities.EmailTemplate"/>.
-        /// </value>
-        public virtual DbSet<InstructorIQ.Core.Data.Entities.EmailTemplate> EmailTemplates { get; set; }
-
-        /// <summary>
-        /// Gets or sets the <see cref="T:Microsoft.EntityFrameworkCore.DbSet`1" /> that can be used to query and save instances of <see cref="InstructorIQ.Core.Data.Entities.Group"/>.
-        /// </summary>
-        /// <value>
-        /// The <see cref="T:Microsoft.EntityFrameworkCore.DbSet`1" /> that can be used to query and save instances of <see cref="InstructorIQ.Core.Data.Entities.Group"/>.
-        /// </value>
-        public virtual DbSet<InstructorIQ.Core.Data.Entities.Group> Groups { get; set; }
-
-        /// <summary>
-        /// Gets or sets the <see cref="T:Microsoft.EntityFrameworkCore.DbSet`1" /> that can be used to query and save instances of <see cref="InstructorIQ.Core.Data.Entities.HistoryRecord"/>.
-        /// </summary>
-        /// <value>
-        /// The <see cref="T:Microsoft.EntityFrameworkCore.DbSet`1" /> that can be used to query and save instances of <see cref="InstructorIQ.Core.Data.Entities.HistoryRecord"/>.
-        /// </value>
-        public virtual DbSet<InstructorIQ.Core.Data.Entities.HistoryRecord> HistoryRecords { get; set; }
-
-        /// <summary>
-        /// Gets or sets the <see cref="T:Microsoft.EntityFrameworkCore.DbSet`1" /> that can be used to query and save instances of <see cref="InstructorIQ.Core.Data.Entities.ImportJob"/>.
-        /// </summary>
-        /// <value>
-        /// The <see cref="T:Microsoft.EntityFrameworkCore.DbSet`1" /> that can be used to query and save instances of <see cref="InstructorIQ.Core.Data.Entities.ImportJob"/>.
-        /// </value>
-        public virtual DbSet<InstructorIQ.Core.Data.Entities.ImportJob> ImportJobs { get; set; }
-
-        /// <summary>
-        /// Gets or sets the <see cref="T:Microsoft.EntityFrameworkCore.DbSet`1" /> that can be used to query and save instances of <see cref="InstructorIQ.Core.Data.Entities.InstructorRole"/>.
-        /// </summary>
-        /// <value>
-        /// The <see cref="T:Microsoft.EntityFrameworkCore.DbSet`1" /> that can be used to query and save instances of <see cref="InstructorIQ.Core.Data.Entities.InstructorRole"/>.
-        /// </value>
-        public virtual DbSet<InstructorIQ.Core.Data.Entities.InstructorRole> InstructorRoles { get; set; }
-
-        /// <summary>
-        /// Gets or sets the <see cref="T:Microsoft.EntityFrameworkCore.DbSet`1" /> that can be used to query and save instances of <see cref="InstructorIQ.Core.Data.Entities.LinkToken"/>.
-        /// </summary>
-        /// <value>
-        /// The <see cref="T:Microsoft.EntityFrameworkCore.DbSet`1" /> that can be used to query and save instances of <see cref="InstructorIQ.Core.Data.Entities.LinkToken"/>.
-        /// </value>
-        public virtual DbSet<InstructorIQ.Core.Data.Entities.LinkToken> LinkTokens { get; set; }
-
-        /// <summary>
-        /// Gets or sets the <see cref="T:Microsoft.EntityFrameworkCore.DbSet`1" /> that can be used to query and save instances of <see cref="InstructorIQ.Core.Data.Entities.Location"/>.
-        /// </summary>
-        /// <value>
-        /// The <see cref="T:Microsoft.EntityFrameworkCore.DbSet`1" /> that can be used to query and save instances of <see cref="InstructorIQ.Core.Data.Entities.Location"/>.
-        /// </value>
-        public virtual DbSet<InstructorIQ.Core.Data.Entities.Location> Locations { get; set; }
-
-        /// <summary>
-        /// Gets or sets the <see cref="T:Microsoft.EntityFrameworkCore.DbSet`1" /> that can be used to query and save instances of <see cref="InstructorIQ.Core.Data.Entities.Notification"/>.
-        /// </summary>
-        /// <value>
-        /// The <see cref="T:Microsoft.EntityFrameworkCore.DbSet`1" /> that can be used to query and save instances of <see cref="InstructorIQ.Core.Data.Entities.Notification"/>.
-        /// </value>
-        public virtual DbSet<InstructorIQ.Core.Data.Entities.Notification> Notifications { get; set; }
-
-        /// <summary>
-        /// Gets or sets the <see cref="T:Microsoft.EntityFrameworkCore.DbSet`1" /> that can be used to query and save instances of <see cref="InstructorIQ.Core.Data.Entities.RefreshToken"/>.
-        /// </summary>
-        /// <value>
-        /// The <see cref="T:Microsoft.EntityFrameworkCore.DbSet`1" /> that can be used to query and save instances of <see cref="InstructorIQ.Core.Data.Entities.RefreshToken"/>.
-        /// </value>
-        public virtual DbSet<InstructorIQ.Core.Data.Entities.RefreshToken> RefreshTokens { get; set; }
-
-        /// <summary>
-        /// Gets or sets the <see cref="T:Microsoft.EntityFrameworkCore.DbSet`1" /> that can be used to query and save instances of <see cref="InstructorIQ.Core.Data.Entities.SessionInstructor"/>.
-        /// </summary>
-        /// <value>
-        /// The <see cref="T:Microsoft.EntityFrameworkCore.DbSet`1" /> that can be used to query and save instances of <see cref="InstructorIQ.Core.Data.Entities.SessionInstructor"/>.
-        /// </value>
-        public virtual DbSet<InstructorIQ.Core.Data.Entities.SessionInstructor> SessionInstructors { get; set; }
-
-        /// <summary>
-        /// Gets or sets the <see cref="T:Microsoft.EntityFrameworkCore.DbSet`1" /> that can be used to query and save instances of <see cref="InstructorIQ.Core.Data.Entities.Session"/>.
-        /// </summary>
-        /// <value>
-        /// The <see cref="T:Microsoft.EntityFrameworkCore.DbSet`1" /> that can be used to query and save instances of <see cref="InstructorIQ.Core.Data.Entities.Session"/>.
-        /// </value>
-        public virtual DbSet<InstructorIQ.Core.Data.Entities.Session> Sessions { get; set; }
-
-        /// <summary>
-        /// Gets or sets the <see cref="T:Microsoft.EntityFrameworkCore.DbSet`1" /> that can be used to query and save instances of <see cref="InstructorIQ.Core.Data.Entities.SignUp"/>.
-        /// </summary>
-        /// <value>
-        /// The <see cref="T:Microsoft.EntityFrameworkCore.DbSet`1" /> that can be used to query and save instances of <see cref="InstructorIQ.Core.Data.Entities.SignUp"/>.
-        /// </value>
-        public virtual DbSet<InstructorIQ.Core.Data.Entities.SignUp> SignUps { get; set; }
-
-        /// <summary>
-        /// Gets or sets the <see cref="T:Microsoft.EntityFrameworkCore.DbSet`1" /> that can be used to query and save instances of <see cref="InstructorIQ.Core.Data.Entities.SignUpTopic"/>.
-        /// </summary>
-        /// <value>
-        /// The <see cref="T:Microsoft.EntityFrameworkCore.DbSet`1" /> that can be used to query and save instances of <see cref="InstructorIQ.Core.Data.Entities.SignUpTopic"/>.
-        /// </value>
-        public virtual DbSet<InstructorIQ.Core.Data.Entities.SignUpTopic> SignUpTopics { get; set; }
-
-        /// <summary>
-        /// Gets or sets the <see cref="T:Microsoft.EntityFrameworkCore.DbSet`1" /> that can be used to query and save instances of <see cref="InstructorIQ.Core.Data.Entities.Template"/>.
-        /// </summary>
-        /// <value>
-        /// The <see cref="T:Microsoft.EntityFrameworkCore.DbSet`1" /> that can be used to query and save instances of <see cref="InstructorIQ.Core.Data.Entities.Template"/>.
-        /// </value>
-        public virtual DbSet<InstructorIQ.Core.Data.Entities.Template> Templates { get; set; }
-
-        /// <summary>
-        /// Gets or sets the <see cref="T:Microsoft.EntityFrameworkCore.DbSet`1" /> that can be used to query and save instances of <see cref="InstructorIQ.Core.Data.Entities.Tenant"/>.
-        /// </summary>
-        /// <value>
-        /// The <see cref="T:Microsoft.EntityFrameworkCore.DbSet`1" /> that can be used to query and save instances of <see cref="InstructorIQ.Core.Data.Entities.Tenant"/>.
-        /// </value>
-        public virtual DbSet<InstructorIQ.Core.Data.Entities.Tenant> Tenants { get; set; }
-
-        /// <summary>
-        /// Gets or sets the <see cref="T:Microsoft.EntityFrameworkCore.DbSet`1" /> that can be used to query and save instances of <see cref="InstructorIQ.Core.Data.Entities.TenantUserRole"/>.
-        /// </summary>
-        /// <value>
-        /// The <see cref="T:Microsoft.EntityFrameworkCore.DbSet`1" /> that can be used to query and save instances of <see cref="InstructorIQ.Core.Data.Entities.TenantUserRole"/>.
-        /// </value>
-        public virtual DbSet<InstructorIQ.Core.Data.Entities.TenantUserRole> TenantUserRoles { get; set; }
-
-        /// <summary>
-        /// Gets or sets the <see cref="T:Microsoft.EntityFrameworkCore.DbSet`1" /> that can be used to query and save instances of <see cref="InstructorIQ.Core.Data.Entities.TopicInstructor"/>.
-        /// </summary>
-        /// <value>
-        /// The <see cref="T:Microsoft.EntityFrameworkCore.DbSet`1" /> that can be used to query and save instances of <see cref="InstructorIQ.Core.Data.Entities.TopicInstructor"/>.
-        /// </value>
-        public virtual DbSet<InstructorIQ.Core.Data.Entities.TopicInstructor> TopicInstructors { get; set; }
-
-        /// <summary>
-        /// Gets or sets the <see cref="T:Microsoft.EntityFrameworkCore.DbSet`1" /> that can be used to query and save instances of <see cref="InstructorIQ.Core.Data.Entities.Topic"/>.
-        /// </summary>
-        /// <value>
-        /// The <see cref="T:Microsoft.EntityFrameworkCore.DbSet`1" /> that can be used to query and save instances of <see cref="InstructorIQ.Core.Data.Entities.Topic"/>.
-        /// </value>
-        public virtual DbSet<InstructorIQ.Core.Data.Entities.Topic> Topics { get; set; }
+    }
+
+    #region Generated Properties
+    /// <summary>
+    /// Gets or sets the <see cref="T:Microsoft.EntityFrameworkCore.DbSet`1" /> that can be used to query and save instances of <see cref="InstructorIQ.Core.Data.Entities.Attendance"/>.
+    /// </summary>
+    /// <value>
+    /// The <see cref="T:Microsoft.EntityFrameworkCore.DbSet`1" /> that can be used to query and save instances of <see cref="InstructorIQ.Core.Data.Entities.Attendance"/>.
+    /// </value>
+    public virtual DbSet<InstructorIQ.Core.Data.Entities.Attendance> Attendances { get; set; }
+
+    /// <summary>
+    /// Gets or sets the <see cref="T:Microsoft.EntityFrameworkCore.DbSet`1" /> that can be used to query and save instances of <see cref="InstructorIQ.Core.Data.Entities.AuthenticationEvent"/>.
+    /// </summary>
+    /// <value>
+    /// The <see cref="T:Microsoft.EntityFrameworkCore.DbSet`1" /> that can be used to query and save instances of <see cref="InstructorIQ.Core.Data.Entities.AuthenticationEvent"/>.
+    /// </value>
+    public virtual DbSet<InstructorIQ.Core.Data.Entities.AuthenticationEvent> AuthenticationEvents { get; set; }
+
+    /// <summary>
+    /// Gets or sets the <see cref="T:Microsoft.EntityFrameworkCore.DbSet`1" /> that can be used to query and save instances of <see cref="InstructorIQ.Core.Data.Entities.Discussion"/>.
+    /// </summary>
+    /// <value>
+    /// The <see cref="T:Microsoft.EntityFrameworkCore.DbSet`1" /> that can be used to query and save instances of <see cref="InstructorIQ.Core.Data.Entities.Discussion"/>.
+    /// </value>
+    public virtual DbSet<InstructorIQ.Core.Data.Entities.Discussion> Discussions { get; set; }
+
+    /// <summary>
+    /// Gets or sets the <see cref="T:Microsoft.EntityFrameworkCore.DbSet`1" /> that can be used to query and save instances of <see cref="InstructorIQ.Core.Data.Entities.EmailDelivery"/>.
+    /// </summary>
+    /// <value>
+    /// The <see cref="T:Microsoft.EntityFrameworkCore.DbSet`1" /> that can be used to query and save instances of <see cref="InstructorIQ.Core.Data.Entities.EmailDelivery"/>.
+    /// </value>
+    public virtual DbSet<InstructorIQ.Core.Data.Entities.EmailDelivery> EmailDeliveries { get; set; }
+
+    /// <summary>
+    /// Gets or sets the <see cref="T:Microsoft.EntityFrameworkCore.DbSet`1" /> that can be used to query and save instances of <see cref="InstructorIQ.Core.Data.Entities.EmailTemplate"/>.
+    /// </summary>
+    /// <value>
+    /// The <see cref="T:Microsoft.EntityFrameworkCore.DbSet`1" /> that can be used to query and save instances of <see cref="InstructorIQ.Core.Data.Entities.EmailTemplate"/>.
+    /// </value>
+    public virtual DbSet<InstructorIQ.Core.Data.Entities.EmailTemplate> EmailTemplates { get; set; }
 
+    /// <summary>
+    /// Gets or sets the <see cref="T:Microsoft.EntityFrameworkCore.DbSet`1" /> that can be used to query and save instances of <see cref="InstructorIQ.Core.Data.Entities.Group"/>.
+    /// </summary>
+    /// <value>
+    /// The <see cref="T:Microsoft.EntityFrameworkCore.DbSet`1" /> that can be used to query and save instances of <see cref="InstructorIQ.Core.Data.Entities.Group"/>.
+    /// </value>
+    public virtual DbSet<InstructorIQ.Core.Data.Entities.Group> Groups { get; set; }
+
+    /// <summary>
+    /// Gets or sets the <see cref="T:Microsoft.EntityFrameworkCore.DbSet`1" /> that can be used to query and save instances of <see cref="InstructorIQ.Core.Data.Entities.HistoryRecord"/>.
+    /// </summary>
+    /// <value>
+    /// The <see cref="T:Microsoft.EntityFrameworkCore.DbSet`1" /> that can be used to query and save instances of <see cref="InstructorIQ.Core.Data.Entities.HistoryRecord"/>.
+    /// </value>
+    public virtual DbSet<InstructorIQ.Core.Data.Entities.HistoryRecord> HistoryRecords { get; set; }
+
+    /// <summary>
+    /// Gets or sets the <see cref="T:Microsoft.EntityFrameworkCore.DbSet`1" /> that can be used to query and save instances of <see cref="InstructorIQ.Core.Data.Entities.ImportJob"/>.
+    /// </summary>
+    /// <value>
+    /// The <see cref="T:Microsoft.EntityFrameworkCore.DbSet`1" /> that can be used to query and save instances of <see cref="InstructorIQ.Core.Data.Entities.ImportJob"/>.
+    /// </value>
+    public virtual DbSet<InstructorIQ.Core.Data.Entities.ImportJob> ImportJobs { get; set; }
+
+    /// <summary>
+    /// Gets or sets the <see cref="T:Microsoft.EntityFrameworkCore.DbSet`1" /> that can be used to query and save instances of <see cref="InstructorIQ.Core.Data.Entities.InstructorRole"/>.
+    /// </summary>
+    /// <value>
+    /// The <see cref="T:Microsoft.EntityFrameworkCore.DbSet`1" /> that can be used to query and save instances of <see cref="InstructorIQ.Core.Data.Entities.InstructorRole"/>.
+    /// </value>
+    public virtual DbSet<InstructorIQ.Core.Data.Entities.InstructorRole> InstructorRoles { get; set; }
+
+    /// <summary>
+    /// Gets or sets the <see cref="T:Microsoft.EntityFrameworkCore.DbSet`1" /> that can be used to query and save instances of <see cref="InstructorIQ.Core.Data.Entities.LinkToken"/>.
+    /// </summary>
+    /// <value>
+    /// The <see cref="T:Microsoft.EntityFrameworkCore.DbSet`1" /> that can be used to query and save instances of <see cref="InstructorIQ.Core.Data.Entities.LinkToken"/>.
+    /// </value>
+    public virtual DbSet<InstructorIQ.Core.Data.Entities.LinkToken> LinkTokens { get; set; }
+
+    /// <summary>
+    /// Gets or sets the <see cref="T:Microsoft.EntityFrameworkCore.DbSet`1" /> that can be used to query and save instances of <see cref="InstructorIQ.Core.Data.Entities.Location"/>.
+    /// </summary>
+    /// <value>
+    /// The <see cref="T:Microsoft.EntityFrameworkCore.DbSet`1" /> that can be used to query and save instances of <see cref="InstructorIQ.Core.Data.Entities.Location"/>.
+    /// </value>
+    public virtual DbSet<InstructorIQ.Core.Data.Entities.Location> Locations { get; set; }
+
+    /// <summary>
+    /// Gets or sets the <see cref="T:Microsoft.EntityFrameworkCore.DbSet`1" /> that can be used to query and save instances of <see cref="InstructorIQ.Core.Data.Entities.Notification"/>.
+    /// </summary>
+    /// <value>
+    /// The <see cref="T:Microsoft.EntityFrameworkCore.DbSet`1" /> that can be used to query and save instances of <see cref="InstructorIQ.Core.Data.Entities.Notification"/>.
+    /// </value>
+    public virtual DbSet<InstructorIQ.Core.Data.Entities.Notification> Notifications { get; set; }
+
+    /// <summary>
+    /// Gets or sets the <see cref="T:Microsoft.EntityFrameworkCore.DbSet`1" /> that can be used to query and save instances of <see cref="InstructorIQ.Core.Data.Entities.RefreshToken"/>.
+    /// </summary>
+    /// <value>
+    /// The <see cref="T:Microsoft.EntityFrameworkCore.DbSet`1" /> that can be used to query and save instances of <see cref="InstructorIQ.Core.Data.Entities.RefreshToken"/>.
+    /// </value>
+    public virtual DbSet<InstructorIQ.Core.Data.Entities.RefreshToken> RefreshTokens { get; set; }
+
+    /// <summary>
+    /// Gets or sets the <see cref="T:Microsoft.EntityFrameworkCore.DbSet`1" /> that can be used to query and save instances of <see cref="InstructorIQ.Core.Data.Entities.SessionInstructor"/>.
+    /// </summary>
+    /// <value>
+    /// The <see cref="T:Microsoft.EntityFrameworkCore.DbSet`1" /> that can be used to query and save instances of <see cref="InstructorIQ.Core.Data.Entities.SessionInstructor"/>.
+    /// </value>
+    public virtual DbSet<InstructorIQ.Core.Data.Entities.SessionInstructor> SessionInstructors { get; set; }
+
+    /// <summary>
+    /// Gets or sets the <see cref="T:Microsoft.EntityFrameworkCore.DbSet`1" /> that can be used to query and save instances of <see cref="InstructorIQ.Core.Data.Entities.Session"/>.
+    /// </summary>
+    /// <value>
+    /// The <see cref="T:Microsoft.EntityFrameworkCore.DbSet`1" /> that can be used to query and save instances of <see cref="InstructorIQ.Core.Data.Entities.Session"/>.
+    /// </value>
+    public virtual DbSet<InstructorIQ.Core.Data.Entities.Session> Sessions { get; set; }
+
+    /// <summary>
+    /// Gets or sets the <see cref="T:Microsoft.EntityFrameworkCore.DbSet`1" /> that can be used to query and save instances of <see cref="InstructorIQ.Core.Data.Entities.SignUp"/>.
+    /// </summary>
+    /// <value>
+    /// The <see cref="T:Microsoft.EntityFrameworkCore.DbSet`1" /> that can be used to query and save instances of <see cref="InstructorIQ.Core.Data.Entities.SignUp"/>.
+    /// </value>
+    public virtual DbSet<InstructorIQ.Core.Data.Entities.SignUp> SignUps { get; set; }
+
+    /// <summary>
+    /// Gets or sets the <see cref="T:Microsoft.EntityFrameworkCore.DbSet`1" /> that can be used to query and save instances of <see cref="InstructorIQ.Core.Data.Entities.SignUpTopic"/>.
+    /// </summary>
+    /// <value>
+    /// The <see cref="T:Microsoft.EntityFrameworkCore.DbSet`1" /> that can be used to query and save instances of <see cref="InstructorIQ.Core.Data.Entities.SignUpTopic"/>.
+    /// </value>
+    public virtual DbSet<InstructorIQ.Core.Data.Entities.SignUpTopic> SignUpTopics { get; set; }
+
+    /// <summary>
+    /// Gets or sets the <see cref="T:Microsoft.EntityFrameworkCore.DbSet`1" /> that can be used to query and save instances of <see cref="InstructorIQ.Core.Data.Entities.Template"/>.
+    /// </summary>
+    /// <value>
+    /// The <see cref="T:Microsoft.EntityFrameworkCore.DbSet`1" /> that can be used to query and save instances of <see cref="InstructorIQ.Core.Data.Entities.Template"/>.
+    /// </value>
+    public virtual DbSet<InstructorIQ.Core.Data.Entities.Template> Templates { get; set; }
+
+    /// <summary>
+    /// Gets or sets the <see cref="T:Microsoft.EntityFrameworkCore.DbSet`1" /> that can be used to query and save instances of <see cref="InstructorIQ.Core.Data.Entities.Tenant"/>.
+    /// </summary>
+    /// <value>
+    /// The <see cref="T:Microsoft.EntityFrameworkCore.DbSet`1" /> that can be used to query and save instances of <see cref="InstructorIQ.Core.Data.Entities.Tenant"/>.
+    /// </value>
+    public virtual DbSet<InstructorIQ.Core.Data.Entities.Tenant> Tenants { get; set; }
+
+    /// <summary>
+    /// Gets or sets the <see cref="T:Microsoft.EntityFrameworkCore.DbSet`1" /> that can be used to query and save instances of <see cref="InstructorIQ.Core.Data.Entities.TenantUserRole"/>.
+    /// </summary>
+    /// <value>
+    /// The <see cref="T:Microsoft.EntityFrameworkCore.DbSet`1" /> that can be used to query and save instances of <see cref="InstructorIQ.Core.Data.Entities.TenantUserRole"/>.
+    /// </value>
+    public virtual DbSet<InstructorIQ.Core.Data.Entities.TenantUserRole> TenantUserRoles { get; set; }
+
+    /// <summary>
+    /// Gets or sets the <see cref="T:Microsoft.EntityFrameworkCore.DbSet`1" /> that can be used to query and save instances of <see cref="InstructorIQ.Core.Data.Entities.TopicInstructor"/>.
+    /// </summary>
+    /// <value>
+    /// The <see cref="T:Microsoft.EntityFrameworkCore.DbSet`1" /> that can be used to query and save instances of <see cref="InstructorIQ.Core.Data.Entities.TopicInstructor"/>.
+    /// </value>
+    public virtual DbSet<InstructorIQ.Core.Data.Entities.TopicInstructor> TopicInstructors { get; set; }
+
+    /// <summary>
+    /// Gets or sets the <see cref="T:Microsoft.EntityFrameworkCore.DbSet`1" /> that can be used to query and save instances of <see cref="InstructorIQ.Core.Data.Entities.Topic"/>.
+    /// </summary>
+    /// <value>
+    /// The <see cref="T:Microsoft.EntityFrameworkCore.DbSet`1" /> that can be used to query and save instances of <see cref="InstructorIQ.Core.Data.Entities.Topic"/>.
+    /// </value>
+    public virtual DbSet<InstructorIQ.Core.Data.Entities.Topic> Topics { get; set; }
+
+    #endregion
+
+    /// <summary>
+    /// Configure the model that was discovered from the entity types exposed in <see cref="T:Microsoft.EntityFrameworkCore.DbSet`1" /> properties on this context.
+    /// </summary>
+    /// <param name="modelBuilder">The builder being used to construct the model for this context.</param>
+    protected override void OnModelCreating(ModelBuilder modelBuilder)
+    {
+        base.OnModelCreating(modelBuilder);
+
+        #region Generated Configuration
+        modelBuilder.ApplyConfiguration(new InstructorIQ.Core.Data.Mapping.AttendanceMap());
+        modelBuilder.ApplyConfiguration(new InstructorIQ.Core.Data.Mapping.AuthenticationEventMap());
+        modelBuilder.ApplyConfiguration(new InstructorIQ.Core.Data.Mapping.DiscussionMap());
+        modelBuilder.ApplyConfiguration(new InstructorIQ.Core.Data.Mapping.EmailDeliveryMap());
+        modelBuilder.ApplyConfiguration(new InstructorIQ.Core.Data.Mapping.EmailTemplateMap());
+        modelBuilder.ApplyConfiguration(new InstructorIQ.Core.Data.Mapping.GroupMap());
+        modelBuilder.ApplyConfiguration(new InstructorIQ.Core.Data.Mapping.HistoryRecordMap());
+        modelBuilder.ApplyConfiguration(new InstructorIQ.Core.Data.Mapping.ImportJobMap());
+        modelBuilder.ApplyConfiguration(new InstructorIQ.Core.Data.Mapping.InstructorRoleMap());
+        modelBuilder.ApplyConfiguration(new InstructorIQ.Core.Data.Mapping.LinkTokenMap());
+        modelBuilder.ApplyConfiguration(new InstructorIQ.Core.Data.Mapping.LocationMap());
+        modelBuilder.ApplyConfiguration(new InstructorIQ.Core.Data.Mapping.NotificationMap());
+        modelBuilder.ApplyConfiguration(new InstructorIQ.Core.Data.Mapping.RefreshTokenMap());
+        modelBuilder.ApplyConfiguration(new InstructorIQ.Core.Data.Mapping.SessionInstructorMap());
+        modelBuilder.ApplyConfiguration(new InstructorIQ.Core.Data.Mapping.SessionMap());
+        modelBuilder.ApplyConfiguration(new InstructorIQ.Core.Data.Mapping.SignUpMap());
+        modelBuilder.ApplyConfiguration(new InstructorIQ.Core.Data.Mapping.SignUpTopicMap());
+        modelBuilder.ApplyConfiguration(new InstructorIQ.Core.Data.Mapping.TemplateMap());
+        modelBuilder.ApplyConfiguration(new InstructorIQ.Core.Data.Mapping.TenantMap());
+        modelBuilder.ApplyConfiguration(new InstructorIQ.Core.Data.Mapping.TenantUserRoleMap());
+        modelBuilder.ApplyConfiguration(new InstructorIQ.Core.Data.Mapping.TopicInstructorMap());
+        modelBuilder.ApplyConfiguration(new InstructorIQ.Core.Data.Mapping.TopicMap());
         #endregion
 
-        /// <summary>
-        /// Configure the model that was discovered from the entity types exposed in <see cref="T:Microsoft.EntityFrameworkCore.DbSet`1" /> properties on this context.
-        /// </summary>
-        /// <param name="modelBuilder">The builder being used to construct the model for this context.</param>
-        protected override void OnModelCreating(ModelBuilder modelBuilder)
-        {
-            base.OnModelCreating(modelBuilder);
-
-            #region Generated Configuration
-            modelBuilder.ApplyConfiguration(new InstructorIQ.Core.Data.Mapping.AttendanceMap());
-            modelBuilder.ApplyConfiguration(new InstructorIQ.Core.Data.Mapping.AuthenticationEventMap());
-            modelBuilder.ApplyConfiguration(new InstructorIQ.Core.Data.Mapping.DiscussionMap());
-            modelBuilder.ApplyConfiguration(new InstructorIQ.Core.Data.Mapping.EmailDeliveryMap());
-            modelBuilder.ApplyConfiguration(new InstructorIQ.Core.Data.Mapping.EmailTemplateMap());
-            modelBuilder.ApplyConfiguration(new InstructorIQ.Core.Data.Mapping.GroupMap());
-            modelBuilder.ApplyConfiguration(new InstructorIQ.Core.Data.Mapping.HistoryRecordMap());
-            modelBuilder.ApplyConfiguration(new InstructorIQ.Core.Data.Mapping.ImportJobMap());
-            modelBuilder.ApplyConfiguration(new InstructorIQ.Core.Data.Mapping.InstructorRoleMap());
-            modelBuilder.ApplyConfiguration(new InstructorIQ.Core.Data.Mapping.LinkTokenMap());
-            modelBuilder.ApplyConfiguration(new InstructorIQ.Core.Data.Mapping.LocationMap());
-            modelBuilder.ApplyConfiguration(new InstructorIQ.Core.Data.Mapping.NotificationMap());
-            modelBuilder.ApplyConfiguration(new InstructorIQ.Core.Data.Mapping.RefreshTokenMap());
-            modelBuilder.ApplyConfiguration(new InstructorIQ.Core.Data.Mapping.SessionInstructorMap());
-            modelBuilder.ApplyConfiguration(new InstructorIQ.Core.Data.Mapping.SessionMap());
-            modelBuilder.ApplyConfiguration(new InstructorIQ.Core.Data.Mapping.SignUpMap());
-            modelBuilder.ApplyConfiguration(new InstructorIQ.Core.Data.Mapping.SignUpTopicMap());
-            modelBuilder.ApplyConfiguration(new InstructorIQ.Core.Data.Mapping.TemplateMap());
-            modelBuilder.ApplyConfiguration(new InstructorIQ.Core.Data.Mapping.TenantMap());
-            modelBuilder.ApplyConfiguration(new InstructorIQ.Core.Data.Mapping.TenantUserRoleMap());
-            modelBuilder.ApplyConfiguration(new InstructorIQ.Core.Data.Mapping.TopicInstructorMap());
-            modelBuilder.ApplyConfiguration(new InstructorIQ.Core.Data.Mapping.TopicMap());
-            #endregion
-
-            modelBuilder.ApplyConfiguration(new InstructorIQ.Core.Data.Mapping.RoleMap());
-            modelBuilder.ApplyConfiguration(new InstructorIQ.Core.Data.Mapping.RoleClaimMap());
-
-            modelBuilder.ApplyConfiguration(new InstructorIQ.Core.Data.Mapping.UserMap());
-            modelBuilder.ApplyConfiguration(new InstructorIQ.Core.Data.Mapping.UserClaimMap());
-            modelBuilder.ApplyConfiguration(new InstructorIQ.Core.Data.Mapping.UserLoginMap());
-            modelBuilder.ApplyConfiguration(new InstructorIQ.Core.Data.Mapping.UserRoleMap());
-            modelBuilder.ApplyConfiguration(new InstructorIQ.Core.Data.Mapping.UserTokenMap());
-        }
+        modelBuilder.ApplyConfiguration(new InstructorIQ.Core.Data.Mapping.RoleMap());
+        modelBuilder.ApplyConfiguration(new InstructorIQ.Core.Data.Mapping.RoleClaimMap());
+
+        modelBuilder.ApplyConfiguration(new InstructorIQ.Core.Data.Mapping.UserMap());
+        modelBuilder.ApplyConfiguration(new InstructorIQ.Core.Data.Mapping.UserClaimMap());
+        modelBuilder.ApplyConfiguration(new InstructorIQ.Core.Data.Mapping.UserLoginMap());
+        modelBuilder.ApplyConfiguration(new InstructorIQ.Core.Data.Mapping.UserRoleMap());
+        modelBuilder.ApplyConfiguration(new InstructorIQ.Core.Data.Mapping.UserTokenMap());
     }
 }
diff --git a/service/src/InstructorIQ.Core/Data/Mapping/AttendanceMap.cs b/service/src/InstructorIQ.Core/Data/Mapping/AttendanceMap.cs
index 093a59d2..d3103198 100644
--- a/service/src/InstructorIQ.Core/Data/Mapping/AttendanceMap.cs
+++ b/service/src/InstructorIQ.Core/Data/Mapping/AttendanceMap.cs
@@ -1,153 +1,153 @@
 using System;
 using System.Collections.Generic;
+
 using Microsoft.EntityFrameworkCore;
 
-namespace InstructorIQ.Core.Data.Mapping
+namespace InstructorIQ.Core.Data.Mapping;
+
+/// <summary>
+/// Allows configuration for an entity type <see cref="InstructorIQ.Core.Data.Entities.Attendance" />
+/// </summary>
+public partial class AttendanceMap
+    : IEntityTypeConfiguration<InstructorIQ.Core.Data.Entities.Attendance>
 {
     /// <summary>
-    /// Allows configuration for an entity type <see cref="InstructorIQ.Core.Data.Entities.Attendance" />
+    /// Configures the entity of type <see cref="InstructorIQ.Core.Data.Entities.Attendance" />
     /// </summary>
-    public partial class AttendanceMap
-        : IEntityTypeConfiguration<InstructorIQ.Core.Data.Entities.Attendance>
+    /// <param name="builder">The builder to be used to configure the entity type.</param>
+    public void Configure(Microsoft.EntityFrameworkCore.Metadata.Builders.EntityTypeBuilder<InstructorIQ.Core.Data.Entities.Attendance> builder)
     {
-        /// <summary>
-        /// Configures the entity of type <see cref="InstructorIQ.Core.Data.Entities.Attendance" />
-        /// </summary>
-        /// <param name="builder">The builder to be used to configure the entity type.</param>
-        public void Configure(Microsoft.EntityFrameworkCore.Metadata.Builders.EntityTypeBuilder<InstructorIQ.Core.Data.Entities.Attendance> builder)
-        {
-            #region Generated Configure
-            // table
-            builder.ToTable("Attendance", "IQ");
-
-            // key
-            builder.HasKey(t => t.Id);
-
-            // properties
-            builder.Property(t => t.Id)
-                .IsRequired()
-                .HasColumnName("Id")
-                .HasColumnType("uniqueidentifier")
-                .HasDefaultValueSql("(newsequentialid())");
-
-            builder.Property(t => t.SessionId)
-                .IsRequired()
-                .HasColumnName("SessionId")
-                .HasColumnType("uniqueidentifier");
-
-            builder.Property(t => t.Attended)
-                .IsRequired()
-                .HasColumnName("Attended")
-                .HasColumnType("datetimeoffset")
-                .HasDefaultValueSql("(sysutcdatetime())");
-
-            builder.Property(t => t.AttendeeEmail)
-                .IsRequired()
-                .HasColumnName("AttendeeEmail")
-                .HasColumnType("nvarchar(256)")
-                .HasMaxLength(256);
-
-            builder.Property(t => t.AttendeeName)
-                .HasColumnName("AttendeeName")
-                .HasColumnType("nvarchar(256)")
-                .HasMaxLength(256);
-
-            builder.Property(t => t.Signature)
-                .HasColumnName("Signature")
-                .HasColumnType("nvarchar(max)");
-
-            builder.Property(t => t.SignatureType)
-                .HasColumnName("SignatureType")
-                .HasColumnType("nvarchar(256)")
-                .HasMaxLength(256);
-
-            builder.Property(t => t.TenantId)
-                .IsRequired()
-                .HasColumnName("TenantId")
-                .HasColumnType("uniqueidentifier");
-
-            builder.Property(t => t.Created)
-                .IsRequired()
-                .HasColumnName("Created")
-                .HasColumnType("datetimeoffset")
-                .HasDefaultValueSql("(sysutcdatetime())");
-
-            builder.Property(t => t.CreatedBy)
-                .HasColumnName("CreatedBy")
-                .HasColumnType("nvarchar(100)")
-                .HasMaxLength(100);
-
-            builder.Property(t => t.Updated)
-                .IsRequired()
-                .HasColumnName("Updated")
-                .HasColumnType("datetimeoffset")
-                .HasDefaultValueSql("(sysutcdatetime())");
-
-            builder.Property(t => t.UpdatedBy)
-                .HasColumnName("UpdatedBy")
-                .HasColumnType("nvarchar(100)")
-                .HasMaxLength(100);
-
-            builder.Property(t => t.RowVersion)
-                .IsRequired()
-                .IsRowVersion()
-                .HasColumnName("RowVersion")
-                .HasColumnType("rowversion")
-                .HasMaxLength(8)
-                .ValueGeneratedOnAddOrUpdate();
-
-            // relationships
-            builder.HasOne(t => t.Session)
-                .WithMany(t => t.Attendances)
-                .HasForeignKey(d => d.SessionId)
-                .HasConstraintName("FK_Attendance_Session_SessionId");
-
-            builder.HasOne(t => t.Tenant)
-                .WithMany(t => t.Attendances)
-                .HasForeignKey(d => d.TenantId)
-                .HasConstraintName("FK_Attendance_Tenant_TenantId");
-
-            #endregion
-        }
-
-        #region Generated Constants
-        public struct Table
-        {
-            /// <summary>Table Schema name constant for entity <see cref="InstructorIQ.Core.Data.Entities.Attendance" /></summary>
-            public const string Schema = "IQ";
-            /// <summary>Table Name constant for entity <see cref="InstructorIQ.Core.Data.Entities.Attendance" /></summary>
-            public const string Name = "Attendance";
-        }
-
-        public struct Columns
-        {
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Attendance.Id" /></summary>
-            public const string Id = "Id";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Attendance.SessionId" /></summary>
-            public const string SessionId = "SessionId";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Attendance.Attended" /></summary>
-            public const string Attended = "Attended";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Attendance.AttendeeEmail" /></summary>
-            public const string AttendeeEmail = "AttendeeEmail";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Attendance.AttendeeName" /></summary>
-            public const string AttendeeName = "AttendeeName";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Attendance.Signature" /></summary>
-            public const string Signature = "Signature";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Attendance.SignatureType" /></summary>
-            public const string SignatureType = "SignatureType";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Attendance.TenantId" /></summary>
-            public const string TenantId = "TenantId";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Attendance.Created" /></summary>
-            public const string Created = "Created";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Attendance.CreatedBy" /></summary>
-            public const string CreatedBy = "CreatedBy";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Attendance.Updated" /></summary>
-            public const string Updated = "Updated";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Attendance.UpdatedBy" /></summary>
-            public const string UpdatedBy = "UpdatedBy";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Attendance.RowVersion" /></summary>
-            public const string RowVersion = "RowVersion";
-        }
+        #region Generated Configure
+        // table
+        builder.ToTable("Attendance", "IQ");
+
+        // key
+        builder.HasKey(t => t.Id);
+
+        // properties
+        builder.Property(t => t.Id)
+            .IsRequired()
+            .HasColumnName("Id")
+            .HasColumnType("uniqueidentifier")
+            .HasDefaultValueSql("(newsequentialid())");
+
+        builder.Property(t => t.SessionId)
+            .IsRequired()
+            .HasColumnName("SessionId")
+            .HasColumnType("uniqueidentifier");
+
+        builder.Property(t => t.Attended)
+            .IsRequired()
+            .HasColumnName("Attended")
+            .HasColumnType("datetimeoffset")
+            .HasDefaultValueSql("(sysutcdatetime())");
+
+        builder.Property(t => t.AttendeeEmail)
+            .IsRequired()
+            .HasColumnName("AttendeeEmail")
+            .HasColumnType("nvarchar(256)")
+            .HasMaxLength(256);
+
+        builder.Property(t => t.AttendeeName)
+            .HasColumnName("AttendeeName")
+            .HasColumnType("nvarchar(256)")
+            .HasMaxLength(256);
+
+        builder.Property(t => t.Signature)
+            .HasColumnName("Signature")
+            .HasColumnType("nvarchar(max)");
+
+        builder.Property(t => t.SignatureType)
+            .HasColumnName("SignatureType")
+            .HasColumnType("nvarchar(256)")
+            .HasMaxLength(256);
+
+        builder.Property(t => t.TenantId)
+            .IsRequired()
+            .HasColumnName("TenantId")
+            .HasColumnType("uniqueidentifier");
+
+        builder.Property(t => t.Created)
+            .IsRequired()
+            .HasColumnName("Created")
+            .HasColumnType("datetimeoffset")
+            .HasDefaultValueSql("(sysutcdatetime())");
+
+        builder.Property(t => t.CreatedBy)
+            .HasColumnName("CreatedBy")
+            .HasColumnType("nvarchar(100)")
+            .HasMaxLength(100);
+
+        builder.Property(t => t.Updated)
+            .IsRequired()
+            .HasColumnName("Updated")
+            .HasColumnType("datetimeoffset")
+            .HasDefaultValueSql("(sysutcdatetime())");
+
+        builder.Property(t => t.UpdatedBy)
+            .HasColumnName("UpdatedBy")
+            .HasColumnType("nvarchar(100)")
+            .HasMaxLength(100);
+
+        builder.Property(t => t.RowVersion)
+            .IsRequired()
+            .IsRowVersion()
+            .HasColumnName("RowVersion")
+            .HasColumnType("rowversion")
+            .HasMaxLength(8)
+            .ValueGeneratedOnAddOrUpdate();
+
+        // relationships
+        builder.HasOne(t => t.Session)
+            .WithMany(t => t.Attendances)
+            .HasForeignKey(d => d.SessionId)
+            .HasConstraintName("FK_Attendance_Session_SessionId");
+
+        builder.HasOne(t => t.Tenant)
+            .WithMany(t => t.Attendances)
+            .HasForeignKey(d => d.TenantId)
+            .HasConstraintName("FK_Attendance_Tenant_TenantId");
+
         #endregion
     }
+
+    #region Generated Constants
+    public struct Table
+    {
+        /// <summary>Table Schema name constant for entity <see cref="InstructorIQ.Core.Data.Entities.Attendance" /></summary>
+        public const string Schema = "IQ";
+        /// <summary>Table Name constant for entity <see cref="InstructorIQ.Core.Data.Entities.Attendance" /></summary>
+        public const string Name = "Attendance";
+    }
+
+    public struct Columns
+    {
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Attendance.Id" /></summary>
+        public const string Id = "Id";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Attendance.SessionId" /></summary>
+        public const string SessionId = "SessionId";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Attendance.Attended" /></summary>
+        public const string Attended = "Attended";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Attendance.AttendeeEmail" /></summary>
+        public const string AttendeeEmail = "AttendeeEmail";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Attendance.AttendeeName" /></summary>
+        public const string AttendeeName = "AttendeeName";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Attendance.Signature" /></summary>
+        public const string Signature = "Signature";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Attendance.SignatureType" /></summary>
+        public const string SignatureType = "SignatureType";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Attendance.TenantId" /></summary>
+        public const string TenantId = "TenantId";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Attendance.Created" /></summary>
+        public const string Created = "Created";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Attendance.CreatedBy" /></summary>
+        public const string CreatedBy = "CreatedBy";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Attendance.Updated" /></summary>
+        public const string Updated = "Updated";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Attendance.UpdatedBy" /></summary>
+        public const string UpdatedBy = "UpdatedBy";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Attendance.RowVersion" /></summary>
+        public const string RowVersion = "RowVersion";
+    }
+    #endregion
 }
diff --git a/service/src/InstructorIQ.Core/Data/Mapping/AuthenticationEventMap.cs b/service/src/InstructorIQ.Core/Data/Mapping/AuthenticationEventMap.cs
index 924abc3a..18b1cd6a 100644
--- a/service/src/InstructorIQ.Core/Data/Mapping/AuthenticationEventMap.cs
+++ b/service/src/InstructorIQ.Core/Data/Mapping/AuthenticationEventMap.cs
@@ -1,172 +1,172 @@
 using System;
 using System.Collections.Generic;
+
 using Microsoft.EntityFrameworkCore;
 
-namespace InstructorIQ.Core.Data.Mapping
+namespace InstructorIQ.Core.Data.Mapping;
+
+/// <summary>
+/// Allows configuration for an entity type <see cref="InstructorIQ.Core.Data.Entities.AuthenticationEvent" />
+/// </summary>
+public partial class AuthenticationEventMap
+    : IEntityTypeConfiguration<InstructorIQ.Core.Data.Entities.AuthenticationEvent>
 {
     /// <summary>
-    /// Allows configuration for an entity type <see cref="InstructorIQ.Core.Data.Entities.AuthenticationEvent" />
+    /// Configures the entity of type <see cref="InstructorIQ.Core.Data.Entities.AuthenticationEvent" />
     /// </summary>
-    public partial class AuthenticationEventMap
-        : IEntityTypeConfiguration<InstructorIQ.Core.Data.Entities.AuthenticationEvent>
+    /// <param name="builder">The builder to be used to configure the entity type.</param>
+    public void Configure(Microsoft.EntityFrameworkCore.Metadata.Builders.EntityTypeBuilder<InstructorIQ.Core.Data.Entities.AuthenticationEvent> builder)
     {
-        /// <summary>
-        /// Configures the entity of type <see cref="InstructorIQ.Core.Data.Entities.AuthenticationEvent" />
-        /// </summary>
-        /// <param name="builder">The builder to be used to configure the entity type.</param>
-        public void Configure(Microsoft.EntityFrameworkCore.Metadata.Builders.EntityTypeBuilder<InstructorIQ.Core.Data.Entities.AuthenticationEvent> builder)
-        {
-            #region Generated Configure
-            // table
-            builder.ToTable("AuthenticationEvent", "IQ");
-
-            // key
-            builder.HasKey(t => t.Id);
-
-            // properties
-            builder.Property(t => t.Id)
-                .IsRequired()
-                .HasColumnName("Id")
-                .HasColumnType("uniqueidentifier")
-                .HasDefaultValueSql("(newsequentialid())");
-
-            builder.Property(t => t.EmailAddress)
-                .IsRequired()
-                .HasColumnName("EmailAddress")
-                .HasColumnType("nvarchar(256)")
-                .HasMaxLength(256);
-
-            builder.Property(t => t.UserName)
-                .IsRequired()
-                .HasColumnName("UserName")
-                .HasColumnType("nvarchar(256)")
-                .HasMaxLength(256);
-
-            builder.Property(t => t.UserAgent)
-                .HasColumnName("UserAgent")
-                .HasColumnType("nvarchar(max)");
-
-            builder.Property(t => t.Browser)
-                .HasColumnName("Browser")
-                .HasColumnType("nvarchar(256)")
-                .HasMaxLength(256);
-
-            builder.Property(t => t.OperatingSystem)
-                .HasColumnName("OperatingSystem")
-                .HasColumnType("nvarchar(256)")
-                .HasMaxLength(256);
-
-            builder.Property(t => t.DeviceFamily)
-                .HasColumnName("DeviceFamily")
-                .HasColumnType("nvarchar(256)")
-                .HasMaxLength(256);
-
-            builder.Property(t => t.DeviceBrand)
-                .HasColumnName("DeviceBrand")
-                .HasColumnType("nvarchar(256)")
-                .HasMaxLength(256);
-
-            builder.Property(t => t.DeviceModel)
-                .HasColumnName("DeviceModel")
-                .HasColumnType("nvarchar(256)")
-                .HasMaxLength(256);
-
-            builder.Property(t => t.IpAddress)
-                .HasColumnName("IpAddress")
-                .HasColumnType("nvarchar(50)")
-                .HasMaxLength(50);
-
-            builder.Property(t => t.IsSuccessful)
-                .IsRequired()
-                .HasColumnName("IsSuccessful")
-                .HasColumnType("bit");
-
-            builder.Property(t => t.FailureMessage)
-                .HasColumnName("FailureMessage")
-                .HasColumnType("nvarchar(256)")
-                .HasMaxLength(256);
-
-            builder.Property(t => t.Created)
-                .IsRequired()
-                .HasColumnName("Created")
-                .HasColumnType("datetimeoffset")
-                .HasDefaultValueSql("(sysutcdatetime())");
-
-            builder.Property(t => t.CreatedBy)
-                .HasColumnName("CreatedBy")
-                .HasColumnType("nvarchar(100)")
-                .HasMaxLength(100);
-
-            builder.Property(t => t.Updated)
-                .IsRequired()
-                .HasColumnName("Updated")
-                .HasColumnType("datetimeoffset")
-                .HasDefaultValueSql("(sysutcdatetime())");
-
-            builder.Property(t => t.UpdatedBy)
-                .HasColumnName("UpdatedBy")
-                .HasColumnType("nvarchar(100)")
-                .HasMaxLength(100);
-
-            builder.Property(t => t.RowVersion)
-                .IsRequired()
-                .IsRowVersion()
-                .HasColumnName("RowVersion")
-                .HasColumnType("rowversion")
-                .HasMaxLength(8)
-                .ValueGeneratedOnAddOrUpdate();
-
-            // relationships
-            #endregion
-        }
-
-        #region Generated Constants
-        public struct Table
-        {
-            /// <summary>Table Schema name constant for entity <see cref="InstructorIQ.Core.Data.Entities.AuthenticationEvent" /></summary>
-            public const string Schema = "IQ";
-            /// <summary>Table Name constant for entity <see cref="InstructorIQ.Core.Data.Entities.AuthenticationEvent" /></summary>
-            public const string Name = "AuthenticationEvent";
-        }
-
-        public struct Columns
-        {
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.AuthenticationEvent.Id" /></summary>
-            public const string Id = "Id";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.AuthenticationEvent.EmailAddress" /></summary>
-            public const string EmailAddress = "EmailAddress";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.AuthenticationEvent.UserName" /></summary>
-            public const string UserName = "UserName";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.AuthenticationEvent.UserAgent" /></summary>
-            public const string UserAgent = "UserAgent";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.AuthenticationEvent.Browser" /></summary>
-            public const string Browser = "Browser";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.AuthenticationEvent.OperatingSystem" /></summary>
-            public const string OperatingSystem = "OperatingSystem";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.AuthenticationEvent.DeviceFamily" /></summary>
-            public const string DeviceFamily = "DeviceFamily";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.AuthenticationEvent.DeviceBrand" /></summary>
-            public const string DeviceBrand = "DeviceBrand";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.AuthenticationEvent.DeviceModel" /></summary>
-            public const string DeviceModel = "DeviceModel";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.AuthenticationEvent.IpAddress" /></summary>
-            public const string IpAddress = "IpAddress";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.AuthenticationEvent.IsSuccessful" /></summary>
-            public const string IsSuccessful = "IsSuccessful";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.AuthenticationEvent.FailureMessage" /></summary>
-            public const string FailureMessage = "FailureMessage";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.AuthenticationEvent.Created" /></summary>
-            public const string Created = "Created";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.AuthenticationEvent.CreatedBy" /></summary>
-            public const string CreatedBy = "CreatedBy";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.AuthenticationEvent.Updated" /></summary>
-            public const string Updated = "Updated";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.AuthenticationEvent.UpdatedBy" /></summary>
-            public const string UpdatedBy = "UpdatedBy";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.AuthenticationEvent.RowVersion" /></summary>
-            public const string RowVersion = "RowVersion";
-        }
+        #region Generated Configure
+        // table
+        builder.ToTable("AuthenticationEvent", "IQ");
+
+        // key
+        builder.HasKey(t => t.Id);
+
+        // properties
+        builder.Property(t => t.Id)
+            .IsRequired()
+            .HasColumnName("Id")
+            .HasColumnType("uniqueidentifier")
+            .HasDefaultValueSql("(newsequentialid())");
+
+        builder.Property(t => t.EmailAddress)
+            .IsRequired()
+            .HasColumnName("EmailAddress")
+            .HasColumnType("nvarchar(256)")
+            .HasMaxLength(256);
+
+        builder.Property(t => t.UserName)
+            .IsRequired()
+            .HasColumnName("UserName")
+            .HasColumnType("nvarchar(256)")
+            .HasMaxLength(256);
+
+        builder.Property(t => t.UserAgent)
+            .HasColumnName("UserAgent")
+            .HasColumnType("nvarchar(max)");
+
+        builder.Property(t => t.Browser)
+            .HasColumnName("Browser")
+            .HasColumnType("nvarchar(256)")
+            .HasMaxLength(256);
+
+        builder.Property(t => t.OperatingSystem)
+            .HasColumnName("OperatingSystem")
+            .HasColumnType("nvarchar(256)")
+            .HasMaxLength(256);
+
+        builder.Property(t => t.DeviceFamily)
+            .HasColumnName("DeviceFamily")
+            .HasColumnType("nvarchar(256)")
+            .HasMaxLength(256);
+
+        builder.Property(t => t.DeviceBrand)
+            .HasColumnName("DeviceBrand")
+            .HasColumnType("nvarchar(256)")
+            .HasMaxLength(256);
+
+        builder.Property(t => t.DeviceModel)
+            .HasColumnName("DeviceModel")
+            .HasColumnType("nvarchar(256)")
+            .HasMaxLength(256);
+
+        builder.Property(t => t.IpAddress)
+            .HasColumnName("IpAddress")
+            .HasColumnType("nvarchar(50)")
+            .HasMaxLength(50);
+
+        builder.Property(t => t.IsSuccessful)
+            .IsRequired()
+            .HasColumnName("IsSuccessful")
+            .HasColumnType("bit");
+
+        builder.Property(t => t.FailureMessage)
+            .HasColumnName("FailureMessage")
+            .HasColumnType("nvarchar(256)")
+            .HasMaxLength(256);
+
+        builder.Property(t => t.Created)
+            .IsRequired()
+            .HasColumnName("Created")
+            .HasColumnType("datetimeoffset")
+            .HasDefaultValueSql("(sysutcdatetime())");
+
+        builder.Property(t => t.CreatedBy)
+            .HasColumnName("CreatedBy")
+            .HasColumnType("nvarchar(100)")
+            .HasMaxLength(100);
+
+        builder.Property(t => t.Updated)
+            .IsRequired()
+            .HasColumnName("Updated")
+            .HasColumnType("datetimeoffset")
+            .HasDefaultValueSql("(sysutcdatetime())");
+
+        builder.Property(t => t.UpdatedBy)
+            .HasColumnName("UpdatedBy")
+            .HasColumnType("nvarchar(100)")
+            .HasMaxLength(100);
+
+        builder.Property(t => t.RowVersion)
+            .IsRequired()
+            .IsRowVersion()
+            .HasColumnName("RowVersion")
+            .HasColumnType("rowversion")
+            .HasMaxLength(8)
+            .ValueGeneratedOnAddOrUpdate();
+
+        // relationships
         #endregion
+    }
+
+    #region Generated Constants
+    public struct Table
+    {
+        /// <summary>Table Schema name constant for entity <see cref="InstructorIQ.Core.Data.Entities.AuthenticationEvent" /></summary>
+        public const string Schema = "IQ";
+        /// <summary>Table Name constant for entity <see cref="InstructorIQ.Core.Data.Entities.AuthenticationEvent" /></summary>
+        public const string Name = "AuthenticationEvent";
+    }
 
+    public struct Columns
+    {
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.AuthenticationEvent.Id" /></summary>
+        public const string Id = "Id";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.AuthenticationEvent.EmailAddress" /></summary>
+        public const string EmailAddress = "EmailAddress";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.AuthenticationEvent.UserName" /></summary>
+        public const string UserName = "UserName";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.AuthenticationEvent.UserAgent" /></summary>
+        public const string UserAgent = "UserAgent";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.AuthenticationEvent.Browser" /></summary>
+        public const string Browser = "Browser";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.AuthenticationEvent.OperatingSystem" /></summary>
+        public const string OperatingSystem = "OperatingSystem";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.AuthenticationEvent.DeviceFamily" /></summary>
+        public const string DeviceFamily = "DeviceFamily";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.AuthenticationEvent.DeviceBrand" /></summary>
+        public const string DeviceBrand = "DeviceBrand";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.AuthenticationEvent.DeviceModel" /></summary>
+        public const string DeviceModel = "DeviceModel";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.AuthenticationEvent.IpAddress" /></summary>
+        public const string IpAddress = "IpAddress";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.AuthenticationEvent.IsSuccessful" /></summary>
+        public const string IsSuccessful = "IsSuccessful";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.AuthenticationEvent.FailureMessage" /></summary>
+        public const string FailureMessage = "FailureMessage";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.AuthenticationEvent.Created" /></summary>
+        public const string Created = "Created";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.AuthenticationEvent.CreatedBy" /></summary>
+        public const string CreatedBy = "CreatedBy";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.AuthenticationEvent.Updated" /></summary>
+        public const string Updated = "Updated";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.AuthenticationEvent.UpdatedBy" /></summary>
+        public const string UpdatedBy = "UpdatedBy";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.AuthenticationEvent.RowVersion" /></summary>
+        public const string RowVersion = "RowVersion";
     }
+    #endregion
+
 }
diff --git a/service/src/InstructorIQ.Core/Data/Mapping/DiscussionMap.cs b/service/src/InstructorIQ.Core/Data/Mapping/DiscussionMap.cs
index ebc1f652..e9104538 100644
--- a/service/src/InstructorIQ.Core/Data/Mapping/DiscussionMap.cs
+++ b/service/src/InstructorIQ.Core/Data/Mapping/DiscussionMap.cs
@@ -1,218 +1,218 @@
 using System;
 using System.Collections.Generic;
+
 using Microsoft.EntityFrameworkCore;
 
-namespace InstructorIQ.Core.Data.Mapping
+namespace InstructorIQ.Core.Data.Mapping;
+
+/// <summary>
+/// Allows configuration for an entity type <see cref="InstructorIQ.Core.Data.Entities.Discussion" />
+/// </summary>
+public partial class DiscussionMap
+    : IEntityTypeConfiguration<InstructorIQ.Core.Data.Entities.Discussion>
 {
     /// <summary>
-    /// Allows configuration for an entity type <see cref="InstructorIQ.Core.Data.Entities.Discussion" />
+    /// Configures the entity of type <see cref="InstructorIQ.Core.Data.Entities.Discussion" />
     /// </summary>
-    public partial class DiscussionMap
-        : IEntityTypeConfiguration<InstructorIQ.Core.Data.Entities.Discussion>
+    /// <param name="builder">The builder to be used to configure the entity type.</param>
+    public void Configure(Microsoft.EntityFrameworkCore.Metadata.Builders.EntityTypeBuilder<InstructorIQ.Core.Data.Entities.Discussion> builder)
     {
-        /// <summary>
-        /// Configures the entity of type <see cref="InstructorIQ.Core.Data.Entities.Discussion" />
-        /// </summary>
-        /// <param name="builder">The builder to be used to configure the entity type.</param>
-        public void Configure(Microsoft.EntityFrameworkCore.Metadata.Builders.EntityTypeBuilder<InstructorIQ.Core.Data.Entities.Discussion> builder)
-        {
-            #region Generated Configure
-            // table
-            builder.ToTable("Discussion", "IQ");
-
-            // key
-            builder.HasKey(t => t.Id);
-
-            // properties
-            builder.Property(t => t.Id)
-                .IsRequired()
-                .HasColumnName("Id")
-                .HasColumnType("uniqueidentifier")
-                .HasDefaultValueSql("(newsequentialid())");
-
-            builder.Property(t => t.TopicId)
-                .IsRequired()
-                .HasColumnName("TopicId")
-                .HasColumnType("uniqueidentifier");
-
-            builder.Property(t => t.TenantId)
-                .IsRequired()
-                .HasColumnName("TenantId")
-                .HasColumnType("uniqueidentifier");
-
-            builder.Property(t => t.Message)
-                .HasColumnName("Message")
-                .HasColumnType("nvarchar(max)");
-
-            builder.Property(t => t.MessageDate)
-                .IsRequired()
-                .HasColumnName("MessageDate")
-                .HasColumnType("datetimeoffset")
-                .HasDefaultValueSql("(sysutcdatetime())");
-
-            builder.Property(t => t.EmailAddress)
-                .IsRequired()
-                .HasColumnName("EmailAddress")
-                .HasColumnType("nvarchar(256)")
-                .HasMaxLength(256);
-
-            builder.Property(t => t.DisplayName)
-                .IsRequired()
-                .HasColumnName("DisplayName")
-                .HasColumnType("nvarchar(256)")
-                .HasMaxLength(256);
-
-            builder.Property(t => t.UserAgent)
-                .HasColumnName("UserAgent")
-                .HasColumnType("nvarchar(max)");
-
-            builder.Property(t => t.Browser)
-                .HasColumnName("Browser")
-                .HasColumnType("nvarchar(256)")
-                .HasMaxLength(256);
-
-            builder.Property(t => t.OperatingSystem)
-                .HasColumnName("OperatingSystem")
-                .HasColumnType("nvarchar(256)")
-                .HasMaxLength(256);
-
-            builder.Property(t => t.DeviceFamily)
-                .HasColumnName("DeviceFamily")
-                .HasColumnType("nvarchar(256)")
-                .HasMaxLength(256);
-
-            builder.Property(t => t.DeviceBrand)
-                .HasColumnName("DeviceBrand")
-                .HasColumnType("nvarchar(256)")
-                .HasMaxLength(256);
-
-            builder.Property(t => t.DeviceModel)
-                .HasColumnName("DeviceModel")
-                .HasColumnType("nvarchar(256)")
-                .HasMaxLength(256);
-
-            builder.Property(t => t.IpAddress)
-                .HasColumnName("IpAddress")
-                .HasColumnType("nvarchar(50)")
-                .HasMaxLength(50);
-
-            builder.Property(t => t.Created)
-                .IsRequired()
-                .HasColumnName("Created")
-                .HasColumnType("datetimeoffset")
-                .HasDefaultValueSql("(sysutcdatetime())");
-
-            builder.Property(t => t.CreatedBy)
-                .HasColumnName("CreatedBy")
-                .HasColumnType("nvarchar(100)")
-                .HasMaxLength(100);
-
-            builder.Property(t => t.Updated)
-                .IsRequired()
-                .HasColumnName("Updated")
-                .HasColumnType("datetimeoffset")
-                .HasDefaultValueSql("(sysutcdatetime())");
-
-            builder.Property(t => t.UpdatedBy)
-                .HasColumnName("UpdatedBy")
-                .HasColumnType("nvarchar(100)")
-                .HasMaxLength(100);
-
-            builder.Property(t => t.RowVersion)
-                .IsRequired()
-                .IsRowVersion()
-                .HasColumnName("RowVersion")
-                .HasColumnType("rowversion")
-                .HasMaxLength(8)
-                .ValueGeneratedOnAddOrUpdate();
-
-            builder.Property(t => t.PeriodStart)
-                .IsRequired()
-                .HasColumnName("PeriodStart")
-                .HasColumnType("datetime2")
-                .HasDefaultValueSql("(sysutcdatetime())");
-
-            builder.Property(t => t.PeriodEnd)
-                .IsRequired()
-                .HasColumnName("PeriodEnd")
-                .HasColumnType("datetime2")
-                .HasDefaultValueSql("('9999-12-31 23:59:59.9999999')");
-
-            // relationships
-            builder.HasOne(t => t.Tenant)
-                .WithMany(t => t.Discussions)
-                .HasForeignKey(d => d.TenantId)
-                .HasConstraintName("FK_Discussion_Tenant_TenantId");
-
-            builder.HasOne(t => t.Topic)
-                .WithMany(t => t.Discussions)
-                .HasForeignKey(d => d.TopicId)
-                .HasConstraintName("FK_Discussion_Topic_TopicId");
-
-            #endregion
-
-            builder.Property(t => t.PeriodStart)
-                .ValueGeneratedOnAddOrUpdate();
-
-            builder.Property(t => t.PeriodEnd)
-                .ValueGeneratedOnAddOrUpdate();
-        }
-
-        #region Generated Constants
-        public struct Table
-        {
-            /// <summary>Table Schema name constant for entity <see cref="InstructorIQ.Core.Data.Entities.Discussion" /></summary>
-            public const string Schema = "IQ";
-            /// <summary>Table Name constant for entity <see cref="InstructorIQ.Core.Data.Entities.Discussion" /></summary>
-            public const string Name = "Discussion";
-        }
-
-        public struct Columns
-        {
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Discussion.Id" /></summary>
-            public const string Id = "Id";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Discussion.TopicId" /></summary>
-            public const string TopicId = "TopicId";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Discussion.TenantId" /></summary>
-            public const string TenantId = "TenantId";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Discussion.Message" /></summary>
-            public const string Message = "Message";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Discussion.MessageDate" /></summary>
-            public const string MessageDate = "MessageDate";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Discussion.EmailAddress" /></summary>
-            public const string EmailAddress = "EmailAddress";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Discussion.DisplayName" /></summary>
-            public const string DisplayName = "DisplayName";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Discussion.UserAgent" /></summary>
-            public const string UserAgent = "UserAgent";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Discussion.Browser" /></summary>
-            public const string Browser = "Browser";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Discussion.OperatingSystem" /></summary>
-            public const string OperatingSystem = "OperatingSystem";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Discussion.DeviceFamily" /></summary>
-            public const string DeviceFamily = "DeviceFamily";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Discussion.DeviceBrand" /></summary>
-            public const string DeviceBrand = "DeviceBrand";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Discussion.DeviceModel" /></summary>
-            public const string DeviceModel = "DeviceModel";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Discussion.IpAddress" /></summary>
-            public const string IpAddress = "IpAddress";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Discussion.Created" /></summary>
-            public const string Created = "Created";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Discussion.CreatedBy" /></summary>
-            public const string CreatedBy = "CreatedBy";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Discussion.Updated" /></summary>
-            public const string Updated = "Updated";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Discussion.UpdatedBy" /></summary>
-            public const string UpdatedBy = "UpdatedBy";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Discussion.RowVersion" /></summary>
-            public const string RowVersion = "RowVersion";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Discussion.PeriodStart" /></summary>
-            public const string PeriodStart = "PeriodStart";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Discussion.PeriodEnd" /></summary>
-            public const string PeriodEnd = "PeriodEnd";
-        }
+        #region Generated Configure
+        // table
+        builder.ToTable("Discussion", "IQ");
+
+        // key
+        builder.HasKey(t => t.Id);
+
+        // properties
+        builder.Property(t => t.Id)
+            .IsRequired()
+            .HasColumnName("Id")
+            .HasColumnType("uniqueidentifier")
+            .HasDefaultValueSql("(newsequentialid())");
+
+        builder.Property(t => t.TopicId)
+            .IsRequired()
+            .HasColumnName("TopicId")
+            .HasColumnType("uniqueidentifier");
+
+        builder.Property(t => t.TenantId)
+            .IsRequired()
+            .HasColumnName("TenantId")
+            .HasColumnType("uniqueidentifier");
+
+        builder.Property(t => t.Message)
+            .HasColumnName("Message")
+            .HasColumnType("nvarchar(max)");
+
+        builder.Property(t => t.MessageDate)
+            .IsRequired()
+            .HasColumnName("MessageDate")
+            .HasColumnType("datetimeoffset")
+            .HasDefaultValueSql("(sysutcdatetime())");
+
+        builder.Property(t => t.EmailAddress)
+            .IsRequired()
+            .HasColumnName("EmailAddress")
+            .HasColumnType("nvarchar(256)")
+            .HasMaxLength(256);
+
+        builder.Property(t => t.DisplayName)
+            .IsRequired()
+            .HasColumnName("DisplayName")
+            .HasColumnType("nvarchar(256)")
+            .HasMaxLength(256);
+
+        builder.Property(t => t.UserAgent)
+            .HasColumnName("UserAgent")
+            .HasColumnType("nvarchar(max)");
+
+        builder.Property(t => t.Browser)
+            .HasColumnName("Browser")
+            .HasColumnType("nvarchar(256)")
+            .HasMaxLength(256);
+
+        builder.Property(t => t.OperatingSystem)
+            .HasColumnName("OperatingSystem")
+            .HasColumnType("nvarchar(256)")
+            .HasMaxLength(256);
+
+        builder.Property(t => t.DeviceFamily)
+            .HasColumnName("DeviceFamily")
+            .HasColumnType("nvarchar(256)")
+            .HasMaxLength(256);
+
+        builder.Property(t => t.DeviceBrand)
+            .HasColumnName("DeviceBrand")
+            .HasColumnType("nvarchar(256)")
+            .HasMaxLength(256);
+
+        builder.Property(t => t.DeviceModel)
+            .HasColumnName("DeviceModel")
+            .HasColumnType("nvarchar(256)")
+            .HasMaxLength(256);
+
+        builder.Property(t => t.IpAddress)
+            .HasColumnName("IpAddress")
+            .HasColumnType("nvarchar(50)")
+            .HasMaxLength(50);
+
+        builder.Property(t => t.Created)
+            .IsRequired()
+            .HasColumnName("Created")
+            .HasColumnType("datetimeoffset")
+            .HasDefaultValueSql("(sysutcdatetime())");
+
+        builder.Property(t => t.CreatedBy)
+            .HasColumnName("CreatedBy")
+            .HasColumnType("nvarchar(100)")
+            .HasMaxLength(100);
+
+        builder.Property(t => t.Updated)
+            .IsRequired()
+            .HasColumnName("Updated")
+            .HasColumnType("datetimeoffset")
+            .HasDefaultValueSql("(sysutcdatetime())");
+
+        builder.Property(t => t.UpdatedBy)
+            .HasColumnName("UpdatedBy")
+            .HasColumnType("nvarchar(100)")
+            .HasMaxLength(100);
+
+        builder.Property(t => t.RowVersion)
+            .IsRequired()
+            .IsRowVersion()
+            .HasColumnName("RowVersion")
+            .HasColumnType("rowversion")
+            .HasMaxLength(8)
+            .ValueGeneratedOnAddOrUpdate();
+
+        builder.Property(t => t.PeriodStart)
+            .IsRequired()
+            .HasColumnName("PeriodStart")
+            .HasColumnType("datetime2")
+            .HasDefaultValueSql("(sysutcdatetime())");
+
+        builder.Property(t => t.PeriodEnd)
+            .IsRequired()
+            .HasColumnName("PeriodEnd")
+            .HasColumnType("datetime2")
+            .HasDefaultValueSql("('9999-12-31 23:59:59.9999999')");
+
+        // relationships
+        builder.HasOne(t => t.Tenant)
+            .WithMany(t => t.Discussions)
+            .HasForeignKey(d => d.TenantId)
+            .HasConstraintName("FK_Discussion_Tenant_TenantId");
+
+        builder.HasOne(t => t.Topic)
+            .WithMany(t => t.Discussions)
+            .HasForeignKey(d => d.TopicId)
+            .HasConstraintName("FK_Discussion_Topic_TopicId");
+
         #endregion
 
+        builder.Property(t => t.PeriodStart)
+            .ValueGeneratedOnAddOrUpdate();
+
+        builder.Property(t => t.PeriodEnd)
+            .ValueGeneratedOnAddOrUpdate();
     }
+
+    #region Generated Constants
+    public struct Table
+    {
+        /// <summary>Table Schema name constant for entity <see cref="InstructorIQ.Core.Data.Entities.Discussion" /></summary>
+        public const string Schema = "IQ";
+        /// <summary>Table Name constant for entity <see cref="InstructorIQ.Core.Data.Entities.Discussion" /></summary>
+        public const string Name = "Discussion";
+    }
+
+    public struct Columns
+    {
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Discussion.Id" /></summary>
+        public const string Id = "Id";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Discussion.TopicId" /></summary>
+        public const string TopicId = "TopicId";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Discussion.TenantId" /></summary>
+        public const string TenantId = "TenantId";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Discussion.Message" /></summary>
+        public const string Message = "Message";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Discussion.MessageDate" /></summary>
+        public const string MessageDate = "MessageDate";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Discussion.EmailAddress" /></summary>
+        public const string EmailAddress = "EmailAddress";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Discussion.DisplayName" /></summary>
+        public const string DisplayName = "DisplayName";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Discussion.UserAgent" /></summary>
+        public const string UserAgent = "UserAgent";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Discussion.Browser" /></summary>
+        public const string Browser = "Browser";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Discussion.OperatingSystem" /></summary>
+        public const string OperatingSystem = "OperatingSystem";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Discussion.DeviceFamily" /></summary>
+        public const string DeviceFamily = "DeviceFamily";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Discussion.DeviceBrand" /></summary>
+        public const string DeviceBrand = "DeviceBrand";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Discussion.DeviceModel" /></summary>
+        public const string DeviceModel = "DeviceModel";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Discussion.IpAddress" /></summary>
+        public const string IpAddress = "IpAddress";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Discussion.Created" /></summary>
+        public const string Created = "Created";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Discussion.CreatedBy" /></summary>
+        public const string CreatedBy = "CreatedBy";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Discussion.Updated" /></summary>
+        public const string Updated = "Updated";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Discussion.UpdatedBy" /></summary>
+        public const string UpdatedBy = "UpdatedBy";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Discussion.RowVersion" /></summary>
+        public const string RowVersion = "RowVersion";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Discussion.PeriodStart" /></summary>
+        public const string PeriodStart = "PeriodStart";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Discussion.PeriodEnd" /></summary>
+        public const string PeriodEnd = "PeriodEnd";
+    }
+    #endregion
+
 }
diff --git a/service/src/InstructorIQ.Core/Data/Mapping/EmailDeliveryMap.cs b/service/src/InstructorIQ.Core/Data/Mapping/EmailDeliveryMap.cs
index 702b03cb..1f44f305 100644
--- a/service/src/InstructorIQ.Core/Data/Mapping/EmailDeliveryMap.cs
+++ b/service/src/InstructorIQ.Core/Data/Mapping/EmailDeliveryMap.cs
@@ -1,183 +1,183 @@
 using System;
 using System.Collections.Generic;
+
 using Microsoft.EntityFrameworkCore;
 
-namespace InstructorIQ.Core.Data.Mapping
+namespace InstructorIQ.Core.Data.Mapping;
+
+/// <summary>
+/// Allows configuration for an entity type <see cref="InstructorIQ.Core.Data.Entities.EmailDelivery" />
+/// </summary>
+public class EmailDeliveryMap
+    : IEntityTypeConfiguration<InstructorIQ.Core.Data.Entities.EmailDelivery>
 {
     /// <summary>
-    /// Allows configuration for an entity type <see cref="InstructorIQ.Core.Data.Entities.EmailDelivery" />
+    /// Configures the entity of type <see cref="InstructorIQ.Core.Data.Entities.EmailDelivery" />
     /// </summary>
-    public class EmailDeliveryMap
-        : IEntityTypeConfiguration<InstructorIQ.Core.Data.Entities.EmailDelivery>
+    /// <param name="builder">The builder to be used to configure the entity type.</param>
+    public void Configure(Microsoft.EntityFrameworkCore.Metadata.Builders.EntityTypeBuilder<InstructorIQ.Core.Data.Entities.EmailDelivery> builder)
     {
-        /// <summary>
-        /// Configures the entity of type <see cref="InstructorIQ.Core.Data.Entities.EmailDelivery" />
-        /// </summary>
-        /// <param name="builder">The builder to be used to configure the entity type.</param>
-        public void Configure(Microsoft.EntityFrameworkCore.Metadata.Builders.EntityTypeBuilder<InstructorIQ.Core.Data.Entities.EmailDelivery> builder)
-        {
-            #region Generated Configure
-            // table
-            builder.ToTable("EmailDelivery", "IQ");
-
-            // key
-            builder.HasKey(t => t.Id);
-
-            // properties
-            builder.Property(t => t.Id)
-                .IsRequired()
-                .HasColumnName("Id")
-                .HasColumnType("uniqueidentifier")
-                .HasDefaultValueSql("(newsequentialid())");
-
-            builder.Property(t => t.IsProcessing)
-                .IsRequired()
-                .HasColumnName("IsProcessing")
-                .HasColumnType("bit");
-
-            builder.Property(t => t.IsDelivered)
-                .IsRequired()
-                .HasColumnName("IsDelivered")
-                .HasColumnType("bit");
-
-            builder.Property(t => t.Delivered)
-                .HasColumnName("Delivered")
-                .HasColumnType("datetimeoffset");
-
-            builder.Property(t => t.Attempts)
-                .IsRequired()
-                .HasColumnName("Attempts")
-                .HasColumnType("int");
-
-            builder.Property(t => t.LastAttempt)
-                .HasColumnName("LastAttempt")
-                .HasColumnType("datetimeoffset");
-
-            builder.Property(t => t.NextAttempt)
-                .HasColumnName("NextAttempt")
-                .HasColumnType("datetimeoffset");
-
-            builder.Property(t => t.SmtpLog)
-                .HasColumnName("SmtpLog")
-                .HasColumnType("nvarchar(max)");
-
-            builder.Property(t => t.Error)
-                .HasColumnName("Error")
-                .HasColumnType("nvarchar(max)");
-
-            builder.Property(t => t.From)
-                .HasColumnName("From")
-                .HasColumnType("nvarchar(265)")
-                .HasMaxLength(265);
-
-            builder.Property(t => t.To)
-                .HasColumnName("To")
-                .HasColumnType("nvarchar(265)")
-                .HasMaxLength(265);
-
-            builder.Property(t => t.Subject)
-                .HasColumnName("Subject")
-                .HasColumnType("nvarchar(265)")
-                .HasMaxLength(265);
-
-            builder.Property(t => t.MimeMessage)
-                .HasColumnName("MimeMessage")
-                .HasColumnType("varbinary(max)");
-
-            builder.Property(t => t.TenantId)
-                .HasColumnName("TenantId")
-                .HasColumnType("uniqueidentifier");
-
-            builder.Property(t => t.Created)
-                .IsRequired()
-                .HasColumnName("Created")
-                .HasColumnType("datetimeoffset")
-                .HasDefaultValueSql("(sysutcdatetime())");
-
-            builder.Property(t => t.CreatedBy)
-                .HasColumnName("CreatedBy")
-                .HasColumnType("nvarchar(100)")
-                .HasMaxLength(100);
-
-            builder.Property(t => t.Updated)
-                .IsRequired()
-                .HasColumnName("Updated")
-                .HasColumnType("datetimeoffset")
-                .HasDefaultValueSql("(sysutcdatetime())");
-
-            builder.Property(t => t.UpdatedBy)
-                .HasColumnName("UpdatedBy")
-                .HasColumnType("nvarchar(100)")
-                .HasMaxLength(100);
-
-            builder.Property(t => t.RowVersion)
-                .IsRequired()
-                .IsRowVersion()
-                .HasColumnName("RowVersion")
-                .HasColumnType("rowversion")
-                .HasMaxLength(8)
-                .ValueGeneratedOnAddOrUpdate();
-
-            // relationships
-            builder.HasOne(t => t.Tenant)
-                .WithMany(t => t.EmailDeliveries)
-                .HasForeignKey(d => d.TenantId)
-                .HasConstraintName("FK_EmailDelivery_Tenant_TenantId");
-
-            #endregion
-        }
-
-        #region Generated Constants
-        public struct Table
-        {
-            /// <summary>Table Schema name constant for entity <see cref="InstructorIQ.Core.Data.Entities.EmailDelivery" /></summary>
-            public const string Schema = "IQ";
-            /// <summary>Table Name constant for entity <see cref="InstructorIQ.Core.Data.Entities.EmailDelivery" /></summary>
-            public const string Name = "EmailDelivery";
-        }
-
-        public struct Columns
-        {
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.EmailDelivery.Id" /></summary>
-            public const string Id = "Id";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.EmailDelivery.IsProcessing" /></summary>
-            public const string IsProcessing = "IsProcessing";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.EmailDelivery.IsDelivered" /></summary>
-            public const string IsDelivered = "IsDelivered";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.EmailDelivery.Delivered" /></summary>
-            public const string Delivered = "Delivered";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.EmailDelivery.Attempts" /></summary>
-            public const string Attempts = "Attempts";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.EmailDelivery.LastAttempt" /></summary>
-            public const string LastAttempt = "LastAttempt";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.EmailDelivery.NextAttempt" /></summary>
-            public const string NextAttempt = "NextAttempt";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.EmailDelivery.SmtpLog" /></summary>
-            public const string SmtpLog = "SmtpLog";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.EmailDelivery.Error" /></summary>
-            public const string Error = "Error";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.EmailDelivery.From" /></summary>
-            public const string From = "From";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.EmailDelivery.To" /></summary>
-            public const string To = "To";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.EmailDelivery.Subject" /></summary>
-            public const string Subject = "Subject";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.EmailDelivery.MimeMessage" /></summary>
-            public const string MimeMessage = "MimeMessage";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.EmailDelivery.TenantId" /></summary>
-            public const string TenantId = "TenantId";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.EmailDelivery.Created" /></summary>
-            public const string Created = "Created";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.EmailDelivery.CreatedBy" /></summary>
-            public const string CreatedBy = "CreatedBy";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.EmailDelivery.Updated" /></summary>
-            public const string Updated = "Updated";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.EmailDelivery.UpdatedBy" /></summary>
-            public const string UpdatedBy = "UpdatedBy";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.EmailDelivery.RowVersion" /></summary>
-            public const string RowVersion = "RowVersion";
-        }
+        #region Generated Configure
+        // table
+        builder.ToTable("EmailDelivery", "IQ");
+
+        // key
+        builder.HasKey(t => t.Id);
+
+        // properties
+        builder.Property(t => t.Id)
+            .IsRequired()
+            .HasColumnName("Id")
+            .HasColumnType("uniqueidentifier")
+            .HasDefaultValueSql("(newsequentialid())");
+
+        builder.Property(t => t.IsProcessing)
+            .IsRequired()
+            .HasColumnName("IsProcessing")
+            .HasColumnType("bit");
+
+        builder.Property(t => t.IsDelivered)
+            .IsRequired()
+            .HasColumnName("IsDelivered")
+            .HasColumnType("bit");
+
+        builder.Property(t => t.Delivered)
+            .HasColumnName("Delivered")
+            .HasColumnType("datetimeoffset");
+
+        builder.Property(t => t.Attempts)
+            .IsRequired()
+            .HasColumnName("Attempts")
+            .HasColumnType("int");
+
+        builder.Property(t => t.LastAttempt)
+            .HasColumnName("LastAttempt")
+            .HasColumnType("datetimeoffset");
+
+        builder.Property(t => t.NextAttempt)
+            .HasColumnName("NextAttempt")
+            .HasColumnType("datetimeoffset");
+
+        builder.Property(t => t.SmtpLog)
+            .HasColumnName("SmtpLog")
+            .HasColumnType("nvarchar(max)");
+
+        builder.Property(t => t.Error)
+            .HasColumnName("Error")
+            .HasColumnType("nvarchar(max)");
+
+        builder.Property(t => t.From)
+            .HasColumnName("From")
+            .HasColumnType("nvarchar(265)")
+            .HasMaxLength(265);
+
+        builder.Property(t => t.To)
+            .HasColumnName("To")
+            .HasColumnType("nvarchar(265)")
+            .HasMaxLength(265);
+
+        builder.Property(t => t.Subject)
+            .HasColumnName("Subject")
+            .HasColumnType("nvarchar(265)")
+            .HasMaxLength(265);
+
+        builder.Property(t => t.MimeMessage)
+            .HasColumnName("MimeMessage")
+            .HasColumnType("varbinary(max)");
+
+        builder.Property(t => t.TenantId)
+            .HasColumnName("TenantId")
+            .HasColumnType("uniqueidentifier");
+
+        builder.Property(t => t.Created)
+            .IsRequired()
+            .HasColumnName("Created")
+            .HasColumnType("datetimeoffset")
+            .HasDefaultValueSql("(sysutcdatetime())");
+
+        builder.Property(t => t.CreatedBy)
+            .HasColumnName("CreatedBy")
+            .HasColumnType("nvarchar(100)")
+            .HasMaxLength(100);
+
+        builder.Property(t => t.Updated)
+            .IsRequired()
+            .HasColumnName("Updated")
+            .HasColumnType("datetimeoffset")
+            .HasDefaultValueSql("(sysutcdatetime())");
+
+        builder.Property(t => t.UpdatedBy)
+            .HasColumnName("UpdatedBy")
+            .HasColumnType("nvarchar(100)")
+            .HasMaxLength(100);
+
+        builder.Property(t => t.RowVersion)
+            .IsRequired()
+            .IsRowVersion()
+            .HasColumnName("RowVersion")
+            .HasColumnType("rowversion")
+            .HasMaxLength(8)
+            .ValueGeneratedOnAddOrUpdate();
+
+        // relationships
+        builder.HasOne(t => t.Tenant)
+            .WithMany(t => t.EmailDeliveries)
+            .HasForeignKey(d => d.TenantId)
+            .HasConstraintName("FK_EmailDelivery_Tenant_TenantId");
+
         #endregion
+    }
 
+    #region Generated Constants
+    public struct Table
+    {
+        /// <summary>Table Schema name constant for entity <see cref="InstructorIQ.Core.Data.Entities.EmailDelivery" /></summary>
+        public const string Schema = "IQ";
+        /// <summary>Table Name constant for entity <see cref="InstructorIQ.Core.Data.Entities.EmailDelivery" /></summary>
+        public const string Name = "EmailDelivery";
     }
+
+    public struct Columns
+    {
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.EmailDelivery.Id" /></summary>
+        public const string Id = "Id";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.EmailDelivery.IsProcessing" /></summary>
+        public const string IsProcessing = "IsProcessing";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.EmailDelivery.IsDelivered" /></summary>
+        public const string IsDelivered = "IsDelivered";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.EmailDelivery.Delivered" /></summary>
+        public const string Delivered = "Delivered";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.EmailDelivery.Attempts" /></summary>
+        public const string Attempts = "Attempts";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.EmailDelivery.LastAttempt" /></summary>
+        public const string LastAttempt = "LastAttempt";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.EmailDelivery.NextAttempt" /></summary>
+        public const string NextAttempt = "NextAttempt";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.EmailDelivery.SmtpLog" /></summary>
+        public const string SmtpLog = "SmtpLog";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.EmailDelivery.Error" /></summary>
+        public const string Error = "Error";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.EmailDelivery.From" /></summary>
+        public const string From = "From";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.EmailDelivery.To" /></summary>
+        public const string To = "To";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.EmailDelivery.Subject" /></summary>
+        public const string Subject = "Subject";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.EmailDelivery.MimeMessage" /></summary>
+        public const string MimeMessage = "MimeMessage";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.EmailDelivery.TenantId" /></summary>
+        public const string TenantId = "TenantId";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.EmailDelivery.Created" /></summary>
+        public const string Created = "Created";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.EmailDelivery.CreatedBy" /></summary>
+        public const string CreatedBy = "CreatedBy";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.EmailDelivery.Updated" /></summary>
+        public const string Updated = "Updated";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.EmailDelivery.UpdatedBy" /></summary>
+        public const string UpdatedBy = "UpdatedBy";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.EmailDelivery.RowVersion" /></summary>
+        public const string RowVersion = "RowVersion";
+    }
+    #endregion
+
 }
diff --git a/service/src/InstructorIQ.Core/Data/Mapping/EmailTemplateMap.cs b/service/src/InstructorIQ.Core/Data/Mapping/EmailTemplateMap.cs
index 0b466cc4..2f5a5003 100644
--- a/service/src/InstructorIQ.Core/Data/Mapping/EmailTemplateMap.cs
+++ b/service/src/InstructorIQ.Core/Data/Mapping/EmailTemplateMap.cs
@@ -1,161 +1,161 @@
 using System;
 using System.Collections.Generic;
+
 using Microsoft.EntityFrameworkCore;
 
-namespace InstructorIQ.Core.Data.Mapping
+namespace InstructorIQ.Core.Data.Mapping;
+
+/// <summary>
+/// Allows configuration for an entity type <see cref="InstructorIQ.Core.Data.Entities.EmailTemplate" />
+/// </summary>
+public class EmailTemplateMap
+    : IEntityTypeConfiguration<InstructorIQ.Core.Data.Entities.EmailTemplate>
 {
     /// <summary>
-    /// Allows configuration for an entity type <see cref="InstructorIQ.Core.Data.Entities.EmailTemplate" />
+    /// Configures the entity of type <see cref="InstructorIQ.Core.Data.Entities.EmailTemplate" />
     /// </summary>
-    public class EmailTemplateMap
-        : IEntityTypeConfiguration<InstructorIQ.Core.Data.Entities.EmailTemplate>
+    /// <param name="builder">The builder to be used to configure the entity type.</param>
+    public void Configure(Microsoft.EntityFrameworkCore.Metadata.Builders.EntityTypeBuilder<InstructorIQ.Core.Data.Entities.EmailTemplate> builder)
     {
-        /// <summary>
-        /// Configures the entity of type <see cref="InstructorIQ.Core.Data.Entities.EmailTemplate" />
-        /// </summary>
-        /// <param name="builder">The builder to be used to configure the entity type.</param>
-        public void Configure(Microsoft.EntityFrameworkCore.Metadata.Builders.EntityTypeBuilder<InstructorIQ.Core.Data.Entities.EmailTemplate> builder)
-        {
-            #region Generated Configure
-            // table
-            builder.ToTable("EmailTemplate", "IQ");
-
-            // key
-            builder.HasKey(t => t.Id);
-
-            // properties
-            builder.Property(t => t.Id)
-                .IsRequired()
-                .HasColumnName("Id")
-                .HasColumnType("uniqueidentifier")
-                .HasDefaultValueSql("(newsequentialid())");
-
-            builder.Property(t => t.Key)
-                .IsRequired()
-                .HasColumnName("Key")
-                .HasColumnType("nvarchar(100)")
-                .HasMaxLength(100);
-
-            builder.Property(t => t.FromAddress)
-                .IsRequired()
-                .HasColumnName("FromAddress")
-                .HasColumnType("nvarchar(256)")
-                .HasMaxLength(256);
-
-            builder.Property(t => t.FromName)
-                .IsRequired()
-                .HasColumnName("FromName")
-                .HasColumnType("nvarchar(256)")
-                .HasMaxLength(256);
-
-            builder.Property(t => t.ReplyToAddress)
-                .HasColumnName("ReplyToAddress")
-                .HasColumnType("nvarchar(256)")
-                .HasMaxLength(256);
-
-            builder.Property(t => t.ReplyToName)
-                .HasColumnName("ReplyToName")
-                .HasColumnType("nvarchar(256)")
-                .HasMaxLength(256);
-
-            builder.Property(t => t.Subject)
-                .HasColumnName("Subject")
-                .HasColumnType("nvarchar(max)");
-
-            builder.Property(t => t.TextBody)
-                .HasColumnName("TextBody")
-                .HasColumnType("nvarchar(max)");
-
-            builder.Property(t => t.HtmlBody)
-                .HasColumnName("HtmlBody")
-                .HasColumnType("nvarchar(max)");
-
-            builder.Property(t => t.TenantId)
-                .HasColumnName("TenantId")
-                .HasColumnType("uniqueidentifier");
-
-            builder.Property(t => t.Created)
-                .IsRequired()
-                .HasColumnName("Created")
-                .HasColumnType("datetimeoffset")
-                .HasDefaultValueSql("(sysutcdatetime())");
-
-            builder.Property(t => t.CreatedBy)
-                .HasColumnName("CreatedBy")
-                .HasColumnType("nvarchar(100)")
-                .HasMaxLength(100);
-
-            builder.Property(t => t.Updated)
-                .IsRequired()
-                .HasColumnName("Updated")
-                .HasColumnType("datetimeoffset")
-                .HasDefaultValueSql("(sysutcdatetime())");
-
-            builder.Property(t => t.UpdatedBy)
-                .HasColumnName("UpdatedBy")
-                .HasColumnType("nvarchar(100)")
-                .HasMaxLength(100);
-
-            builder.Property(t => t.RowVersion)
-                .IsRequired()
-                .IsRowVersion()
-                .HasColumnName("RowVersion")
-                .HasColumnType("rowversion")
-                .HasMaxLength(8)
-                .ValueGeneratedOnAddOrUpdate();
-
-            // relationships
-            builder.HasOne(t => t.Tenant)
-                .WithMany(t => t.EmailTemplates)
-                .HasForeignKey(d => d.TenantId)
-                .HasConstraintName("FK_EmailTemplate_Tenant_TenantId");
-
-            #endregion
-        }
-
-        #region Generated Constants
-        public struct Table
-        {
-            /// <summary>Table Schema name constant for entity <see cref="InstructorIQ.Core.Data.Entities.EmailTemplate" /></summary>
-            public const string Schema = "IQ";
-            /// <summary>Table Name constant for entity <see cref="InstructorIQ.Core.Data.Entities.EmailTemplate" /></summary>
-            public const string Name = "EmailTemplate";
-        }
-
-        public struct Columns
-        {
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.EmailTemplate.Id" /></summary>
-            public const string Id = "Id";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.EmailTemplate.Key" /></summary>
-            public const string Key = "Key";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.EmailTemplate.FromAddress" /></summary>
-            public const string FromAddress = "FromAddress";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.EmailTemplate.FromName" /></summary>
-            public const string FromName = "FromName";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.EmailTemplate.ReplyToAddress" /></summary>
-            public const string ReplyToAddress = "ReplyToAddress";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.EmailTemplate.ReplyToName" /></summary>
-            public const string ReplyToName = "ReplyToName";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.EmailTemplate.Subject" /></summary>
-            public const string Subject = "Subject";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.EmailTemplate.TextBody" /></summary>
-            public const string TextBody = "TextBody";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.EmailTemplate.HtmlBody" /></summary>
-            public const string HtmlBody = "HtmlBody";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.EmailTemplate.TenantId" /></summary>
-            public const string TenantId = "TenantId";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.EmailTemplate.Created" /></summary>
-            public const string Created = "Created";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.EmailTemplate.CreatedBy" /></summary>
-            public const string CreatedBy = "CreatedBy";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.EmailTemplate.Updated" /></summary>
-            public const string Updated = "Updated";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.EmailTemplate.UpdatedBy" /></summary>
-            public const string UpdatedBy = "UpdatedBy";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.EmailTemplate.RowVersion" /></summary>
-            public const string RowVersion = "RowVersion";
-        }
+        #region Generated Configure
+        // table
+        builder.ToTable("EmailTemplate", "IQ");
+
+        // key
+        builder.HasKey(t => t.Id);
+
+        // properties
+        builder.Property(t => t.Id)
+            .IsRequired()
+            .HasColumnName("Id")
+            .HasColumnType("uniqueidentifier")
+            .HasDefaultValueSql("(newsequentialid())");
+
+        builder.Property(t => t.Key)
+            .IsRequired()
+            .HasColumnName("Key")
+            .HasColumnType("nvarchar(100)")
+            .HasMaxLength(100);
+
+        builder.Property(t => t.FromAddress)
+            .IsRequired()
+            .HasColumnName("FromAddress")
+            .HasColumnType("nvarchar(256)")
+            .HasMaxLength(256);
+
+        builder.Property(t => t.FromName)
+            .IsRequired()
+            .HasColumnName("FromName")
+            .HasColumnType("nvarchar(256)")
+            .HasMaxLength(256);
+
+        builder.Property(t => t.ReplyToAddress)
+            .HasColumnName("ReplyToAddress")
+            .HasColumnType("nvarchar(256)")
+            .HasMaxLength(256);
+
+        builder.Property(t => t.ReplyToName)
+            .HasColumnName("ReplyToName")
+            .HasColumnType("nvarchar(256)")
+            .HasMaxLength(256);
+
+        builder.Property(t => t.Subject)
+            .HasColumnName("Subject")
+            .HasColumnType("nvarchar(max)");
+
+        builder.Property(t => t.TextBody)
+            .HasColumnName("TextBody")
+            .HasColumnType("nvarchar(max)");
+
+        builder.Property(t => t.HtmlBody)
+            .HasColumnName("HtmlBody")
+            .HasColumnType("nvarchar(max)");
+
+        builder.Property(t => t.TenantId)
+            .HasColumnName("TenantId")
+            .HasColumnType("uniqueidentifier");
+
+        builder.Property(t => t.Created)
+            .IsRequired()
+            .HasColumnName("Created")
+            .HasColumnType("datetimeoffset")
+            .HasDefaultValueSql("(sysutcdatetime())");
+
+        builder.Property(t => t.CreatedBy)
+            .HasColumnName("CreatedBy")
+            .HasColumnType("nvarchar(100)")
+            .HasMaxLength(100);
+
+        builder.Property(t => t.Updated)
+            .IsRequired()
+            .HasColumnName("Updated")
+            .HasColumnType("datetimeoffset")
+            .HasDefaultValueSql("(sysutcdatetime())");
+
+        builder.Property(t => t.UpdatedBy)
+            .HasColumnName("UpdatedBy")
+            .HasColumnType("nvarchar(100)")
+            .HasMaxLength(100);
+
+        builder.Property(t => t.RowVersion)
+            .IsRequired()
+            .IsRowVersion()
+            .HasColumnName("RowVersion")
+            .HasColumnType("rowversion")
+            .HasMaxLength(8)
+            .ValueGeneratedOnAddOrUpdate();
+
+        // relationships
+        builder.HasOne(t => t.Tenant)
+            .WithMany(t => t.EmailTemplates)
+            .HasForeignKey(d => d.TenantId)
+            .HasConstraintName("FK_EmailTemplate_Tenant_TenantId");
+
         #endregion
+    }
 
+    #region Generated Constants
+    public struct Table
+    {
+        /// <summary>Table Schema name constant for entity <see cref="InstructorIQ.Core.Data.Entities.EmailTemplate" /></summary>
+        public const string Schema = "IQ";
+        /// <summary>Table Name constant for entity <see cref="InstructorIQ.Core.Data.Entities.EmailTemplate" /></summary>
+        public const string Name = "EmailTemplate";
     }
+
+    public struct Columns
+    {
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.EmailTemplate.Id" /></summary>
+        public const string Id = "Id";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.EmailTemplate.Key" /></summary>
+        public const string Key = "Key";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.EmailTemplate.FromAddress" /></summary>
+        public const string FromAddress = "FromAddress";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.EmailTemplate.FromName" /></summary>
+        public const string FromName = "FromName";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.EmailTemplate.ReplyToAddress" /></summary>
+        public const string ReplyToAddress = "ReplyToAddress";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.EmailTemplate.ReplyToName" /></summary>
+        public const string ReplyToName = "ReplyToName";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.EmailTemplate.Subject" /></summary>
+        public const string Subject = "Subject";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.EmailTemplate.TextBody" /></summary>
+        public const string TextBody = "TextBody";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.EmailTemplate.HtmlBody" /></summary>
+        public const string HtmlBody = "HtmlBody";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.EmailTemplate.TenantId" /></summary>
+        public const string TenantId = "TenantId";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.EmailTemplate.Created" /></summary>
+        public const string Created = "Created";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.EmailTemplate.CreatedBy" /></summary>
+        public const string CreatedBy = "CreatedBy";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.EmailTemplate.Updated" /></summary>
+        public const string Updated = "Updated";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.EmailTemplate.UpdatedBy" /></summary>
+        public const string UpdatedBy = "UpdatedBy";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.EmailTemplate.RowVersion" /></summary>
+        public const string RowVersion = "RowVersion";
+    }
+    #endregion
+
 }
diff --git a/service/src/InstructorIQ.Core/Data/Mapping/GroupMap.cs b/service/src/InstructorIQ.Core/Data/Mapping/GroupMap.cs
index f8889e34..8d5b0db5 100644
--- a/service/src/InstructorIQ.Core/Data/Mapping/GroupMap.cs
+++ b/service/src/InstructorIQ.Core/Data/Mapping/GroupMap.cs
@@ -1,156 +1,156 @@
 using System;
 using System.Collections.Generic;
+
 using Microsoft.EntityFrameworkCore;
 
-namespace InstructorIQ.Core.Data.Mapping
+namespace InstructorIQ.Core.Data.Mapping;
+
+/// <summary>
+/// Allows configuration for an entity type <see cref="InstructorIQ.Core.Data.Entities.Group" />
+/// </summary>
+public class GroupMap
+    : IEntityTypeConfiguration<InstructorIQ.Core.Data.Entities.Group>
 {
     /// <summary>
-    /// Allows configuration for an entity type <see cref="InstructorIQ.Core.Data.Entities.Group" />
+    /// Configures the entity of type <see cref="InstructorIQ.Core.Data.Entities.Group" />
     /// </summary>
-    public class GroupMap
-        : IEntityTypeConfiguration<InstructorIQ.Core.Data.Entities.Group>
+    /// <param name="builder">The builder to be used to configure the entity type.</param>
+    public void Configure(Microsoft.EntityFrameworkCore.Metadata.Builders.EntityTypeBuilder<InstructorIQ.Core.Data.Entities.Group> builder)
     {
-        /// <summary>
-        /// Configures the entity of type <see cref="InstructorIQ.Core.Data.Entities.Group" />
-        /// </summary>
-        /// <param name="builder">The builder to be used to configure the entity type.</param>
-        public void Configure(Microsoft.EntityFrameworkCore.Metadata.Builders.EntityTypeBuilder<InstructorIQ.Core.Data.Entities.Group> builder)
-        {
-            #region Generated Configure
-            // table
-            builder.ToTable("Group", "IQ");
-
-            // key
-            builder.HasKey(t => t.Id);
-
-            // properties
-            builder.Property(t => t.Id)
-                .IsRequired()
-                .HasColumnName("Id")
-                .HasColumnType("uniqueidentifier")
-                .HasDefaultValueSql("(newsequentialid())");
-
-            builder.Property(t => t.Name)
-                .IsRequired()
-                .HasColumnName("Name")
-                .HasColumnType("nvarchar(256)")
-                .HasMaxLength(256);
-
-            builder.Property(t => t.Description)
-                .HasColumnName("Description")
-                .HasColumnType("nvarchar(max)");
-
-            builder.Property(t => t.Sequence)
-                .IsRequired()
-                .HasColumnName("Sequence")
-                .HasColumnType("int");
-
-            builder.Property(t => t.DisplayOrder)
-                .IsRequired()
-                .HasColumnName("DisplayOrder")
-                .HasColumnType("int");
-
-            builder.Property(t => t.TenantId)
-                .IsRequired()
-                .HasColumnName("TenantId")
-                .HasColumnType("uniqueidentifier");
-
-            builder.Property(t => t.Created)
-                .IsRequired()
-                .HasColumnName("Created")
-                .HasColumnType("datetimeoffset")
-                .HasDefaultValueSql("(sysutcdatetime())");
-
-            builder.Property(t => t.CreatedBy)
-                .HasColumnName("CreatedBy")
-                .HasColumnType("nvarchar(100)")
-                .HasMaxLength(100);
-
-            builder.Property(t => t.Updated)
-                .IsRequired()
-                .HasColumnName("Updated")
-                .HasColumnType("datetimeoffset")
-                .HasDefaultValueSql("(sysutcdatetime())");
-
-            builder.Property(t => t.UpdatedBy)
-                .HasColumnName("UpdatedBy")
-                .HasColumnType("nvarchar(100)")
-                .HasMaxLength(100);
-
-            builder.Property(t => t.RowVersion)
-                .IsRequired()
-                .IsRowVersion()
-                .HasColumnName("RowVersion")
-                .HasColumnType("rowversion")
-                .HasMaxLength(8)
-                .ValueGeneratedOnAddOrUpdate();
-
-            builder.Property(t => t.PeriodStart)
-                .IsRequired()
-                .HasColumnName("PeriodStart")
-                .HasColumnType("datetime2")
-                .HasDefaultValueSql("(sysutcdatetime())");
-
-            builder.Property(t => t.PeriodEnd)
-                .IsRequired()
-                .HasColumnName("PeriodEnd")
-                .HasColumnType("datetime2")
-                .HasDefaultValueSql("('9999-12-31 23:59:59.9999999')");
-
-            // relationships
-            builder.HasOne(t => t.Tenant)
-                .WithMany(t => t.Groups)
-                .HasForeignKey(d => d.TenantId)
-                .HasConstraintName("FK_Group_Tenant_TenantId");
-
-            #endregion
-
-            builder.Property(t => t.PeriodStart)
-                .ValueGeneratedOnAddOrUpdate();
-
-            builder.Property(t => t.PeriodEnd)
-                .ValueGeneratedOnAddOrUpdate();
-        }
-
-        #region Generated Constants
-        public struct Table
-        {
-            /// <summary>Table Schema name constant for entity <see cref="InstructorIQ.Core.Data.Entities.Group" /></summary>
-            public const string Schema = "IQ";
-            /// <summary>Table Name constant for entity <see cref="InstructorIQ.Core.Data.Entities.Group" /></summary>
-            public const string Name = "Group";
-        }
-
-        public struct Columns
-        {
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Group.Id" /></summary>
-            public const string Id = "Id";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Group.Name" /></summary>
-            public const string Name = "Name";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Group.Description" /></summary>
-            public const string Description = "Description";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Group.Sequence" /></summary>
-            public const string Sequence = "Sequence";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Group.DisplayOrder" /></summary>
-            public const string DisplayOrder = "DisplayOrder";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Group.TenantId" /></summary>
-            public const string TenantId = "TenantId";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Group.Created" /></summary>
-            public const string Created = "Created";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Group.CreatedBy" /></summary>
-            public const string CreatedBy = "CreatedBy";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Group.Updated" /></summary>
-            public const string Updated = "Updated";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Group.UpdatedBy" /></summary>
-            public const string UpdatedBy = "UpdatedBy";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Group.RowVersion" /></summary>
-            public const string RowVersion = "RowVersion";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Group.PeriodStart" /></summary>
-            public const string PeriodStart = "PeriodStart";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Group.PeriodEnd" /></summary>
-            public const string PeriodEnd = "PeriodEnd";
-        }
+        #region Generated Configure
+        // table
+        builder.ToTable("Group", "IQ");
+
+        // key
+        builder.HasKey(t => t.Id);
+
+        // properties
+        builder.Property(t => t.Id)
+            .IsRequired()
+            .HasColumnName("Id")
+            .HasColumnType("uniqueidentifier")
+            .HasDefaultValueSql("(newsequentialid())");
+
+        builder.Property(t => t.Name)
+            .IsRequired()
+            .HasColumnName("Name")
+            .HasColumnType("nvarchar(256)")
+            .HasMaxLength(256);
+
+        builder.Property(t => t.Description)
+            .HasColumnName("Description")
+            .HasColumnType("nvarchar(max)");
+
+        builder.Property(t => t.Sequence)
+            .IsRequired()
+            .HasColumnName("Sequence")
+            .HasColumnType("int");
+
+        builder.Property(t => t.DisplayOrder)
+            .IsRequired()
+            .HasColumnName("DisplayOrder")
+            .HasColumnType("int");
+
+        builder.Property(t => t.TenantId)
+            .IsRequired()
+            .HasColumnName("TenantId")
+            .HasColumnType("uniqueidentifier");
+
+        builder.Property(t => t.Created)
+            .IsRequired()
+            .HasColumnName("Created")
+            .HasColumnType("datetimeoffset")
+            .HasDefaultValueSql("(sysutcdatetime())");
+
+        builder.Property(t => t.CreatedBy)
+            .HasColumnName("CreatedBy")
+            .HasColumnType("nvarchar(100)")
+            .HasMaxLength(100);
+
+        builder.Property(t => t.Updated)
+            .IsRequired()
+            .HasColumnName("Updated")
+            .HasColumnType("datetimeoffset")
+            .HasDefaultValueSql("(sysutcdatetime())");
+
+        builder.Property(t => t.UpdatedBy)
+            .HasColumnName("UpdatedBy")
+            .HasColumnType("nvarchar(100)")
+            .HasMaxLength(100);
+
+        builder.Property(t => t.RowVersion)
+            .IsRequired()
+            .IsRowVersion()
+            .HasColumnName("RowVersion")
+            .HasColumnType("rowversion")
+            .HasMaxLength(8)
+            .ValueGeneratedOnAddOrUpdate();
+
+        builder.Property(t => t.PeriodStart)
+            .IsRequired()
+            .HasColumnName("PeriodStart")
+            .HasColumnType("datetime2")
+            .HasDefaultValueSql("(sysutcdatetime())");
+
+        builder.Property(t => t.PeriodEnd)
+            .IsRequired()
+            .HasColumnName("PeriodEnd")
+            .HasColumnType("datetime2")
+            .HasDefaultValueSql("('9999-12-31 23:59:59.9999999')");
+
+        // relationships
+        builder.HasOne(t => t.Tenant)
+            .WithMany(t => t.Groups)
+            .HasForeignKey(d => d.TenantId)
+            .HasConstraintName("FK_Group_Tenant_TenantId");
+
         #endregion
 
+        builder.Property(t => t.PeriodStart)
+            .ValueGeneratedOnAddOrUpdate();
+
+        builder.Property(t => t.PeriodEnd)
+            .ValueGeneratedOnAddOrUpdate();
     }
+
+    #region Generated Constants
+    public struct Table
+    {
+        /// <summary>Table Schema name constant for entity <see cref="InstructorIQ.Core.Data.Entities.Group" /></summary>
+        public const string Schema = "IQ";
+        /// <summary>Table Name constant for entity <see cref="InstructorIQ.Core.Data.Entities.Group" /></summary>
+        public const string Name = "Group";
+    }
+
+    public struct Columns
+    {
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Group.Id" /></summary>
+        public const string Id = "Id";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Group.Name" /></summary>
+        public const string Name = "Name";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Group.Description" /></summary>
+        public const string Description = "Description";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Group.Sequence" /></summary>
+        public const string Sequence = "Sequence";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Group.DisplayOrder" /></summary>
+        public const string DisplayOrder = "DisplayOrder";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Group.TenantId" /></summary>
+        public const string TenantId = "TenantId";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Group.Created" /></summary>
+        public const string Created = "Created";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Group.CreatedBy" /></summary>
+        public const string CreatedBy = "CreatedBy";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Group.Updated" /></summary>
+        public const string Updated = "Updated";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Group.UpdatedBy" /></summary>
+        public const string UpdatedBy = "UpdatedBy";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Group.RowVersion" /></summary>
+        public const string RowVersion = "RowVersion";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Group.PeriodStart" /></summary>
+        public const string PeriodStart = "PeriodStart";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Group.PeriodEnd" /></summary>
+        public const string PeriodEnd = "PeriodEnd";
+    }
+    #endregion
+
 }
diff --git a/service/src/InstructorIQ.Core/Data/Mapping/HistoryRecordMap.cs b/service/src/InstructorIQ.Core/Data/Mapping/HistoryRecordMap.cs
index 4afeea10..0c17d4cf 100644
--- a/service/src/InstructorIQ.Core/Data/Mapping/HistoryRecordMap.cs
+++ b/service/src/InstructorIQ.Core/Data/Mapping/HistoryRecordMap.cs
@@ -1,205 +1,205 @@
 using System;
 using System.Collections.Generic;
+
 using Microsoft.EntityFrameworkCore;
 
-namespace InstructorIQ.Core.Data.Mapping
+namespace InstructorIQ.Core.Data.Mapping;
+
+/// <summary>
+/// Allows configuration for an entity type <see cref="InstructorIQ.Core.Data.Entities.HistoryRecord" />
+/// </summary>
+public class HistoryRecordMap
+    : IEntityTypeConfiguration<InstructorIQ.Core.Data.Entities.HistoryRecord>
 {
     /// <summary>
-    /// Allows configuration for an entity type <see cref="InstructorIQ.Core.Data.Entities.HistoryRecord" />
+    /// Configures the entity of type <see cref="InstructorIQ.Core.Data.Entities.HistoryRecord" />
     /// </summary>
-    public class HistoryRecordMap
-        : IEntityTypeConfiguration<InstructorIQ.Core.Data.Entities.HistoryRecord>
+    /// <param name="builder">The builder to be used to configure the entity type.</param>
+    public void Configure(Microsoft.EntityFrameworkCore.Metadata.Builders.EntityTypeBuilder<InstructorIQ.Core.Data.Entities.HistoryRecord> builder)
     {
-        /// <summary>
-        /// Configures the entity of type <see cref="InstructorIQ.Core.Data.Entities.HistoryRecord" />
-        /// </summary>
-        /// <param name="builder">The builder to be used to configure the entity type.</param>
-        public void Configure(Microsoft.EntityFrameworkCore.Metadata.Builders.EntityTypeBuilder<InstructorIQ.Core.Data.Entities.HistoryRecord> builder)
-        {
-            #region Generated Configure
-            // table
-            builder.ToTable("HistoryRecord", "IQ");
-
-            // key
-            builder.HasKey(t => t.Id);
-
-            // properties
-            builder.Property(t => t.Id)
-                .IsRequired()
-                .HasColumnName("Id")
-                .HasColumnType("uniqueidentifier")
-                .HasDefaultValueSql("(newsequentialid())");
-
-            builder.Property(t => t.Key)
-                .IsRequired()
-                .HasColumnName("Key")
-                .HasColumnType("uniqueidentifier");
-
-            builder.Property(t => t.Entity)
-                .IsRequired()
-                .HasColumnName("Entity")
-                .HasColumnType("nvarchar(100)")
-                .HasMaxLength(100);
-
-            builder.Property(t => t.ParentKey)
-                .HasColumnName("ParentKey")
-                .HasColumnType("uniqueidentifier");
-
-            builder.Property(t => t.ParentEntity)
-                .HasColumnName("ParentEntity")
-                .HasColumnType("nvarchar(100)")
-                .HasMaxLength(100);
-
-            builder.Property(t => t.Changed)
-                .IsRequired()
-                .HasColumnName("Changed")
-                .HasColumnType("datetimeoffset")
-                .HasDefaultValueSql("(sysutcdatetime())");
-
-            builder.Property(t => t.ChangedBy)
-                .HasColumnName("ChangedBy")
-                .HasColumnType("nvarchar(100)")
-                .HasMaxLength(100);
-
-            builder.Property(t => t.PropertyName)
-                .HasColumnName("PropertyName")
-                .HasColumnType("nvarchar(256)")
-                .HasMaxLength(256);
-
-            builder.Property(t => t.DisplayName)
-                .HasColumnName("DisplayName")
-                .HasColumnType("nvarchar(256)")
-                .HasMaxLength(256);
-
-            builder.Property(t => t.Path)
-                .HasColumnName("Path")
-                .HasColumnType("nvarchar(256)")
-                .HasMaxLength(256);
-
-            builder.Property(t => t.Operation)
-                .HasColumnName("Operation")
-                .HasColumnType("nvarchar(100)")
-                .HasMaxLength(100);
-
-            builder.Property(t => t.OriginalValue)
-                .HasColumnName("OriginalValue")
-                .HasColumnType("nvarchar(max)");
-
-            builder.Property(t => t.OriginalFormatted)
-                .HasColumnName("OriginalFormatted")
-                .HasColumnType("nvarchar(256)")
-                .HasMaxLength(256);
-
-            builder.Property(t => t.OriginalType)
-                .HasColumnName("OriginalType")
-                .HasColumnType("nvarchar(256)")
-                .HasMaxLength(256);
-
-            builder.Property(t => t.CurrentValue)
-                .HasColumnName("CurrentValue")
-                .HasColumnType("nvarchar(max)");
-
-            builder.Property(t => t.CurrentFormatted)
-                .HasColumnName("CurrentFormatted")
-                .HasColumnType("nvarchar(256)")
-                .HasMaxLength(256);
-
-            builder.Property(t => t.CurrentType)
-                .HasColumnName("CurrentType")
-                .HasColumnType("nvarchar(256)")
-                .HasMaxLength(256);
-
-            builder.Property(t => t.Created)
-                .IsRequired()
-                .HasColumnName("Created")
-                .HasColumnType("datetimeoffset")
-                .HasDefaultValueSql("(sysutcdatetime())");
-
-            builder.Property(t => t.CreatedBy)
-                .HasColumnName("CreatedBy")
-                .HasColumnType("nvarchar(100)")
-                .HasMaxLength(100);
-
-            builder.Property(t => t.Updated)
-                .IsRequired()
-                .HasColumnName("Updated")
-                .HasColumnType("datetimeoffset")
-                .HasDefaultValueSql("(sysutcdatetime())");
-
-            builder.Property(t => t.UpdatedBy)
-                .HasColumnName("UpdatedBy")
-                .HasColumnType("nvarchar(100)")
-                .HasMaxLength(100);
-
-            builder.Property(t => t.RowVersion)
-                .IsRequired()
-                .IsRowVersion()
-                .HasColumnName("RowVersion")
-                .HasColumnType("rowversion")
-                .HasMaxLength(8)
-                .ValueGeneratedOnAddOrUpdate();
-
-            // relationships
-            #endregion
-        }
-
-        #region Generated Constants
-        public struct Table
-        {
-            /// <summary>Table Schema name constant for entity <see cref="InstructorIQ.Core.Data.Entities.HistoryRecord" /></summary>
-            public const string Schema = "IQ";
-            /// <summary>Table Name constant for entity <see cref="InstructorIQ.Core.Data.Entities.HistoryRecord" /></summary>
-            public const string Name = "HistoryRecord";
-        }
-
-        public struct Columns
-        {
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.HistoryRecord.Id" /></summary>
-            public const string Id = "Id";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.HistoryRecord.Key" /></summary>
-            public const string Key = "Key";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.HistoryRecord.Entity" /></summary>
-            public const string Entity = "Entity";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.HistoryRecord.ParentKey" /></summary>
-            public const string ParentKey = "ParentKey";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.HistoryRecord.ParentEntity" /></summary>
-            public const string ParentEntity = "ParentEntity";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.HistoryRecord.Changed" /></summary>
-            public const string Changed = "Changed";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.HistoryRecord.ChangedBy" /></summary>
-            public const string ChangedBy = "ChangedBy";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.HistoryRecord.PropertyName" /></summary>
-            public const string PropertyName = "PropertyName";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.HistoryRecord.DisplayName" /></summary>
-            public const string DisplayName = "DisplayName";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.HistoryRecord.Path" /></summary>
-            public const string Path = "Path";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.HistoryRecord.Operation" /></summary>
-            public const string Operation = "Operation";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.HistoryRecord.OriginalValue" /></summary>
-            public const string OriginalValue = "OriginalValue";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.HistoryRecord.OriginalFormatted" /></summary>
-            public const string OriginalFormatted = "OriginalFormatted";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.HistoryRecord.OriginalType" /></summary>
-            public const string OriginalType = "OriginalType";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.HistoryRecord.CurrentValue" /></summary>
-            public const string CurrentValue = "CurrentValue";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.HistoryRecord.CurrentFormatted" /></summary>
-            public const string CurrentFormatted = "CurrentFormatted";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.HistoryRecord.CurrentType" /></summary>
-            public const string CurrentType = "CurrentType";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.HistoryRecord.Created" /></summary>
-            public const string Created = "Created";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.HistoryRecord.CreatedBy" /></summary>
-            public const string CreatedBy = "CreatedBy";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.HistoryRecord.Updated" /></summary>
-            public const string Updated = "Updated";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.HistoryRecord.UpdatedBy" /></summary>
-            public const string UpdatedBy = "UpdatedBy";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.HistoryRecord.RowVersion" /></summary>
-            public const string RowVersion = "RowVersion";
-        }
+        #region Generated Configure
+        // table
+        builder.ToTable("HistoryRecord", "IQ");
+
+        // key
+        builder.HasKey(t => t.Id);
+
+        // properties
+        builder.Property(t => t.Id)
+            .IsRequired()
+            .HasColumnName("Id")
+            .HasColumnType("uniqueidentifier")
+            .HasDefaultValueSql("(newsequentialid())");
+
+        builder.Property(t => t.Key)
+            .IsRequired()
+            .HasColumnName("Key")
+            .HasColumnType("uniqueidentifier");
+
+        builder.Property(t => t.Entity)
+            .IsRequired()
+            .HasColumnName("Entity")
+            .HasColumnType("nvarchar(100)")
+            .HasMaxLength(100);
+
+        builder.Property(t => t.ParentKey)
+            .HasColumnName("ParentKey")
+            .HasColumnType("uniqueidentifier");
+
+        builder.Property(t => t.ParentEntity)
+            .HasColumnName("ParentEntity")
+            .HasColumnType("nvarchar(100)")
+            .HasMaxLength(100);
+
+        builder.Property(t => t.Changed)
+            .IsRequired()
+            .HasColumnName("Changed")
+            .HasColumnType("datetimeoffset")
+            .HasDefaultValueSql("(sysutcdatetime())");
+
+        builder.Property(t => t.ChangedBy)
+            .HasColumnName("ChangedBy")
+            .HasColumnType("nvarchar(100)")
+            .HasMaxLength(100);
+
+        builder.Property(t => t.PropertyName)
+            .HasColumnName("PropertyName")
+            .HasColumnType("nvarchar(256)")
+            .HasMaxLength(256);
+
+        builder.Property(t => t.DisplayName)
+            .HasColumnName("DisplayName")
+            .HasColumnType("nvarchar(256)")
+            .HasMaxLength(256);
+
+        builder.Property(t => t.Path)
+            .HasColumnName("Path")
+            .HasColumnType("nvarchar(256)")
+            .HasMaxLength(256);
+
+        builder.Property(t => t.Operation)
+            .HasColumnName("Operation")
+            .HasColumnType("nvarchar(100)")
+            .HasMaxLength(100);
+
+        builder.Property(t => t.OriginalValue)
+            .HasColumnName("OriginalValue")
+            .HasColumnType("nvarchar(max)");
+
+        builder.Property(t => t.OriginalFormatted)
+            .HasColumnName("OriginalFormatted")
+            .HasColumnType("nvarchar(256)")
+            .HasMaxLength(256);
+
+        builder.Property(t => t.OriginalType)
+            .HasColumnName("OriginalType")
+            .HasColumnType("nvarchar(256)")
+            .HasMaxLength(256);
+
+        builder.Property(t => t.CurrentValue)
+            .HasColumnName("CurrentValue")
+            .HasColumnType("nvarchar(max)");
+
+        builder.Property(t => t.CurrentFormatted)
+            .HasColumnName("CurrentFormatted")
+            .HasColumnType("nvarchar(256)")
+            .HasMaxLength(256);
+
+        builder.Property(t => t.CurrentType)
+            .HasColumnName("CurrentType")
+            .HasColumnType("nvarchar(256)")
+            .HasMaxLength(256);
+
+        builder.Property(t => t.Created)
+            .IsRequired()
+            .HasColumnName("Created")
+            .HasColumnType("datetimeoffset")
+            .HasDefaultValueSql("(sysutcdatetime())");
+
+        builder.Property(t => t.CreatedBy)
+            .HasColumnName("CreatedBy")
+            .HasColumnType("nvarchar(100)")
+            .HasMaxLength(100);
+
+        builder.Property(t => t.Updated)
+            .IsRequired()
+            .HasColumnName("Updated")
+            .HasColumnType("datetimeoffset")
+            .HasDefaultValueSql("(sysutcdatetime())");
+
+        builder.Property(t => t.UpdatedBy)
+            .HasColumnName("UpdatedBy")
+            .HasColumnType("nvarchar(100)")
+            .HasMaxLength(100);
+
+        builder.Property(t => t.RowVersion)
+            .IsRequired()
+            .IsRowVersion()
+            .HasColumnName("RowVersion")
+            .HasColumnType("rowversion")
+            .HasMaxLength(8)
+            .ValueGeneratedOnAddOrUpdate();
+
+        // relationships
         #endregion
+    }
+
+    #region Generated Constants
+    public struct Table
+    {
+        /// <summary>Table Schema name constant for entity <see cref="InstructorIQ.Core.Data.Entities.HistoryRecord" /></summary>
+        public const string Schema = "IQ";
+        /// <summary>Table Name constant for entity <see cref="InstructorIQ.Core.Data.Entities.HistoryRecord" /></summary>
+        public const string Name = "HistoryRecord";
+    }
 
+    public struct Columns
+    {
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.HistoryRecord.Id" /></summary>
+        public const string Id = "Id";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.HistoryRecord.Key" /></summary>
+        public const string Key = "Key";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.HistoryRecord.Entity" /></summary>
+        public const string Entity = "Entity";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.HistoryRecord.ParentKey" /></summary>
+        public const string ParentKey = "ParentKey";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.HistoryRecord.ParentEntity" /></summary>
+        public const string ParentEntity = "ParentEntity";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.HistoryRecord.Changed" /></summary>
+        public const string Changed = "Changed";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.HistoryRecord.ChangedBy" /></summary>
+        public const string ChangedBy = "ChangedBy";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.HistoryRecord.PropertyName" /></summary>
+        public const string PropertyName = "PropertyName";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.HistoryRecord.DisplayName" /></summary>
+        public const string DisplayName = "DisplayName";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.HistoryRecord.Path" /></summary>
+        public const string Path = "Path";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.HistoryRecord.Operation" /></summary>
+        public const string Operation = "Operation";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.HistoryRecord.OriginalValue" /></summary>
+        public const string OriginalValue = "OriginalValue";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.HistoryRecord.OriginalFormatted" /></summary>
+        public const string OriginalFormatted = "OriginalFormatted";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.HistoryRecord.OriginalType" /></summary>
+        public const string OriginalType = "OriginalType";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.HistoryRecord.CurrentValue" /></summary>
+        public const string CurrentValue = "CurrentValue";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.HistoryRecord.CurrentFormatted" /></summary>
+        public const string CurrentFormatted = "CurrentFormatted";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.HistoryRecord.CurrentType" /></summary>
+        public const string CurrentType = "CurrentType";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.HistoryRecord.Created" /></summary>
+        public const string Created = "Created";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.HistoryRecord.CreatedBy" /></summary>
+        public const string CreatedBy = "CreatedBy";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.HistoryRecord.Updated" /></summary>
+        public const string Updated = "Updated";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.HistoryRecord.UpdatedBy" /></summary>
+        public const string UpdatedBy = "UpdatedBy";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.HistoryRecord.RowVersion" /></summary>
+        public const string RowVersion = "RowVersion";
     }
+    #endregion
+
 }
diff --git a/service/src/InstructorIQ.Core/Data/Mapping/ImportJobMap.cs b/service/src/InstructorIQ.Core/Data/Mapping/ImportJobMap.cs
index 346f6c4a..dc15a4f3 100644
--- a/service/src/InstructorIQ.Core/Data/Mapping/ImportJobMap.cs
+++ b/service/src/InstructorIQ.Core/Data/Mapping/ImportJobMap.cs
@@ -1,126 +1,126 @@
 using System;
 using System.Collections.Generic;
+
 using Microsoft.EntityFrameworkCore;
 
-namespace InstructorIQ.Core.Data.Mapping
+namespace InstructorIQ.Core.Data.Mapping;
+
+/// <summary>
+/// Allows configuration for an entity type <see cref="InstructorIQ.Core.Data.Entities.ImportJob" />
+/// </summary>
+public partial class ImportJobMap
+    : IEntityTypeConfiguration<InstructorIQ.Core.Data.Entities.ImportJob>
 {
     /// <summary>
-    /// Allows configuration for an entity type <see cref="InstructorIQ.Core.Data.Entities.ImportJob" />
+    /// Configures the entity of type <see cref="InstructorIQ.Core.Data.Entities.ImportJob" />
     /// </summary>
-    public partial class ImportJobMap
-        : IEntityTypeConfiguration<InstructorIQ.Core.Data.Entities.ImportJob>
+    /// <param name="builder">The builder to be used to configure the entity type.</param>
+    public void Configure(Microsoft.EntityFrameworkCore.Metadata.Builders.EntityTypeBuilder<InstructorIQ.Core.Data.Entities.ImportJob> builder)
     {
-        /// <summary>
-        /// Configures the entity of type <see cref="InstructorIQ.Core.Data.Entities.ImportJob" />
-        /// </summary>
-        /// <param name="builder">The builder to be used to configure the entity type.</param>
-        public void Configure(Microsoft.EntityFrameworkCore.Metadata.Builders.EntityTypeBuilder<InstructorIQ.Core.Data.Entities.ImportJob> builder)
-        {
-            #region Generated Configure
-            // table
-            builder.ToTable("ImportJob", "IQ");
-
-            // key
-            builder.HasKey(t => t.Id);
-
-            // properties
-            builder.Property(t => t.Id)
-                .IsRequired()
-                .HasColumnName("Id")
-                .HasColumnType("uniqueidentifier")
-                .HasDefaultValueSql("(newsequentialid())");
-
-            builder.Property(t => t.Type)
-                .IsRequired()
-                .HasColumnName("Type")
-                .HasColumnType("nvarchar(100)")
-                .HasMaxLength(100);
-
-            builder.Property(t => t.TenantId)
-                .IsRequired()
-                .HasColumnName("TenantId")
-                .HasColumnType("uniqueidentifier");
-
-            builder.Property(t => t.MappingJson)
-                .HasColumnName("MappingJson")
-                .HasColumnType("nvarchar(max)");
-
-            builder.Property(t => t.StorageFile)
-                .HasColumnName("StorageFile")
-                .HasColumnType("nvarchar(max)");
-
-            builder.Property(t => t.Created)
-                .IsRequired()
-                .HasColumnName("Created")
-                .HasColumnType("datetimeoffset")
-                .HasDefaultValueSql("(sysutcdatetime())");
-
-            builder.Property(t => t.CreatedBy)
-                .HasColumnName("CreatedBy")
-                .HasColumnType("nvarchar(100)")
-                .HasMaxLength(100);
-
-            builder.Property(t => t.Updated)
-                .IsRequired()
-                .HasColumnName("Updated")
-                .HasColumnType("datetimeoffset")
-                .HasDefaultValueSql("(sysutcdatetime())");
-
-            builder.Property(t => t.UpdatedBy)
-                .HasColumnName("UpdatedBy")
-                .HasColumnType("nvarchar(100)")
-                .HasMaxLength(100);
-
-            builder.Property(t => t.RowVersion)
-                .IsRequired()
-                .IsRowVersion()
-                .HasColumnName("RowVersion")
-                .HasColumnType("rowversion")
-                .HasMaxLength(8)
-                .ValueGeneratedOnAddOrUpdate();
-
-            // relationships
-            builder.HasOne(t => t.Tenant)
-                .WithMany(t => t.ImportJobs)
-                .HasForeignKey(d => d.TenantId)
-                .HasConstraintName("FK_ImportJob_Tenant_TenantId");
-
-            #endregion
-        }
-
-        #region Generated Constants
-        public struct Table
-        {
-            /// <summary>Table Schema name constant for entity <see cref="InstructorIQ.Core.Data.Entities.ImportJob" /></summary>
-            public const string Schema = "IQ";
-            /// <summary>Table Name constant for entity <see cref="InstructorIQ.Core.Data.Entities.ImportJob" /></summary>
-            public const string Name = "ImportJob";
-        }
-
-        public struct Columns
-        {
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.ImportJob.Id" /></summary>
-            public const string Id = "Id";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.ImportJob.Type" /></summary>
-            public const string Type = "Type";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.ImportJob.TenantId" /></summary>
-            public const string TenantId = "TenantId";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.ImportJob.MappingJson" /></summary>
-            public const string MappingJson = "MappingJson";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.ImportJob.StorageFile" /></summary>
-            public const string StorageFile = "StorageFile";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.ImportJob.Created" /></summary>
-            public const string Created = "Created";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.ImportJob.CreatedBy" /></summary>
-            public const string CreatedBy = "CreatedBy";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.ImportJob.Updated" /></summary>
-            public const string Updated = "Updated";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.ImportJob.UpdatedBy" /></summary>
-            public const string UpdatedBy = "UpdatedBy";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.ImportJob.RowVersion" /></summary>
-            public const string RowVersion = "RowVersion";
-        }
+        #region Generated Configure
+        // table
+        builder.ToTable("ImportJob", "IQ");
+
+        // key
+        builder.HasKey(t => t.Id);
+
+        // properties
+        builder.Property(t => t.Id)
+            .IsRequired()
+            .HasColumnName("Id")
+            .HasColumnType("uniqueidentifier")
+            .HasDefaultValueSql("(newsequentialid())");
+
+        builder.Property(t => t.Type)
+            .IsRequired()
+            .HasColumnName("Type")
+            .HasColumnType("nvarchar(100)")
+            .HasMaxLength(100);
+
+        builder.Property(t => t.TenantId)
+            .IsRequired()
+            .HasColumnName("TenantId")
+            .HasColumnType("uniqueidentifier");
+
+        builder.Property(t => t.MappingJson)
+            .HasColumnName("MappingJson")
+            .HasColumnType("nvarchar(max)");
+
+        builder.Property(t => t.StorageFile)
+            .HasColumnName("StorageFile")
+            .HasColumnType("nvarchar(max)");
+
+        builder.Property(t => t.Created)
+            .IsRequired()
+            .HasColumnName("Created")
+            .HasColumnType("datetimeoffset")
+            .HasDefaultValueSql("(sysutcdatetime())");
+
+        builder.Property(t => t.CreatedBy)
+            .HasColumnName("CreatedBy")
+            .HasColumnType("nvarchar(100)")
+            .HasMaxLength(100);
+
+        builder.Property(t => t.Updated)
+            .IsRequired()
+            .HasColumnName("Updated")
+            .HasColumnType("datetimeoffset")
+            .HasDefaultValueSql("(sysutcdatetime())");
+
+        builder.Property(t => t.UpdatedBy)
+            .HasColumnName("UpdatedBy")
+            .HasColumnType("nvarchar(100)")
+            .HasMaxLength(100);
+
+        builder.Property(t => t.RowVersion)
+            .IsRequired()
+            .IsRowVersion()
+            .HasColumnName("RowVersion")
+            .HasColumnType("rowversion")
+            .HasMaxLength(8)
+            .ValueGeneratedOnAddOrUpdate();
+
+        // relationships
+        builder.HasOne(t => t.Tenant)
+            .WithMany(t => t.ImportJobs)
+            .HasForeignKey(d => d.TenantId)
+            .HasConstraintName("FK_ImportJob_Tenant_TenantId");
+
         #endregion
+    }
 
+    #region Generated Constants
+    public struct Table
+    {
+        /// <summary>Table Schema name constant for entity <see cref="InstructorIQ.Core.Data.Entities.ImportJob" /></summary>
+        public const string Schema = "IQ";
+        /// <summary>Table Name constant for entity <see cref="InstructorIQ.Core.Data.Entities.ImportJob" /></summary>
+        public const string Name = "ImportJob";
     }
+
+    public struct Columns
+    {
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.ImportJob.Id" /></summary>
+        public const string Id = "Id";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.ImportJob.Type" /></summary>
+        public const string Type = "Type";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.ImportJob.TenantId" /></summary>
+        public const string TenantId = "TenantId";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.ImportJob.MappingJson" /></summary>
+        public const string MappingJson = "MappingJson";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.ImportJob.StorageFile" /></summary>
+        public const string StorageFile = "StorageFile";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.ImportJob.Created" /></summary>
+        public const string Created = "Created";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.ImportJob.CreatedBy" /></summary>
+        public const string CreatedBy = "CreatedBy";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.ImportJob.Updated" /></summary>
+        public const string Updated = "Updated";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.ImportJob.UpdatedBy" /></summary>
+        public const string UpdatedBy = "UpdatedBy";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.ImportJob.RowVersion" /></summary>
+        public const string RowVersion = "RowVersion";
+    }
+    #endregion
+
 }
diff --git a/service/src/InstructorIQ.Core/Data/Mapping/InstructorRoleMap.cs b/service/src/InstructorIQ.Core/Data/Mapping/InstructorRoleMap.cs
index 8a4df571..b5c5061b 100644
--- a/service/src/InstructorIQ.Core/Data/Mapping/InstructorRoleMap.cs
+++ b/service/src/InstructorIQ.Core/Data/Mapping/InstructorRoleMap.cs
@@ -1,120 +1,120 @@
 using System;
 using System.Collections.Generic;
+
 using Microsoft.EntityFrameworkCore;
 
-namespace InstructorIQ.Core.Data.Mapping
+namespace InstructorIQ.Core.Data.Mapping;
+
+/// <summary>
+/// Allows configuration for an entity type <see cref="InstructorIQ.Core.Data.Entities.InstructorRole" />
+/// </summary>
+public partial class InstructorRoleMap
+    : IEntityTypeConfiguration<InstructorIQ.Core.Data.Entities.InstructorRole>
 {
     /// <summary>
-    /// Allows configuration for an entity type <see cref="InstructorIQ.Core.Data.Entities.InstructorRole" />
+    /// Configures the entity of type <see cref="InstructorIQ.Core.Data.Entities.InstructorRole" />
     /// </summary>
-    public partial class InstructorRoleMap
-        : IEntityTypeConfiguration<InstructorIQ.Core.Data.Entities.InstructorRole>
+    /// <param name="builder">The builder to be used to configure the entity type.</param>
+    public void Configure(Microsoft.EntityFrameworkCore.Metadata.Builders.EntityTypeBuilder<InstructorIQ.Core.Data.Entities.InstructorRole> builder)
     {
-        /// <summary>
-        /// Configures the entity of type <see cref="InstructorIQ.Core.Data.Entities.InstructorRole" />
-        /// </summary>
-        /// <param name="builder">The builder to be used to configure the entity type.</param>
-        public void Configure(Microsoft.EntityFrameworkCore.Metadata.Builders.EntityTypeBuilder<InstructorIQ.Core.Data.Entities.InstructorRole> builder)
-        {
-            #region Generated Configure
-            // table
-            builder.ToTable("InstructorRole", "IQ");
-
-            // key
-            builder.HasKey(t => t.Id);
-
-            // properties
-            builder.Property(t => t.Id)
-                .IsRequired()
-                .HasColumnName("Id")
-                .HasColumnType("uniqueidentifier")
-                .HasDefaultValueSql("(newsequentialid())");
-
-            builder.Property(t => t.Name)
-                .IsRequired()
-                .HasColumnName("Name")
-                .HasColumnType("nvarchar(256)")
-                .HasMaxLength(256);
-
-            builder.Property(t => t.Description)
-                .HasColumnName("Description")
-                .HasColumnType("nvarchar(max)");
-
-            builder.Property(t => t.TenantId)
-                .IsRequired()
-                .HasColumnName("TenantId")
-                .HasColumnType("uniqueidentifier");
-
-            builder.Property(t => t.Created)
-                .IsRequired()
-                .HasColumnName("Created")
-                .HasColumnType("datetimeoffset")
-                .HasDefaultValueSql("(sysutcdatetime())");
-
-            builder.Property(t => t.CreatedBy)
-                .HasColumnName("CreatedBy")
-                .HasColumnType("nvarchar(100)")
-                .HasMaxLength(100);
-
-            builder.Property(t => t.Updated)
-                .IsRequired()
-                .HasColumnName("Updated")
-                .HasColumnType("datetimeoffset")
-                .HasDefaultValueSql("(sysutcdatetime())");
-
-            builder.Property(t => t.UpdatedBy)
-                .HasColumnName("UpdatedBy")
-                .HasColumnType("nvarchar(100)")
-                .HasMaxLength(100);
-
-            builder.Property(t => t.RowVersion)
-                .IsRequired()
-                .IsRowVersion()
-                .HasColumnName("RowVersion")
-                .HasColumnType("rowversion")
-                .HasMaxLength(8)
-                .ValueGeneratedOnAddOrUpdate();
-
-            // relationships
-            builder.HasOne(t => t.Tenant)
-                .WithMany(t => t.InstructorRoles)
-                .HasForeignKey(d => d.TenantId)
-                .HasConstraintName("FK_InstructorRole_Tenant_TenantId");
-
-            #endregion
-        }
-
-        #region Generated Constants
-        public struct Table
-        {
-            /// <summary>Table Schema name constant for entity <see cref="InstructorIQ.Core.Data.Entities.InstructorRole" /></summary>
-            public const string Schema = "IQ";
-            /// <summary>Table Name constant for entity <see cref="InstructorIQ.Core.Data.Entities.InstructorRole" /></summary>
-            public const string Name = "InstructorRole";
-        }
-
-        public struct Columns
-        {
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.InstructorRole.Id" /></summary>
-            public const string Id = "Id";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.InstructorRole.Name" /></summary>
-            public const string Name = "Name";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.InstructorRole.Description" /></summary>
-            public const string Description = "Description";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.InstructorRole.TenantId" /></summary>
-            public const string TenantId = "TenantId";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.InstructorRole.Created" /></summary>
-            public const string Created = "Created";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.InstructorRole.CreatedBy" /></summary>
-            public const string CreatedBy = "CreatedBy";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.InstructorRole.Updated" /></summary>
-            public const string Updated = "Updated";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.InstructorRole.UpdatedBy" /></summary>
-            public const string UpdatedBy = "UpdatedBy";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.InstructorRole.RowVersion" /></summary>
-            public const string RowVersion = "RowVersion";
-        }
+        #region Generated Configure
+        // table
+        builder.ToTable("InstructorRole", "IQ");
+
+        // key
+        builder.HasKey(t => t.Id);
+
+        // properties
+        builder.Property(t => t.Id)
+            .IsRequired()
+            .HasColumnName("Id")
+            .HasColumnType("uniqueidentifier")
+            .HasDefaultValueSql("(newsequentialid())");
+
+        builder.Property(t => t.Name)
+            .IsRequired()
+            .HasColumnName("Name")
+            .HasColumnType("nvarchar(256)")
+            .HasMaxLength(256);
+
+        builder.Property(t => t.Description)
+            .HasColumnName("Description")
+            .HasColumnType("nvarchar(max)");
+
+        builder.Property(t => t.TenantId)
+            .IsRequired()
+            .HasColumnName("TenantId")
+            .HasColumnType("uniqueidentifier");
+
+        builder.Property(t => t.Created)
+            .IsRequired()
+            .HasColumnName("Created")
+            .HasColumnType("datetimeoffset")
+            .HasDefaultValueSql("(sysutcdatetime())");
+
+        builder.Property(t => t.CreatedBy)
+            .HasColumnName("CreatedBy")
+            .HasColumnType("nvarchar(100)")
+            .HasMaxLength(100);
+
+        builder.Property(t => t.Updated)
+            .IsRequired()
+            .HasColumnName("Updated")
+            .HasColumnType("datetimeoffset")
+            .HasDefaultValueSql("(sysutcdatetime())");
+
+        builder.Property(t => t.UpdatedBy)
+            .HasColumnName("UpdatedBy")
+            .HasColumnType("nvarchar(100)")
+            .HasMaxLength(100);
+
+        builder.Property(t => t.RowVersion)
+            .IsRequired()
+            .IsRowVersion()
+            .HasColumnName("RowVersion")
+            .HasColumnType("rowversion")
+            .HasMaxLength(8)
+            .ValueGeneratedOnAddOrUpdate();
+
+        // relationships
+        builder.HasOne(t => t.Tenant)
+            .WithMany(t => t.InstructorRoles)
+            .HasForeignKey(d => d.TenantId)
+            .HasConstraintName("FK_InstructorRole_Tenant_TenantId");
+
         #endregion
+    }
 
+    #region Generated Constants
+    public struct Table
+    {
+        /// <summary>Table Schema name constant for entity <see cref="InstructorIQ.Core.Data.Entities.InstructorRole" /></summary>
+        public const string Schema = "IQ";
+        /// <summary>Table Name constant for entity <see cref="InstructorIQ.Core.Data.Entities.InstructorRole" /></summary>
+        public const string Name = "InstructorRole";
     }
+
+    public struct Columns
+    {
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.InstructorRole.Id" /></summary>
+        public const string Id = "Id";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.InstructorRole.Name" /></summary>
+        public const string Name = "Name";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.InstructorRole.Description" /></summary>
+        public const string Description = "Description";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.InstructorRole.TenantId" /></summary>
+        public const string TenantId = "TenantId";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.InstructorRole.Created" /></summary>
+        public const string Created = "Created";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.InstructorRole.CreatedBy" /></summary>
+        public const string CreatedBy = "CreatedBy";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.InstructorRole.Updated" /></summary>
+        public const string Updated = "Updated";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.InstructorRole.UpdatedBy" /></summary>
+        public const string UpdatedBy = "UpdatedBy";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.InstructorRole.RowVersion" /></summary>
+        public const string RowVersion = "RowVersion";
+    }
+    #endregion
+
 }
diff --git a/service/src/InstructorIQ.Core/Data/Mapping/LinkTokenMap.cs b/service/src/InstructorIQ.Core/Data/Mapping/LinkTokenMap.cs
index 1bbe7149..2d854d81 100644
--- a/service/src/InstructorIQ.Core/Data/Mapping/LinkTokenMap.cs
+++ b/service/src/InstructorIQ.Core/Data/Mapping/LinkTokenMap.cs
@@ -1,108 +1,108 @@
 using System;
 using System.Collections.Generic;
+
 using Microsoft.EntityFrameworkCore;
 
-namespace InstructorIQ.Core.Data.Mapping
+namespace InstructorIQ.Core.Data.Mapping;
+
+/// <summary>
+/// Allows configuration for an entity type <see cref="InstructorIQ.Core.Data.Entities.LinkToken" />
+/// </summary>
+public partial class LinkTokenMap
+    : IEntityTypeConfiguration<InstructorIQ.Core.Data.Entities.LinkToken>
 {
     /// <summary>
-    /// Allows configuration for an entity type <see cref="InstructorIQ.Core.Data.Entities.LinkToken" />
+    /// Configures the entity of type <see cref="InstructorIQ.Core.Data.Entities.LinkToken" />
     /// </summary>
-    public partial class LinkTokenMap
-        : IEntityTypeConfiguration<InstructorIQ.Core.Data.Entities.LinkToken>
+    /// <param name="builder">The builder to be used to configure the entity type.</param>
+    public void Configure(Microsoft.EntityFrameworkCore.Metadata.Builders.EntityTypeBuilder<InstructorIQ.Core.Data.Entities.LinkToken> builder)
     {
-        /// <summary>
-        /// Configures the entity of type <see cref="InstructorIQ.Core.Data.Entities.LinkToken" />
-        /// </summary>
-        /// <param name="builder">The builder to be used to configure the entity type.</param>
-        public void Configure(Microsoft.EntityFrameworkCore.Metadata.Builders.EntityTypeBuilder<InstructorIQ.Core.Data.Entities.LinkToken> builder)
-        {
-            #region Generated Configure
-            // table
-            builder.ToTable("LinkToken", "IQ");
-
-            // key
-            builder.HasKey(t => t.Id);
-
-            // properties
-            builder.Property(t => t.Id)
-                .IsRequired()
-                .HasColumnName("Id")
-                .HasColumnType("uniqueidentifier")
-                .HasDefaultValueSql("(newsequentialid())");
-
-            builder.Property(t => t.TokenHash)
-                .IsRequired()
-                .HasColumnName("TokenHash")
-                .HasColumnType("nvarchar(256)")
-                .HasMaxLength(256);
-
-            builder.Property(t => t.UserName)
-                .IsRequired()
-                .HasColumnName("UserName")
-                .HasColumnType("nvarchar(256)")
-                .HasMaxLength(256);
-
-            builder.Property(t => t.Url)
-                .IsRequired()
-                .HasColumnName("Url")
-                .HasColumnType("nvarchar(max)");
-
-            builder.Property(t => t.TenantId)
-                .HasColumnName("TenantId")
-                .HasColumnType("uniqueidentifier");
-
-            builder.Property(t => t.Issued)
-                .IsRequired()
-                .HasColumnName("Issued")
-                .HasColumnType("datetimeoffset")
-                .HasDefaultValueSql("(sysutcdatetime())");
-
-            builder.Property(t => t.Used)
-                .HasColumnName("Used")
-                .HasColumnType("datetimeoffset");
-
-            builder.Property(t => t.Expires)
-                .HasColumnName("Expires")
-                .HasColumnType("datetimeoffset");
-
-            // relationships
-            builder.HasOne(t => t.Tenant)
-                .WithMany(t => t.LinkTokens)
-                .HasForeignKey(d => d.TenantId)
-                .HasConstraintName("FK_LinkToken_Tenant_TenantId");
-
-            #endregion
-        }
-
-        #region Generated Constants
-        public struct Table
-        {
-            /// <summary>Table Schema name constant for entity <see cref="InstructorIQ.Core.Data.Entities.LinkToken" /></summary>
-            public const string Schema = "IQ";
-            /// <summary>Table Name constant for entity <see cref="InstructorIQ.Core.Data.Entities.LinkToken" /></summary>
-            public const string Name = "LinkToken";
-        }
-
-        public struct Columns
-        {
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.LinkToken.Id" /></summary>
-            public const string Id = "Id";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.LinkToken.TokenHash" /></summary>
-            public const string TokenHash = "TokenHash";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.LinkToken.UserName" /></summary>
-            public const string UserName = "UserName";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.LinkToken.Url" /></summary>
-            public const string Url = "Url";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.LinkToken.TenantId" /></summary>
-            public const string TenantId = "TenantId";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.LinkToken.Issued" /></summary>
-            public const string Issued = "Issued";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.LinkToken.Used" /></summary>
-            public const string Used = "Used";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.LinkToken.Expires" /></summary>
-            public const string Expires = "Expires";
-        }
+        #region Generated Configure
+        // table
+        builder.ToTable("LinkToken", "IQ");
+
+        // key
+        builder.HasKey(t => t.Id);
+
+        // properties
+        builder.Property(t => t.Id)
+            .IsRequired()
+            .HasColumnName("Id")
+            .HasColumnType("uniqueidentifier")
+            .HasDefaultValueSql("(newsequentialid())");
+
+        builder.Property(t => t.TokenHash)
+            .IsRequired()
+            .HasColumnName("TokenHash")
+            .HasColumnType("nvarchar(256)")
+            .HasMaxLength(256);
+
+        builder.Property(t => t.UserName)
+            .IsRequired()
+            .HasColumnName("UserName")
+            .HasColumnType("nvarchar(256)")
+            .HasMaxLength(256);
+
+        builder.Property(t => t.Url)
+            .IsRequired()
+            .HasColumnName("Url")
+            .HasColumnType("nvarchar(max)");
+
+        builder.Property(t => t.TenantId)
+            .HasColumnName("TenantId")
+            .HasColumnType("uniqueidentifier");
+
+        builder.Property(t => t.Issued)
+            .IsRequired()
+            .HasColumnName("Issued")
+            .HasColumnType("datetimeoffset")
+            .HasDefaultValueSql("(sysutcdatetime())");
+
+        builder.Property(t => t.Used)
+            .HasColumnName("Used")
+            .HasColumnType("datetimeoffset");
+
+        builder.Property(t => t.Expires)
+            .HasColumnName("Expires")
+            .HasColumnType("datetimeoffset");
+
+        // relationships
+        builder.HasOne(t => t.Tenant)
+            .WithMany(t => t.LinkTokens)
+            .HasForeignKey(d => d.TenantId)
+            .HasConstraintName("FK_LinkToken_Tenant_TenantId");
+
         #endregion
+    }
 
+    #region Generated Constants
+    public struct Table
+    {
+        /// <summary>Table Schema name constant for entity <see cref="InstructorIQ.Core.Data.Entities.LinkToken" /></summary>
+        public const string Schema = "IQ";
+        /// <summary>Table Name constant for entity <see cref="InstructorIQ.Core.Data.Entities.LinkToken" /></summary>
+        public const string Name = "LinkToken";
     }
+
+    public struct Columns
+    {
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.LinkToken.Id" /></summary>
+        public const string Id = "Id";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.LinkToken.TokenHash" /></summary>
+        public const string TokenHash = "TokenHash";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.LinkToken.UserName" /></summary>
+        public const string UserName = "UserName";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.LinkToken.Url" /></summary>
+        public const string Url = "Url";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.LinkToken.TenantId" /></summary>
+        public const string TenantId = "TenantId";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.LinkToken.Issued" /></summary>
+        public const string Issued = "Issued";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.LinkToken.Used" /></summary>
+        public const string Used = "Used";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.LinkToken.Expires" /></summary>
+        public const string Expires = "Expires";
+    }
+    #endregion
+
 }
diff --git a/service/src/InstructorIQ.Core/Data/Mapping/LocationMap.cs b/service/src/InstructorIQ.Core/Data/Mapping/LocationMap.cs
index 6343c5b5..59944442 100644
--- a/service/src/InstructorIQ.Core/Data/Mapping/LocationMap.cs
+++ b/service/src/InstructorIQ.Core/Data/Mapping/LocationMap.cs
@@ -1,217 +1,217 @@
 using System;
 using System.Collections.Generic;
+
 using Microsoft.EntityFrameworkCore;
 
-namespace InstructorIQ.Core.Data.Mapping
+namespace InstructorIQ.Core.Data.Mapping;
+
+/// <summary>
+/// Allows configuration for an entity type <see cref="InstructorIQ.Core.Data.Entities.Location" />
+/// </summary>
+public class LocationMap
+    : IEntityTypeConfiguration<InstructorIQ.Core.Data.Entities.Location>
 {
     /// <summary>
-    /// Allows configuration for an entity type <see cref="InstructorIQ.Core.Data.Entities.Location" />
+    /// Configures the entity of type <see cref="InstructorIQ.Core.Data.Entities.Location" />
     /// </summary>
-    public class LocationMap
-        : IEntityTypeConfiguration<InstructorIQ.Core.Data.Entities.Location>
+    /// <param name="builder">The builder to be used to configure the entity type.</param>
+    public void Configure(Microsoft.EntityFrameworkCore.Metadata.Builders.EntityTypeBuilder<InstructorIQ.Core.Data.Entities.Location> builder)
     {
-        /// <summary>
-        /// Configures the entity of type <see cref="InstructorIQ.Core.Data.Entities.Location" />
-        /// </summary>
-        /// <param name="builder">The builder to be used to configure the entity type.</param>
-        public void Configure(Microsoft.EntityFrameworkCore.Metadata.Builders.EntityTypeBuilder<InstructorIQ.Core.Data.Entities.Location> builder)
-        {
-            #region Generated Configure
-            // table
-            builder.ToTable("Location", "IQ");
-
-            // key
-            builder.HasKey(t => t.Id);
-
-            // properties
-            builder.Property(t => t.Id)
-                .IsRequired()
-                .HasColumnName("Id")
-                .HasColumnType("uniqueidentifier")
-                .HasDefaultValueSql("(newsequentialid())");
-
-            builder.Property(t => t.Name)
-                .IsRequired()
-                .HasColumnName("Name")
-                .HasColumnType("nvarchar(256)")
-                .HasMaxLength(256);
-
-            builder.Property(t => t.Description)
-                .HasColumnName("Description")
-                .HasColumnType("nvarchar(max)");
-
-            builder.Property(t => t.AddressLine1)
-                .HasColumnName("AddressLine1")
-                .HasColumnType("nvarchar(256)")
-                .HasMaxLength(256);
-
-            builder.Property(t => t.AddressLine2)
-                .HasColumnName("AddressLine2")
-                .HasColumnType("nvarchar(256)")
-                .HasMaxLength(256);
-
-            builder.Property(t => t.AddressLine3)
-                .HasColumnName("AddressLine3")
-                .HasColumnType("nvarchar(256)")
-                .HasMaxLength(256);
-
-            builder.Property(t => t.City)
-                .HasColumnName("City")
-                .HasColumnType("nvarchar(150)")
-                .HasMaxLength(150);
-
-            builder.Property(t => t.StateProvince)
-                .HasColumnName("StateProvince")
-                .HasColumnType("nvarchar(150)")
-                .HasMaxLength(150);
-
-            builder.Property(t => t.PostalCode)
-                .HasColumnName("PostalCode")
-                .HasColumnType("nvarchar(50)")
-                .HasMaxLength(50);
-
-            builder.Property(t => t.ContactName)
-                .HasColumnName("ContactName")
-                .HasColumnType("nvarchar(256)")
-                .HasMaxLength(256);
-
-            builder.Property(t => t.ContactEmail)
-                .HasColumnName("ContactEmail")
-                .HasColumnType("nvarchar(256)")
-                .HasMaxLength(256);
-
-            builder.Property(t => t.ContactPhone)
-                .HasColumnName("ContactPhone")
-                .HasColumnType("nvarchar(50)")
-                .HasMaxLength(50);
-
-            builder.Property(t => t.Latitude)
-                .HasColumnName("Latitude")
-                .HasColumnType("decimal(20,10)");
-
-            builder.Property(t => t.Longitude)
-                .HasColumnName("Longitude")
-                .HasColumnType("decimal(20,10)");
-
-            builder.Property(t => t.TenantId)
-                .IsRequired()
-                .HasColumnName("TenantId")
-                .HasColumnType("uniqueidentifier");
-
-            builder.Property(t => t.Created)
-                .IsRequired()
-                .HasColumnName("Created")
-                .HasColumnType("datetimeoffset")
-                .HasDefaultValueSql("(sysutcdatetime())");
-
-            builder.Property(t => t.CreatedBy)
-                .HasColumnName("CreatedBy")
-                .HasColumnType("nvarchar(100)")
-                .HasMaxLength(100);
-
-            builder.Property(t => t.Updated)
-                .IsRequired()
-                .HasColumnName("Updated")
-                .HasColumnType("datetimeoffset")
-                .HasDefaultValueSql("(sysutcdatetime())");
-
-            builder.Property(t => t.UpdatedBy)
-                .HasColumnName("UpdatedBy")
-                .HasColumnType("nvarchar(100)")
-                .HasMaxLength(100);
-
-            builder.Property(t => t.RowVersion)
-                .IsRequired()
-                .IsRowVersion()
-                .HasColumnName("RowVersion")
-                .HasColumnType("rowversion")
-                .HasMaxLength(8)
-                .ValueGeneratedOnAddOrUpdate();
-
-            builder.Property(t => t.PeriodStart)
-                .IsRequired()
-                .HasColumnName("PeriodStart")
-                .HasColumnType("datetime2")
-                .HasDefaultValueSql("(sysutcdatetime())");
-
-            builder.Property(t => t.PeriodEnd)
-                .IsRequired()
-                .HasColumnName("PeriodEnd")
-                .HasColumnType("datetime2")
-                .HasDefaultValueSql("('9999-12-31 23:59:59.9999999')");
-
-            // relationships
-            builder.HasOne(t => t.Tenant)
-                .WithMany(t => t.Locations)
-                .HasForeignKey(d => d.TenantId)
-                .HasConstraintName("FK_Location_Tenant_TenantId");
-
-            #endregion
-
-            builder.Property(t => t.PeriodStart)
-                .ValueGeneratedOnAddOrUpdate();
-
-            builder.Property(t => t.PeriodEnd)
-                .ValueGeneratedOnAddOrUpdate();
-        }
-
-        #region Generated Constants
-        public struct Table
-        {
-            /// <summary>Table Schema name constant for entity <see cref="InstructorIQ.Core.Data.Entities.Location" /></summary>
-            public const string Schema = "IQ";
-            /// <summary>Table Name constant for entity <see cref="InstructorIQ.Core.Data.Entities.Location" /></summary>
-            public const string Name = "Location";
-        }
-
-        public struct Columns
-        {
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Location.Id" /></summary>
-            public const string Id = "Id";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Location.Name" /></summary>
-            public const string Name = "Name";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Location.Description" /></summary>
-            public const string Description = "Description";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Location.AddressLine1" /></summary>
-            public const string AddressLine1 = "AddressLine1";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Location.AddressLine2" /></summary>
-            public const string AddressLine2 = "AddressLine2";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Location.AddressLine3" /></summary>
-            public const string AddressLine3 = "AddressLine3";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Location.City" /></summary>
-            public const string City = "City";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Location.StateProvince" /></summary>
-            public const string StateProvince = "StateProvince";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Location.PostalCode" /></summary>
-            public const string PostalCode = "PostalCode";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Location.ContactName" /></summary>
-            public const string ContactName = "ContactName";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Location.ContactEmail" /></summary>
-            public const string ContactEmail = "ContactEmail";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Location.ContactPhone" /></summary>
-            public const string ContactPhone = "ContactPhone";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Location.Latitude" /></summary>
-            public const string Latitude = "Latitude";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Location.Longitude" /></summary>
-            public const string Longitude = "Longitude";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Location.TenantId" /></summary>
-            public const string TenantId = "TenantId";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Location.Created" /></summary>
-            public const string Created = "Created";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Location.CreatedBy" /></summary>
-            public const string CreatedBy = "CreatedBy";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Location.Updated" /></summary>
-            public const string Updated = "Updated";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Location.UpdatedBy" /></summary>
-            public const string UpdatedBy = "UpdatedBy";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Location.RowVersion" /></summary>
-            public const string RowVersion = "RowVersion";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Location.PeriodStart" /></summary>
-            public const string PeriodStart = "PeriodStart";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Location.PeriodEnd" /></summary>
-            public const string PeriodEnd = "PeriodEnd";
-        }
+        #region Generated Configure
+        // table
+        builder.ToTable("Location", "IQ");
+
+        // key
+        builder.HasKey(t => t.Id);
+
+        // properties
+        builder.Property(t => t.Id)
+            .IsRequired()
+            .HasColumnName("Id")
+            .HasColumnType("uniqueidentifier")
+            .HasDefaultValueSql("(newsequentialid())");
+
+        builder.Property(t => t.Name)
+            .IsRequired()
+            .HasColumnName("Name")
+            .HasColumnType("nvarchar(256)")
+            .HasMaxLength(256);
+
+        builder.Property(t => t.Description)
+            .HasColumnName("Description")
+            .HasColumnType("nvarchar(max)");
+
+        builder.Property(t => t.AddressLine1)
+            .HasColumnName("AddressLine1")
+            .HasColumnType("nvarchar(256)")
+            .HasMaxLength(256);
+
+        builder.Property(t => t.AddressLine2)
+            .HasColumnName("AddressLine2")
+            .HasColumnType("nvarchar(256)")
+            .HasMaxLength(256);
+
+        builder.Property(t => t.AddressLine3)
+            .HasColumnName("AddressLine3")
+            .HasColumnType("nvarchar(256)")
+            .HasMaxLength(256);
+
+        builder.Property(t => t.City)
+            .HasColumnName("City")
+            .HasColumnType("nvarchar(150)")
+            .HasMaxLength(150);
+
+        builder.Property(t => t.StateProvince)
+            .HasColumnName("StateProvince")
+            .HasColumnType("nvarchar(150)")
+            .HasMaxLength(150);
+
+        builder.Property(t => t.PostalCode)
+            .HasColumnName("PostalCode")
+            .HasColumnType("nvarchar(50)")
+            .HasMaxLength(50);
+
+        builder.Property(t => t.ContactName)
+            .HasColumnName("ContactName")
+            .HasColumnType("nvarchar(256)")
+            .HasMaxLength(256);
+
+        builder.Property(t => t.ContactEmail)
+            .HasColumnName("ContactEmail")
+            .HasColumnType("nvarchar(256)")
+            .HasMaxLength(256);
+
+        builder.Property(t => t.ContactPhone)
+            .HasColumnName("ContactPhone")
+            .HasColumnType("nvarchar(50)")
+            .HasMaxLength(50);
+
+        builder.Property(t => t.Latitude)
+            .HasColumnName("Latitude")
+            .HasColumnType("decimal(20,10)");
+
+        builder.Property(t => t.Longitude)
+            .HasColumnName("Longitude")
+            .HasColumnType("decimal(20,10)");
+
+        builder.Property(t => t.TenantId)
+            .IsRequired()
+            .HasColumnName("TenantId")
+            .HasColumnType("uniqueidentifier");
+
+        builder.Property(t => t.Created)
+            .IsRequired()
+            .HasColumnName("Created")
+            .HasColumnType("datetimeoffset")
+            .HasDefaultValueSql("(sysutcdatetime())");
+
+        builder.Property(t => t.CreatedBy)
+            .HasColumnName("CreatedBy")
+            .HasColumnType("nvarchar(100)")
+            .HasMaxLength(100);
+
+        builder.Property(t => t.Updated)
+            .IsRequired()
+            .HasColumnName("Updated")
+            .HasColumnType("datetimeoffset")
+            .HasDefaultValueSql("(sysutcdatetime())");
+
+        builder.Property(t => t.UpdatedBy)
+            .HasColumnName("UpdatedBy")
+            .HasColumnType("nvarchar(100)")
+            .HasMaxLength(100);
+
+        builder.Property(t => t.RowVersion)
+            .IsRequired()
+            .IsRowVersion()
+            .HasColumnName("RowVersion")
+            .HasColumnType("rowversion")
+            .HasMaxLength(8)
+            .ValueGeneratedOnAddOrUpdate();
+
+        builder.Property(t => t.PeriodStart)
+            .IsRequired()
+            .HasColumnName("PeriodStart")
+            .HasColumnType("datetime2")
+            .HasDefaultValueSql("(sysutcdatetime())");
+
+        builder.Property(t => t.PeriodEnd)
+            .IsRequired()
+            .HasColumnName("PeriodEnd")
+            .HasColumnType("datetime2")
+            .HasDefaultValueSql("('9999-12-31 23:59:59.9999999')");
+
+        // relationships
+        builder.HasOne(t => t.Tenant)
+            .WithMany(t => t.Locations)
+            .HasForeignKey(d => d.TenantId)
+            .HasConstraintName("FK_Location_Tenant_TenantId");
+
         #endregion
 
+        builder.Property(t => t.PeriodStart)
+            .ValueGeneratedOnAddOrUpdate();
+
+        builder.Property(t => t.PeriodEnd)
+            .ValueGeneratedOnAddOrUpdate();
     }
+
+    #region Generated Constants
+    public struct Table
+    {
+        /// <summary>Table Schema name constant for entity <see cref="InstructorIQ.Core.Data.Entities.Location" /></summary>
+        public const string Schema = "IQ";
+        /// <summary>Table Name constant for entity <see cref="InstructorIQ.Core.Data.Entities.Location" /></summary>
+        public const string Name = "Location";
+    }
+
+    public struct Columns
+    {
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Location.Id" /></summary>
+        public const string Id = "Id";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Location.Name" /></summary>
+        public const string Name = "Name";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Location.Description" /></summary>
+        public const string Description = "Description";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Location.AddressLine1" /></summary>
+        public const string AddressLine1 = "AddressLine1";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Location.AddressLine2" /></summary>
+        public const string AddressLine2 = "AddressLine2";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Location.AddressLine3" /></summary>
+        public const string AddressLine3 = "AddressLine3";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Location.City" /></summary>
+        public const string City = "City";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Location.StateProvince" /></summary>
+        public const string StateProvince = "StateProvince";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Location.PostalCode" /></summary>
+        public const string PostalCode = "PostalCode";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Location.ContactName" /></summary>
+        public const string ContactName = "ContactName";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Location.ContactEmail" /></summary>
+        public const string ContactEmail = "ContactEmail";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Location.ContactPhone" /></summary>
+        public const string ContactPhone = "ContactPhone";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Location.Latitude" /></summary>
+        public const string Latitude = "Latitude";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Location.Longitude" /></summary>
+        public const string Longitude = "Longitude";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Location.TenantId" /></summary>
+        public const string TenantId = "TenantId";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Location.Created" /></summary>
+        public const string Created = "Created";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Location.CreatedBy" /></summary>
+        public const string CreatedBy = "CreatedBy";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Location.Updated" /></summary>
+        public const string Updated = "Updated";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Location.UpdatedBy" /></summary>
+        public const string UpdatedBy = "UpdatedBy";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Location.RowVersion" /></summary>
+        public const string RowVersion = "RowVersion";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Location.PeriodStart" /></summary>
+        public const string PeriodStart = "PeriodStart";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Location.PeriodEnd" /></summary>
+        public const string PeriodEnd = "PeriodEnd";
+    }
+    #endregion
+
 }
diff --git a/service/src/InstructorIQ.Core/Data/Mapping/NotificationMap.cs b/service/src/InstructorIQ.Core/Data/Mapping/NotificationMap.cs
index fdbc9771..9b8e0bac 100644
--- a/service/src/InstructorIQ.Core/Data/Mapping/NotificationMap.cs
+++ b/service/src/InstructorIQ.Core/Data/Mapping/NotificationMap.cs
@@ -1,134 +1,134 @@
 using System;
 using System.Collections.Generic;
+
 using Microsoft.EntityFrameworkCore;
 
-namespace InstructorIQ.Core.Data.Mapping
+namespace InstructorIQ.Core.Data.Mapping;
+
+/// <summary>
+/// Allows configuration for an entity type <see cref="InstructorIQ.Core.Data.Entities.Notification" />
+/// </summary>
+public partial class NotificationMap
+    : IEntityTypeConfiguration<InstructorIQ.Core.Data.Entities.Notification>
 {
     /// <summary>
-    /// Allows configuration for an entity type <see cref="InstructorIQ.Core.Data.Entities.Notification" />
+    /// Configures the entity of type <see cref="InstructorIQ.Core.Data.Entities.Notification" />
     /// </summary>
-    public partial class NotificationMap
-        : IEntityTypeConfiguration<InstructorIQ.Core.Data.Entities.Notification>
+    /// <param name="builder">The builder to be used to configure the entity type.</param>
+    public void Configure(Microsoft.EntityFrameworkCore.Metadata.Builders.EntityTypeBuilder<InstructorIQ.Core.Data.Entities.Notification> builder)
     {
-        /// <summary>
-        /// Configures the entity of type <see cref="InstructorIQ.Core.Data.Entities.Notification" />
-        /// </summary>
-        /// <param name="builder">The builder to be used to configure the entity type.</param>
-        public void Configure(Microsoft.EntityFrameworkCore.Metadata.Builders.EntityTypeBuilder<InstructorIQ.Core.Data.Entities.Notification> builder)
-        {
-            #region Generated Configure
-            // table
-            builder.ToTable("Notification", "IQ");
-
-            // key
-            builder.HasKey(t => t.Id);
-
-            // properties
-            builder.Property(t => t.Id)
-                .IsRequired()
-                .HasColumnName("Id")
-                .HasColumnType("uniqueidentifier")
-                .HasDefaultValueSql("(newsequentialid())");
-
-            builder.Property(t => t.Type)
-                .IsRequired()
-                .HasColumnName("Type")
-                .HasColumnType("nvarchar(256)")
-                .HasMaxLength(256);
-
-            builder.Property(t => t.Message)
-                .HasColumnName("Message")
-                .HasColumnType("nvarchar(max)");
-
-            builder.Property(t => t.UserName)
-                .IsRequired()
-                .HasColumnName("UserName")
-                .HasColumnType("nvarchar(256)")
-                .HasMaxLength(256);
-
-            builder.Property(t => t.Read)
-                .HasColumnName("Read")
-                .HasColumnType("datetimeoffset");
-
-            builder.Property(t => t.TenantId)
-                .IsRequired()
-                .HasColumnName("TenantId")
-                .HasColumnType("uniqueidentifier");
-
-            builder.Property(t => t.Created)
-                .IsRequired()
-                .HasColumnName("Created")
-                .HasColumnType("datetimeoffset")
-                .HasDefaultValueSql("(sysutcdatetime())");
-
-            builder.Property(t => t.CreatedBy)
-                .HasColumnName("CreatedBy")
-                .HasColumnType("nvarchar(100)")
-                .HasMaxLength(100);
-
-            builder.Property(t => t.Updated)
-                .IsRequired()
-                .HasColumnName("Updated")
-                .HasColumnType("datetimeoffset")
-                .HasDefaultValueSql("(sysutcdatetime())");
-
-            builder.Property(t => t.UpdatedBy)
-                .HasColumnName("UpdatedBy")
-                .HasColumnType("nvarchar(100)")
-                .HasMaxLength(100);
-
-            builder.Property(t => t.RowVersion)
-                .IsRequired()
-                .IsRowVersion()
-                .HasColumnName("RowVersion")
-                .HasColumnType("rowversion")
-                .HasMaxLength(8)
-                .ValueGeneratedOnAddOrUpdate();
-
-            // relationships
-            builder.HasOne(t => t.Tenant)
-                .WithMany(t => t.Notifications)
-                .HasForeignKey(d => d.TenantId)
-                .HasConstraintName("FK_Notification_Tenant_TenantId");
-
-            #endregion
-        }
-
-        #region Generated Constants
-        public struct Table
-        {
-            /// <summary>Table Schema name constant for entity <see cref="InstructorIQ.Core.Data.Entities.Notification" /></summary>
-            public const string Schema = "IQ";
-            /// <summary>Table Name constant for entity <see cref="InstructorIQ.Core.Data.Entities.Notification" /></summary>
-            public const string Name = "Notification";
-        }
-
-        public struct Columns
-        {
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Notification.Id" /></summary>
-            public const string Id = "Id";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Notification.Type" /></summary>
-            public const string Type = "Type";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Notification.Message" /></summary>
-            public const string Message = "Message";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Notification.UserName" /></summary>
-            public const string UserName = "UserName";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Notification.Read" /></summary>
-            public const string Read = "Read";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Notification.TenantId" /></summary>
-            public const string TenantId = "TenantId";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Notification.Created" /></summary>
-            public const string Created = "Created";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Notification.CreatedBy" /></summary>
-            public const string CreatedBy = "CreatedBy";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Notification.Updated" /></summary>
-            public const string Updated = "Updated";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Notification.UpdatedBy" /></summary>
-            public const string UpdatedBy = "UpdatedBy";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Notification.RowVersion" /></summary>
-            public const string RowVersion = "RowVersion";
-        }
+        #region Generated Configure
+        // table
+        builder.ToTable("Notification", "IQ");
+
+        // key
+        builder.HasKey(t => t.Id);
+
+        // properties
+        builder.Property(t => t.Id)
+            .IsRequired()
+            .HasColumnName("Id")
+            .HasColumnType("uniqueidentifier")
+            .HasDefaultValueSql("(newsequentialid())");
+
+        builder.Property(t => t.Type)
+            .IsRequired()
+            .HasColumnName("Type")
+            .HasColumnType("nvarchar(256)")
+            .HasMaxLength(256);
+
+        builder.Property(t => t.Message)
+            .HasColumnName("Message")
+            .HasColumnType("nvarchar(max)");
+
+        builder.Property(t => t.UserName)
+            .IsRequired()
+            .HasColumnName("UserName")
+            .HasColumnType("nvarchar(256)")
+            .HasMaxLength(256);
+
+        builder.Property(t => t.Read)
+            .HasColumnName("Read")
+            .HasColumnType("datetimeoffset");
+
+        builder.Property(t => t.TenantId)
+            .IsRequired()
+            .HasColumnName("TenantId")
+            .HasColumnType("uniqueidentifier");
+
+        builder.Property(t => t.Created)
+            .IsRequired()
+            .HasColumnName("Created")
+            .HasColumnType("datetimeoffset")
+            .HasDefaultValueSql("(sysutcdatetime())");
+
+        builder.Property(t => t.CreatedBy)
+            .HasColumnName("CreatedBy")
+            .HasColumnType("nvarchar(100)")
+            .HasMaxLength(100);
+
+        builder.Property(t => t.Updated)
+            .IsRequired()
+            .HasColumnName("Updated")
+            .HasColumnType("datetimeoffset")
+            .HasDefaultValueSql("(sysutcdatetime())");
+
+        builder.Property(t => t.UpdatedBy)
+            .HasColumnName("UpdatedBy")
+            .HasColumnType("nvarchar(100)")
+            .HasMaxLength(100);
+
+        builder.Property(t => t.RowVersion)
+            .IsRequired()
+            .IsRowVersion()
+            .HasColumnName("RowVersion")
+            .HasColumnType("rowversion")
+            .HasMaxLength(8)
+            .ValueGeneratedOnAddOrUpdate();
+
+        // relationships
+        builder.HasOne(t => t.Tenant)
+            .WithMany(t => t.Notifications)
+            .HasForeignKey(d => d.TenantId)
+            .HasConstraintName("FK_Notification_Tenant_TenantId");
+
         #endregion
+    }
 
+    #region Generated Constants
+    public struct Table
+    {
+        /// <summary>Table Schema name constant for entity <see cref="InstructorIQ.Core.Data.Entities.Notification" /></summary>
+        public const string Schema = "IQ";
+        /// <summary>Table Name constant for entity <see cref="InstructorIQ.Core.Data.Entities.Notification" /></summary>
+        public const string Name = "Notification";
     }
+
+    public struct Columns
+    {
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Notification.Id" /></summary>
+        public const string Id = "Id";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Notification.Type" /></summary>
+        public const string Type = "Type";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Notification.Message" /></summary>
+        public const string Message = "Message";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Notification.UserName" /></summary>
+        public const string UserName = "UserName";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Notification.Read" /></summary>
+        public const string Read = "Read";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Notification.TenantId" /></summary>
+        public const string TenantId = "TenantId";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Notification.Created" /></summary>
+        public const string Created = "Created";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Notification.CreatedBy" /></summary>
+        public const string CreatedBy = "CreatedBy";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Notification.Updated" /></summary>
+        public const string Updated = "Updated";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Notification.UpdatedBy" /></summary>
+        public const string UpdatedBy = "UpdatedBy";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Notification.RowVersion" /></summary>
+        public const string RowVersion = "RowVersion";
+    }
+    #endregion
+
 }
diff --git a/service/src/InstructorIQ.Core/Data/Mapping/RefreshTokenMap.cs b/service/src/InstructorIQ.Core/Data/Mapping/RefreshTokenMap.cs
index b99f4205..e1ca24ec 100644
--- a/service/src/InstructorIQ.Core/Data/Mapping/RefreshTokenMap.cs
+++ b/service/src/InstructorIQ.Core/Data/Mapping/RefreshTokenMap.cs
@@ -1,97 +1,97 @@
 using System;
 using System.Collections.Generic;
+
 using Microsoft.EntityFrameworkCore;
 
-namespace InstructorIQ.Core.Data.Mapping
+namespace InstructorIQ.Core.Data.Mapping;
+
+/// <summary>
+/// Allows configuration for an entity type <see cref="InstructorIQ.Core.Data.Entities.RefreshToken" />
+/// </summary>
+public partial class RefreshTokenMap
+    : IEntityTypeConfiguration<InstructorIQ.Core.Data.Entities.RefreshToken>
 {
     /// <summary>
-    /// Allows configuration for an entity type <see cref="InstructorIQ.Core.Data.Entities.RefreshToken" />
+    /// Configures the entity of type <see cref="InstructorIQ.Core.Data.Entities.RefreshToken" />
     /// </summary>
-    public partial class RefreshTokenMap
-        : IEntityTypeConfiguration<InstructorIQ.Core.Data.Entities.RefreshToken>
+    /// <param name="builder">The builder to be used to configure the entity type.</param>
+    public void Configure(Microsoft.EntityFrameworkCore.Metadata.Builders.EntityTypeBuilder<InstructorIQ.Core.Data.Entities.RefreshToken> builder)
     {
-        /// <summary>
-        /// Configures the entity of type <see cref="InstructorIQ.Core.Data.Entities.RefreshToken" />
-        /// </summary>
-        /// <param name="builder">The builder to be used to configure the entity type.</param>
-        public void Configure(Microsoft.EntityFrameworkCore.Metadata.Builders.EntityTypeBuilder<InstructorIQ.Core.Data.Entities.RefreshToken> builder)
-        {
-            #region Generated Configure
-            // table
-            builder.ToTable("RefreshToken", "IQ");
-
-            // key
-            builder.HasKey(t => t.Id);
+        #region Generated Configure
+        // table
+        builder.ToTable("RefreshToken", "IQ");
 
-            // properties
-            builder.Property(t => t.Id)
-                .IsRequired()
-                .HasColumnName("Id")
-                .HasColumnType("uniqueidentifier")
-                .HasDefaultValueSql("(newsequentialid())");
+        // key
+        builder.HasKey(t => t.Id);
 
-            builder.Property(t => t.TokenHash)
-                .IsRequired()
-                .HasColumnName("TokenHash")
-                .HasColumnType("nvarchar(256)")
-                .HasMaxLength(256);
+        // properties
+        builder.Property(t => t.Id)
+            .IsRequired()
+            .HasColumnName("Id")
+            .HasColumnType("uniqueidentifier")
+            .HasDefaultValueSql("(newsequentialid())");
 
-            builder.Property(t => t.UserName)
-                .IsRequired()
-                .HasColumnName("UserName")
-                .HasColumnType("nvarchar(256)")
-                .HasMaxLength(256);
+        builder.Property(t => t.TokenHash)
+            .IsRequired()
+            .HasColumnName("TokenHash")
+            .HasColumnType("nvarchar(256)")
+            .HasMaxLength(256);
 
-            builder.Property(t => t.ClientId)
-                .HasColumnName("ClientId")
-                .HasColumnType("nvarchar(450)")
-                .HasMaxLength(450);
+        builder.Property(t => t.UserName)
+            .IsRequired()
+            .HasColumnName("UserName")
+            .HasColumnType("nvarchar(256)")
+            .HasMaxLength(256);
 
-            builder.Property(t => t.ProtectedTicket)
-                .HasColumnName("ProtectedTicket")
-                .HasColumnType("nvarchar(max)");
+        builder.Property(t => t.ClientId)
+            .HasColumnName("ClientId")
+            .HasColumnType("nvarchar(450)")
+            .HasMaxLength(450);
 
-            builder.Property(t => t.Issued)
-                .IsRequired()
-                .HasColumnName("Issued")
-                .HasColumnType("datetimeoffset")
-                .HasDefaultValueSql("(sysutcdatetime())");
+        builder.Property(t => t.ProtectedTicket)
+            .HasColumnName("ProtectedTicket")
+            .HasColumnType("nvarchar(max)");
 
-            builder.Property(t => t.Expires)
-                .HasColumnName("Expires")
-                .HasColumnType("datetimeoffset");
+        builder.Property(t => t.Issued)
+            .IsRequired()
+            .HasColumnName("Issued")
+            .HasColumnType("datetimeoffset")
+            .HasDefaultValueSql("(sysutcdatetime())");
 
-            // relationships
-            #endregion
-        }
+        builder.Property(t => t.Expires)
+            .HasColumnName("Expires")
+            .HasColumnType("datetimeoffset");
 
-        #region Generated Constants
-        public struct Table
-        {
-            /// <summary>Table Schema name constant for entity <see cref="InstructorIQ.Core.Data.Entities.RefreshToken" /></summary>
-            public const string Schema = "IQ";
-            /// <summary>Table Name constant for entity <see cref="InstructorIQ.Core.Data.Entities.RefreshToken" /></summary>
-            public const string Name = "RefreshToken";
-        }
-
-        public struct Columns
-        {
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.RefreshToken.Id" /></summary>
-            public const string Id = "Id";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.RefreshToken.TokenHash" /></summary>
-            public const string TokenHash = "TokenHash";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.RefreshToken.UserName" /></summary>
-            public const string UserName = "UserName";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.RefreshToken.ClientId" /></summary>
-            public const string ClientId = "ClientId";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.RefreshToken.ProtectedTicket" /></summary>
-            public const string ProtectedTicket = "ProtectedTicket";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.RefreshToken.Issued" /></summary>
-            public const string Issued = "Issued";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.RefreshToken.Expires" /></summary>
-            public const string Expires = "Expires";
-        }
+        // relationships
         #endregion
+    }
 
+    #region Generated Constants
+    public struct Table
+    {
+        /// <summary>Table Schema name constant for entity <see cref="InstructorIQ.Core.Data.Entities.RefreshToken" /></summary>
+        public const string Schema = "IQ";
+        /// <summary>Table Name constant for entity <see cref="InstructorIQ.Core.Data.Entities.RefreshToken" /></summary>
+        public const string Name = "RefreshToken";
     }
+
+    public struct Columns
+    {
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.RefreshToken.Id" /></summary>
+        public const string Id = "Id";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.RefreshToken.TokenHash" /></summary>
+        public const string TokenHash = "TokenHash";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.RefreshToken.UserName" /></summary>
+        public const string UserName = "UserName";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.RefreshToken.ClientId" /></summary>
+        public const string ClientId = "ClientId";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.RefreshToken.ProtectedTicket" /></summary>
+        public const string ProtectedTicket = "ProtectedTicket";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.RefreshToken.Issued" /></summary>
+        public const string Issued = "Issued";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.RefreshToken.Expires" /></summary>
+        public const string Expires = "Expires";
+    }
+    #endregion
+
 }
diff --git a/service/src/InstructorIQ.Core/Data/Mapping/RoleClaimMap.cs b/service/src/InstructorIQ.Core/Data/Mapping/RoleClaimMap.cs
index f540669d..8ae495d9 100644
--- a/service/src/InstructorIQ.Core/Data/Mapping/RoleClaimMap.cs
+++ b/service/src/InstructorIQ.Core/Data/Mapping/RoleClaimMap.cs
@@ -1,22 +1,22 @@
 using System;
+
 using Microsoft.EntityFrameworkCore;
 
-namespace InstructorIQ.Core.Data.Mapping
+namespace InstructorIQ.Core.Data.Mapping;
+
+/// <summary>
+/// Allows configuration for an entity type <see cref="InstructorIQ.Core.Data.Entities.RoleClaim" />
+/// </summary>
+public class RoleClaimMap
+    : IEntityTypeConfiguration<InstructorIQ.Core.Data.Entities.RoleClaim>
 {
     /// <summary>
-    /// Allows configuration for an entity type <see cref="InstructorIQ.Core.Data.Entities.RoleClaim" />
+    /// Configures the entity of type <see cref="InstructorIQ.Core.Data.Entities.RoleClaim" />
     /// </summary>
-    public class RoleClaimMap
-        : IEntityTypeConfiguration<InstructorIQ.Core.Data.Entities.RoleClaim>
+    /// <param name="builder">The builder to be used to configure the entity type.</param>
+    public void Configure(Microsoft.EntityFrameworkCore.Metadata.Builders.EntityTypeBuilder<InstructorIQ.Core.Data.Entities.RoleClaim> builder)
     {
-        /// <summary>
-        /// Configures the entity of type <see cref="InstructorIQ.Core.Data.Entities.RoleClaim" />
-        /// </summary>
-        /// <param name="builder">The builder to be used to configure the entity type.</param>
-        public void Configure(Microsoft.EntityFrameworkCore.Metadata.Builders.EntityTypeBuilder<InstructorIQ.Core.Data.Entities.RoleClaim> builder)
-        {
-            builder.ToTable("RoleClaim", "Identity");
-        }
-
+        builder.ToTable("RoleClaim", "Identity");
     }
-}
\ No newline at end of file
+
+}
diff --git a/service/src/InstructorIQ.Core/Data/Mapping/RoleMap.cs b/service/src/InstructorIQ.Core/Data/Mapping/RoleMap.cs
index 8bf20c8a..2f4caa2b 100644
--- a/service/src/InstructorIQ.Core/Data/Mapping/RoleMap.cs
+++ b/service/src/InstructorIQ.Core/Data/Mapping/RoleMap.cs
@@ -1,23 +1,23 @@
 using System;
 using System.Collections.Generic;
+
 using Microsoft.EntityFrameworkCore;
 
-namespace InstructorIQ.Core.Data.Mapping
+namespace InstructorIQ.Core.Data.Mapping;
+
+/// <summary>
+/// Allows configuration for an entity type <see cref="InstructorIQ.Core.Data.Entities.Role" />
+/// </summary>
+public class RoleMap
+    : IEntityTypeConfiguration<InstructorIQ.Core.Data.Entities.Role>
 {
     /// <summary>
-    /// Allows configuration for an entity type <see cref="InstructorIQ.Core.Data.Entities.Role" />
+    /// Configures the entity of type <see cref="InstructorIQ.Core.Data.Entities.Role" />
     /// </summary>
-    public class RoleMap
-        : IEntityTypeConfiguration<InstructorIQ.Core.Data.Entities.Role>
+    /// <param name="builder">The builder to be used to configure the entity type.</param>
+    public void Configure(Microsoft.EntityFrameworkCore.Metadata.Builders.EntityTypeBuilder<InstructorIQ.Core.Data.Entities.Role> builder)
     {
-        /// <summary>
-        /// Configures the entity of type <see cref="InstructorIQ.Core.Data.Entities.Role" />
-        /// </summary>
-        /// <param name="builder">The builder to be used to configure the entity type.</param>
-        public void Configure(Microsoft.EntityFrameworkCore.Metadata.Builders.EntityTypeBuilder<InstructorIQ.Core.Data.Entities.Role> builder)
-        {
-            builder.ToTable("Role", "Identity");
-        }
-
+        builder.ToTable("Role", "Identity");
     }
+
 }
diff --git a/service/src/InstructorIQ.Core/Data/Mapping/SessionInstructorMap.cs b/service/src/InstructorIQ.Core/Data/Mapping/SessionInstructorMap.cs
index e1b5b68a..45cc0900 100644
--- a/service/src/InstructorIQ.Core/Data/Mapping/SessionInstructorMap.cs
+++ b/service/src/InstructorIQ.Core/Data/Mapping/SessionInstructorMap.cs
@@ -1,151 +1,151 @@
 using System;
 using System.Collections.Generic;
+
 using Microsoft.EntityFrameworkCore;
 
-namespace InstructorIQ.Core.Data.Mapping
+namespace InstructorIQ.Core.Data.Mapping;
+
+/// <summary>
+/// Allows configuration for an entity type <see cref="InstructorIQ.Core.Data.Entities.SessionInstructor" />
+/// </summary>
+public class SessionInstructorMap
+    : IEntityTypeConfiguration<InstructorIQ.Core.Data.Entities.SessionInstructor>
 {
     /// <summary>
-    /// Allows configuration for an entity type <see cref="InstructorIQ.Core.Data.Entities.SessionInstructor" />
+    /// Configures the entity of type <see cref="InstructorIQ.Core.Data.Entities.SessionInstructor" />
     /// </summary>
-    public class SessionInstructorMap
-        : IEntityTypeConfiguration<InstructorIQ.Core.Data.Entities.SessionInstructor>
+    /// <param name="builder">The builder to be used to configure the entity type.</param>
+    public void Configure(Microsoft.EntityFrameworkCore.Metadata.Builders.EntityTypeBuilder<InstructorIQ.Core.Data.Entities.SessionInstructor> builder)
     {
-        /// <summary>
-        /// Configures the entity of type <see cref="InstructorIQ.Core.Data.Entities.SessionInstructor" />
-        /// </summary>
-        /// <param name="builder">The builder to be used to configure the entity type.</param>
-        public void Configure(Microsoft.EntityFrameworkCore.Metadata.Builders.EntityTypeBuilder<InstructorIQ.Core.Data.Entities.SessionInstructor> builder)
-        {
-            #region Generated Configure
-            // table
-            builder.ToTable("SessionInstructor", "IQ");
-
-            // key
-            builder.HasKey(t => t.Id);
-
-            // properties
-            builder.Property(t => t.Id)
-                .IsRequired()
-                .HasColumnName("Id")
-                .HasColumnType("uniqueidentifier")
-                .HasDefaultValueSql("(newsequentialid())");
-
-            builder.Property(t => t.SessionId)
-                .IsRequired()
-                .HasColumnName("SessionId")
-                .HasColumnType("uniqueidentifier");
-
-            builder.Property(t => t.InstructorId)
-                .IsRequired()
-                .HasColumnName("InstructorId")
-                .HasColumnType("uniqueidentifier");
-
-            builder.Property(t => t.InstructorRoleId)
-                .HasColumnName("InstructorRoleId")
-                .HasColumnType("uniqueidentifier");
-
-            builder.Property(t => t.Created)
-                .IsRequired()
-                .HasColumnName("Created")
-                .HasColumnType("datetimeoffset")
-                .HasDefaultValueSql("(sysutcdatetime())");
-
-            builder.Property(t => t.CreatedBy)
-                .HasColumnName("CreatedBy")
-                .HasColumnType("nvarchar(100)")
-                .HasMaxLength(100);
-
-            builder.Property(t => t.Updated)
-                .IsRequired()
-                .HasColumnName("Updated")
-                .HasColumnType("datetimeoffset")
-                .HasDefaultValueSql("(sysutcdatetime())");
-
-            builder.Property(t => t.UpdatedBy)
-                .HasColumnName("UpdatedBy")
-                .HasColumnType("nvarchar(100)")
-                .HasMaxLength(100);
-
-            builder.Property(t => t.RowVersion)
-                .IsRequired()
-                .IsRowVersion()
-                .HasColumnName("RowVersion")
-                .HasColumnType("rowversion")
-                .HasMaxLength(8)
-                .ValueGeneratedOnAddOrUpdate();
-
-            builder.Property(t => t.PeriodStart)
-                .IsRequired()
-                .HasColumnName("PeriodStart")
-                .HasColumnType("datetime2")
-                .HasDefaultValueSql("(sysutcdatetime())");
-
-            builder.Property(t => t.PeriodEnd)
-                .IsRequired()
-                .HasColumnName("PeriodEnd")
-                .HasColumnType("datetime2")
-                .HasDefaultValueSql("('9999-12-31 23:59:59.9999999')");
-
-            // relationships
-            builder.HasOne(t => t.InstructorRole)
-                .WithMany(t => t.SessionInstructors)
-                .HasForeignKey(d => d.InstructorRoleId)
-                .HasConstraintName("FK_SessionInstructor_InstructorRole_InstructorRoleId");
-
-            builder.HasOne(t => t.Session)
-                .WithMany(t => t.SessionInstructors)
-                .HasForeignKey(d => d.SessionId)
-                .HasConstraintName("FK_SessionInstructor_Session_SessionId");
-
-            #endregion
-
-            builder.HasOne(t => t.Instructor)
-                .WithMany(t => t.SessionInstructors)
-                .HasForeignKey(d => d.InstructorId)
-                .HasConstraintName("FK_SessionInstructor_Instructor_InstructorId");
-
-            builder.Property(t => t.PeriodStart)
-                .ValueGeneratedOnAddOrUpdate();
-
-            builder.Property(t => t.PeriodEnd)
-                .ValueGeneratedOnAddOrUpdate();
-        }
-
-        #region Generated Constants
-        public struct Table
-        {
-            /// <summary>Table Schema name constant for entity <see cref="InstructorIQ.Core.Data.Entities.SessionInstructor" /></summary>
-            public const string Schema = "IQ";
-            /// <summary>Table Name constant for entity <see cref="InstructorIQ.Core.Data.Entities.SessionInstructor" /></summary>
-            public const string Name = "SessionInstructor";
-        }
-
-        public struct Columns
-        {
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.SessionInstructor.Id" /></summary>
-            public const string Id = "Id";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.SessionInstructor.SessionId" /></summary>
-            public const string SessionId = "SessionId";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.SessionInstructor.InstructorId" /></summary>
-            public const string InstructorId = "InstructorId";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.SessionInstructor.InstructorRoleId" /></summary>
-            public const string InstructorRoleId = "InstructorRoleId";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.SessionInstructor.Created" /></summary>
-            public const string Created = "Created";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.SessionInstructor.CreatedBy" /></summary>
-            public const string CreatedBy = "CreatedBy";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.SessionInstructor.Updated" /></summary>
-            public const string Updated = "Updated";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.SessionInstructor.UpdatedBy" /></summary>
-            public const string UpdatedBy = "UpdatedBy";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.SessionInstructor.RowVersion" /></summary>
-            public const string RowVersion = "RowVersion";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.SessionInstructor.PeriodStart" /></summary>
-            public const string PeriodStart = "PeriodStart";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.SessionInstructor.PeriodEnd" /></summary>
-            public const string PeriodEnd = "PeriodEnd";
-        }
+        #region Generated Configure
+        // table
+        builder.ToTable("SessionInstructor", "IQ");
+
+        // key
+        builder.HasKey(t => t.Id);
+
+        // properties
+        builder.Property(t => t.Id)
+            .IsRequired()
+            .HasColumnName("Id")
+            .HasColumnType("uniqueidentifier")
+            .HasDefaultValueSql("(newsequentialid())");
+
+        builder.Property(t => t.SessionId)
+            .IsRequired()
+            .HasColumnName("SessionId")
+            .HasColumnType("uniqueidentifier");
+
+        builder.Property(t => t.InstructorId)
+            .IsRequired()
+            .HasColumnName("InstructorId")
+            .HasColumnType("uniqueidentifier");
+
+        builder.Property(t => t.InstructorRoleId)
+            .HasColumnName("InstructorRoleId")
+            .HasColumnType("uniqueidentifier");
+
+        builder.Property(t => t.Created)
+            .IsRequired()
+            .HasColumnName("Created")
+            .HasColumnType("datetimeoffset")
+            .HasDefaultValueSql("(sysutcdatetime())");
+
+        builder.Property(t => t.CreatedBy)
+            .HasColumnName("CreatedBy")
+            .HasColumnType("nvarchar(100)")
+            .HasMaxLength(100);
+
+        builder.Property(t => t.Updated)
+            .IsRequired()
+            .HasColumnName("Updated")
+            .HasColumnType("datetimeoffset")
+            .HasDefaultValueSql("(sysutcdatetime())");
+
+        builder.Property(t => t.UpdatedBy)
+            .HasColumnName("UpdatedBy")
+            .HasColumnType("nvarchar(100)")
+            .HasMaxLength(100);
+
+        builder.Property(t => t.RowVersion)
+            .IsRequired()
+            .IsRowVersion()
+            .HasColumnName("RowVersion")
+            .HasColumnType("rowversion")
+            .HasMaxLength(8)
+            .ValueGeneratedOnAddOrUpdate();
+
+        builder.Property(t => t.PeriodStart)
+            .IsRequired()
+            .HasColumnName("PeriodStart")
+            .HasColumnType("datetime2")
+            .HasDefaultValueSql("(sysutcdatetime())");
+
+        builder.Property(t => t.PeriodEnd)
+            .IsRequired()
+            .HasColumnName("PeriodEnd")
+            .HasColumnType("datetime2")
+            .HasDefaultValueSql("('9999-12-31 23:59:59.9999999')");
+
+        // relationships
+        builder.HasOne(t => t.InstructorRole)
+            .WithMany(t => t.SessionInstructors)
+            .HasForeignKey(d => d.InstructorRoleId)
+            .HasConstraintName("FK_SessionInstructor_InstructorRole_InstructorRoleId");
+
+        builder.HasOne(t => t.Session)
+            .WithMany(t => t.SessionInstructors)
+            .HasForeignKey(d => d.SessionId)
+            .HasConstraintName("FK_SessionInstructor_Session_SessionId");
+
         #endregion
 
+        builder.HasOne(t => t.Instructor)
+            .WithMany(t => t.SessionInstructors)
+            .HasForeignKey(d => d.InstructorId)
+            .HasConstraintName("FK_SessionInstructor_Instructor_InstructorId");
+
+        builder.Property(t => t.PeriodStart)
+            .ValueGeneratedOnAddOrUpdate();
+
+        builder.Property(t => t.PeriodEnd)
+            .ValueGeneratedOnAddOrUpdate();
+    }
+
+    #region Generated Constants
+    public struct Table
+    {
+        /// <summary>Table Schema name constant for entity <see cref="InstructorIQ.Core.Data.Entities.SessionInstructor" /></summary>
+        public const string Schema = "IQ";
+        /// <summary>Table Name constant for entity <see cref="InstructorIQ.Core.Data.Entities.SessionInstructor" /></summary>
+        public const string Name = "SessionInstructor";
+    }
+
+    public struct Columns
+    {
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.SessionInstructor.Id" /></summary>
+        public const string Id = "Id";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.SessionInstructor.SessionId" /></summary>
+        public const string SessionId = "SessionId";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.SessionInstructor.InstructorId" /></summary>
+        public const string InstructorId = "InstructorId";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.SessionInstructor.InstructorRoleId" /></summary>
+        public const string InstructorRoleId = "InstructorRoleId";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.SessionInstructor.Created" /></summary>
+        public const string Created = "Created";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.SessionInstructor.CreatedBy" /></summary>
+        public const string CreatedBy = "CreatedBy";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.SessionInstructor.Updated" /></summary>
+        public const string Updated = "Updated";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.SessionInstructor.UpdatedBy" /></summary>
+        public const string UpdatedBy = "UpdatedBy";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.SessionInstructor.RowVersion" /></summary>
+        public const string RowVersion = "RowVersion";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.SessionInstructor.PeriodStart" /></summary>
+        public const string PeriodStart = "PeriodStart";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.SessionInstructor.PeriodEnd" /></summary>
+        public const string PeriodEnd = "PeriodEnd";
     }
+    #endregion
+
 }
diff --git a/service/src/InstructorIQ.Core/Data/Mapping/SessionMap.cs b/service/src/InstructorIQ.Core/Data/Mapping/SessionMap.cs
index 0af35a31..7faa34ac 100644
--- a/service/src/InstructorIQ.Core/Data/Mapping/SessionMap.cs
+++ b/service/src/InstructorIQ.Core/Data/Mapping/SessionMap.cs
@@ -1,203 +1,203 @@
 using System;
 using System.Collections.Generic;
+
 using Microsoft.EntityFrameworkCore;
 
-namespace InstructorIQ.Core.Data.Mapping
+namespace InstructorIQ.Core.Data.Mapping;
+
+/// <summary>
+/// Allows configuration for an entity type <see cref="InstructorIQ.Core.Data.Entities.Session" />
+/// </summary>
+public class SessionMap
+    : IEntityTypeConfiguration<InstructorIQ.Core.Data.Entities.Session>
 {
     /// <summary>
-    /// Allows configuration for an entity type <see cref="InstructorIQ.Core.Data.Entities.Session" />
+    /// Configures the entity of type <see cref="InstructorIQ.Core.Data.Entities.Session" />
     /// </summary>
-    public class SessionMap
-        : IEntityTypeConfiguration<InstructorIQ.Core.Data.Entities.Session>
+    /// <param name="builder">The builder to be used to configure the entity type.</param>
+    public void Configure(Microsoft.EntityFrameworkCore.Metadata.Builders.EntityTypeBuilder<InstructorIQ.Core.Data.Entities.Session> builder)
     {
-        /// <summary>
-        /// Configures the entity of type <see cref="InstructorIQ.Core.Data.Entities.Session" />
-        /// </summary>
-        /// <param name="builder">The builder to be used to configure the entity type.</param>
-        public void Configure(Microsoft.EntityFrameworkCore.Metadata.Builders.EntityTypeBuilder<InstructorIQ.Core.Data.Entities.Session> builder)
-        {
-            #region Generated Configure
-            // table
-            builder.ToTable("Session", "IQ");
-
-            // key
-            builder.HasKey(t => t.Id);
-
-            // properties
-            builder.Property(t => t.Id)
-                .IsRequired()
-                .HasColumnName("Id")
-                .HasColumnType("uniqueidentifier")
-                .HasDefaultValueSql("(newsequentialid())");
-
-            builder.Property(t => t.Note)
-                .HasColumnName("Note")
-                .HasColumnType("nvarchar(max)");
-
-            builder.Property(t => t.StartDate)
-                .HasColumnName("StartDate")
-                .HasColumnType("date");
-
-            builder.Property(t => t.StartTime)
-                .HasColumnName("StartTime")
-                .HasColumnType("time(1)");
-
-            builder.Property(t => t.EndDate)
-                .HasColumnName("EndDate")
-                .HasColumnType("date");
-
-            builder.Property(t => t.EndTime)
-                .HasColumnName("EndTime")
-                .HasColumnType("time(1)");
-
-            builder.Property(t => t.TenantId)
-                .IsRequired()
-                .HasColumnName("TenantId")
-                .HasColumnType("uniqueidentifier");
-
-            builder.Property(t => t.TopicId)
-                .IsRequired()
-                .HasColumnName("TopicId")
-                .HasColumnType("uniqueidentifier");
-
-            builder.Property(t => t.LocationId)
-                .HasColumnName("LocationId")
-                .HasColumnType("uniqueidentifier");
-
-            builder.Property(t => t.GroupId)
-                .HasColumnName("GroupId")
-                .HasColumnType("uniqueidentifier");
-
-            builder.Property(t => t.LeadInstructorId)
-                .HasColumnName("LeadInstructorId")
-                .HasColumnType("uniqueidentifier");
-
-            builder.Property(t => t.Created)
-                .IsRequired()
-                .HasColumnName("Created")
-                .HasColumnType("datetimeoffset")
-                .HasDefaultValueSql("(sysutcdatetime())");
-
-            builder.Property(t => t.CreatedBy)
-                .HasColumnName("CreatedBy")
-                .HasColumnType("nvarchar(100)")
-                .HasMaxLength(100);
-
-            builder.Property(t => t.Updated)
-                .IsRequired()
-                .HasColumnName("Updated")
-                .HasColumnType("datetimeoffset")
-                .HasDefaultValueSql("(sysutcdatetime())");
-
-            builder.Property(t => t.UpdatedBy)
-                .HasColumnName("UpdatedBy")
-                .HasColumnType("nvarchar(100)")
-                .HasMaxLength(100);
-
-            builder.Property(t => t.RowVersion)
-                .IsRequired()
-                .IsRowVersion()
-                .HasColumnName("RowVersion")
-                .HasColumnType("rowversion")
-                .HasMaxLength(8)
-                .ValueGeneratedOnAddOrUpdate();
-
-            builder.Property(t => t.PeriodStart)
-                .IsRequired()
-                .HasColumnName("PeriodStart")
-                .HasColumnType("datetime2")
-                .HasDefaultValueSql("(sysutcdatetime())");
-
-            builder.Property(t => t.PeriodEnd)
-                .IsRequired()
-                .HasColumnName("PeriodEnd")
-                .HasColumnType("datetime2")
-                .HasDefaultValueSql("('9999-12-31 23:59:59.9999999')");
-
-            // relationships
-            builder.HasOne(t => t.Group)
-                .WithMany(t => t.Sessions)
-                .HasForeignKey(d => d.GroupId)
-                .HasConstraintName("FK_Session_Group_GroupId");
-
-            builder.HasOne(t => t.Location)
-                .WithMany(t => t.Sessions)
-                .HasForeignKey(d => d.LocationId)
-                .HasConstraintName("FK_Session_Location_LocationId");
-
-            builder.HasOne(t => t.Tenant)
-                .WithMany(t => t.Sessions)
-                .HasForeignKey(d => d.TenantId)
-                .HasConstraintName("FK_Session_Tenant_TenantId");
-
-            builder.HasOne(t => t.Topic)
-                .WithMany(t => t.Sessions)
-                .HasForeignKey(d => d.TopicId)
-                .HasConstraintName("FK_Session_Topic_TopicId");
-
-            #endregion
-
-            builder.HasOne(t => t.LeadInstructor)
-                .WithMany(t => t.LeadSessions)
-                .HasForeignKey(d => d.LeadInstructorId)
-                .HasConstraintName("FK_Session_Instructor_LeadInstructorId");
-
-            builder.Property(t => t.PeriodStart)
-                .ValueGeneratedOnAddOrUpdate();
-
-            builder.Property(t => t.PeriodEnd)
-                .ValueGeneratedOnAddOrUpdate();
-        }
-
-        #region Generated Constants
-        public struct Table
-        {
-            /// <summary>Table Schema name constant for entity <see cref="InstructorIQ.Core.Data.Entities.Session" /></summary>
-            public const string Schema = "IQ";
-            /// <summary>Table Name constant for entity <see cref="InstructorIQ.Core.Data.Entities.Session" /></summary>
-            public const string Name = "Session";
-        }
-
-        public struct Columns
-        {
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Session.Id" /></summary>
-            public const string Id = "Id";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Session.Note" /></summary>
-            public const string Note = "Note";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Session.StartDate" /></summary>
-            public const string StartDate = "StartDate";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Session.StartTime" /></summary>
-            public const string StartTime = "StartTime";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Session.EndDate" /></summary>
-            public const string EndDate = "EndDate";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Session.EndTime" /></summary>
-            public const string EndTime = "EndTime";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Session.TenantId" /></summary>
-            public const string TenantId = "TenantId";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Session.TopicId" /></summary>
-            public const string TopicId = "TopicId";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Session.LocationId" /></summary>
-            public const string LocationId = "LocationId";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Session.GroupId" /></summary>
-            public const string GroupId = "GroupId";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Session.LeadInstructorId" /></summary>
-            public const string LeadInstructorId = "LeadInstructorId";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Session.Created" /></summary>
-            public const string Created = "Created";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Session.CreatedBy" /></summary>
-            public const string CreatedBy = "CreatedBy";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Session.Updated" /></summary>
-            public const string Updated = "Updated";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Session.UpdatedBy" /></summary>
-            public const string UpdatedBy = "UpdatedBy";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Session.RowVersion" /></summary>
-            public const string RowVersion = "RowVersion";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Session.PeriodStart" /></summary>
-            public const string PeriodStart = "PeriodStart";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Session.PeriodEnd" /></summary>
-            public const string PeriodEnd = "PeriodEnd";
-        }
+        #region Generated Configure
+        // table
+        builder.ToTable("Session", "IQ");
+
+        // key
+        builder.HasKey(t => t.Id);
+
+        // properties
+        builder.Property(t => t.Id)
+            .IsRequired()
+            .HasColumnName("Id")
+            .HasColumnType("uniqueidentifier")
+            .HasDefaultValueSql("(newsequentialid())");
+
+        builder.Property(t => t.Note)
+            .HasColumnName("Note")
+            .HasColumnType("nvarchar(max)");
+
+        builder.Property(t => t.StartDate)
+            .HasColumnName("StartDate")
+            .HasColumnType("date");
+
+        builder.Property(t => t.StartTime)
+            .HasColumnName("StartTime")
+            .HasColumnType("time(1)");
+
+        builder.Property(t => t.EndDate)
+            .HasColumnName("EndDate")
+            .HasColumnType("date");
+
+        builder.Property(t => t.EndTime)
+            .HasColumnName("EndTime")
+            .HasColumnType("time(1)");
+
+        builder.Property(t => t.TenantId)
+            .IsRequired()
+            .HasColumnName("TenantId")
+            .HasColumnType("uniqueidentifier");
+
+        builder.Property(t => t.TopicId)
+            .IsRequired()
+            .HasColumnName("TopicId")
+            .HasColumnType("uniqueidentifier");
+
+        builder.Property(t => t.LocationId)
+            .HasColumnName("LocationId")
+            .HasColumnType("uniqueidentifier");
+
+        builder.Property(t => t.GroupId)
+            .HasColumnName("GroupId")
+            .HasColumnType("uniqueidentifier");
+
+        builder.Property(t => t.LeadInstructorId)
+            .HasColumnName("LeadInstructorId")
+            .HasColumnType("uniqueidentifier");
+
+        builder.Property(t => t.Created)
+            .IsRequired()
+            .HasColumnName("Created")
+            .HasColumnType("datetimeoffset")
+            .HasDefaultValueSql("(sysutcdatetime())");
+
+        builder.Property(t => t.CreatedBy)
+            .HasColumnName("CreatedBy")
+            .HasColumnType("nvarchar(100)")
+            .HasMaxLength(100);
+
+        builder.Property(t => t.Updated)
+            .IsRequired()
+            .HasColumnName("Updated")
+            .HasColumnType("datetimeoffset")
+            .HasDefaultValueSql("(sysutcdatetime())");
+
+        builder.Property(t => t.UpdatedBy)
+            .HasColumnName("UpdatedBy")
+            .HasColumnType("nvarchar(100)")
+            .HasMaxLength(100);
+
+        builder.Property(t => t.RowVersion)
+            .IsRequired()
+            .IsRowVersion()
+            .HasColumnName("RowVersion")
+            .HasColumnType("rowversion")
+            .HasMaxLength(8)
+            .ValueGeneratedOnAddOrUpdate();
+
+        builder.Property(t => t.PeriodStart)
+            .IsRequired()
+            .HasColumnName("PeriodStart")
+            .HasColumnType("datetime2")
+            .HasDefaultValueSql("(sysutcdatetime())");
+
+        builder.Property(t => t.PeriodEnd)
+            .IsRequired()
+            .HasColumnName("PeriodEnd")
+            .HasColumnType("datetime2")
+            .HasDefaultValueSql("('9999-12-31 23:59:59.9999999')");
+
+        // relationships
+        builder.HasOne(t => t.Group)
+            .WithMany(t => t.Sessions)
+            .HasForeignKey(d => d.GroupId)
+            .HasConstraintName("FK_Session_Group_GroupId");
+
+        builder.HasOne(t => t.Location)
+            .WithMany(t => t.Sessions)
+            .HasForeignKey(d => d.LocationId)
+            .HasConstraintName("FK_Session_Location_LocationId");
+
+        builder.HasOne(t => t.Tenant)
+            .WithMany(t => t.Sessions)
+            .HasForeignKey(d => d.TenantId)
+            .HasConstraintName("FK_Session_Tenant_TenantId");
+
+        builder.HasOne(t => t.Topic)
+            .WithMany(t => t.Sessions)
+            .HasForeignKey(d => d.TopicId)
+            .HasConstraintName("FK_Session_Topic_TopicId");
+
         #endregion
 
+        builder.HasOne(t => t.LeadInstructor)
+            .WithMany(t => t.LeadSessions)
+            .HasForeignKey(d => d.LeadInstructorId)
+            .HasConstraintName("FK_Session_Instructor_LeadInstructorId");
+
+        builder.Property(t => t.PeriodStart)
+            .ValueGeneratedOnAddOrUpdate();
+
+        builder.Property(t => t.PeriodEnd)
+            .ValueGeneratedOnAddOrUpdate();
+    }
+
+    #region Generated Constants
+    public struct Table
+    {
+        /// <summary>Table Schema name constant for entity <see cref="InstructorIQ.Core.Data.Entities.Session" /></summary>
+        public const string Schema = "IQ";
+        /// <summary>Table Name constant for entity <see cref="InstructorIQ.Core.Data.Entities.Session" /></summary>
+        public const string Name = "Session";
+    }
+
+    public struct Columns
+    {
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Session.Id" /></summary>
+        public const string Id = "Id";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Session.Note" /></summary>
+        public const string Note = "Note";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Session.StartDate" /></summary>
+        public const string StartDate = "StartDate";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Session.StartTime" /></summary>
+        public const string StartTime = "StartTime";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Session.EndDate" /></summary>
+        public const string EndDate = "EndDate";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Session.EndTime" /></summary>
+        public const string EndTime = "EndTime";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Session.TenantId" /></summary>
+        public const string TenantId = "TenantId";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Session.TopicId" /></summary>
+        public const string TopicId = "TopicId";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Session.LocationId" /></summary>
+        public const string LocationId = "LocationId";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Session.GroupId" /></summary>
+        public const string GroupId = "GroupId";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Session.LeadInstructorId" /></summary>
+        public const string LeadInstructorId = "LeadInstructorId";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Session.Created" /></summary>
+        public const string Created = "Created";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Session.CreatedBy" /></summary>
+        public const string CreatedBy = "CreatedBy";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Session.Updated" /></summary>
+        public const string Updated = "Updated";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Session.UpdatedBy" /></summary>
+        public const string UpdatedBy = "UpdatedBy";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Session.RowVersion" /></summary>
+        public const string RowVersion = "RowVersion";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Session.PeriodStart" /></summary>
+        public const string PeriodStart = "PeriodStart";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Session.PeriodEnd" /></summary>
+        public const string PeriodEnd = "PeriodEnd";
     }
+    #endregion
+
 }
diff --git a/service/src/InstructorIQ.Core/Data/Mapping/SignUpMap.cs b/service/src/InstructorIQ.Core/Data/Mapping/SignUpMap.cs
index a120309e..fa6bce40 100644
--- a/service/src/InstructorIQ.Core/Data/Mapping/SignUpMap.cs
+++ b/service/src/InstructorIQ.Core/Data/Mapping/SignUpMap.cs
@@ -1,119 +1,119 @@
 using System;
 using System.Collections.Generic;
+
 using Microsoft.EntityFrameworkCore;
 
-namespace InstructorIQ.Core.Data.Mapping
+namespace InstructorIQ.Core.Data.Mapping;
+
+/// <summary>
+/// Allows configuration for an entity type <see cref="InstructorIQ.Core.Data.Entities.SignUp" />
+/// </summary>
+public partial class SignUpMap
+    : IEntityTypeConfiguration<InstructorIQ.Core.Data.Entities.SignUp>
 {
     /// <summary>
-    /// Allows configuration for an entity type <see cref="InstructorIQ.Core.Data.Entities.SignUp" />
+    /// Configures the entity of type <see cref="InstructorIQ.Core.Data.Entities.SignUp" />
     /// </summary>
-    public partial class SignUpMap
-        : IEntityTypeConfiguration<InstructorIQ.Core.Data.Entities.SignUp>
+    /// <param name="builder">The builder to be used to configure the entity type.</param>
+    public void Configure(Microsoft.EntityFrameworkCore.Metadata.Builders.EntityTypeBuilder<InstructorIQ.Core.Data.Entities.SignUp> builder)
     {
-        /// <summary>
-        /// Configures the entity of type <see cref="InstructorIQ.Core.Data.Entities.SignUp" />
-        /// </summary>
-        /// <param name="builder">The builder to be used to configure the entity type.</param>
-        public void Configure(Microsoft.EntityFrameworkCore.Metadata.Builders.EntityTypeBuilder<InstructorIQ.Core.Data.Entities.SignUp> builder)
-        {
-            #region Generated Configure
-            // table
-            builder.ToTable("SignUp", "IQ");
-
-            // key
-            builder.HasKey(t => t.Id);
-
-            // properties
-            builder.Property(t => t.Id)
-                .IsRequired()
-                .HasColumnName("Id")
-                .HasColumnType("uniqueidentifier")
-                .HasDefaultValueSql("(newsequentialid())");
-
-            builder.Property(t => t.Name)
-                .IsRequired()
-                .HasColumnName("Name")
-                .HasColumnType("nvarchar(100)")
-                .HasMaxLength(100);
-
-            builder.Property(t => t.Description)
-                .HasColumnName("Description")
-                .HasColumnType("nvarchar(max)");
-
-            builder.Property(t => t.TenantId)
-                .IsRequired()
-                .HasColumnName("TenantId")
-                .HasColumnType("uniqueidentifier");
-
-            builder.Property(t => t.Created)
-                .IsRequired()
-                .HasColumnName("Created")
-                .HasColumnType("datetimeoffset")
-                .HasDefaultValueSql("(sysutcdatetime())");
-
-            builder.Property(t => t.CreatedBy)
-                .HasColumnName("CreatedBy")
-                .HasColumnType("nvarchar(100)")
-                .HasMaxLength(100);
-
-            builder.Property(t => t.Updated)
-                .IsRequired()
-                .HasColumnName("Updated")
-                .HasColumnType("datetimeoffset")
-                .HasDefaultValueSql("(sysutcdatetime())");
-
-            builder.Property(t => t.UpdatedBy)
-                .HasColumnName("UpdatedBy")
-                .HasColumnType("nvarchar(100)")
-                .HasMaxLength(100);
-
-            builder.Property(t => t.RowVersion)
-                .IsRequired()
-                .IsRowVersion()
-                .HasColumnName("RowVersion")
-                .HasColumnType("rowversion")
-                .HasMaxLength(8)
-                .ValueGeneratedOnAddOrUpdate();
-
-            // relationships
-            builder.HasOne(t => t.Tenant)
-                .WithMany(t => t.SignUps)
-                .HasForeignKey(d => d.TenantId)
-                .HasConstraintName("FK_SignUp_Tenant_TenantId");
-
-            #endregion
-        }
-
-        #region Generated Constants
-        public struct Table
-        {
-            /// <summary>Table Schema name constant for entity <see cref="InstructorIQ.Core.Data.Entities.SignUp" /></summary>
-            public const string Schema = "IQ";
-            /// <summary>Table Name constant for entity <see cref="InstructorIQ.Core.Data.Entities.SignUp" /></summary>
-            public const string Name = "SignUp";
-        }
-
-        public struct Columns
-        {
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.SignUp.Id" /></summary>
-            public const string Id = "Id";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.SignUp.Name" /></summary>
-            public const string Name = "Name";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.SignUp.Description" /></summary>
-            public const string Description = "Description";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.SignUp.TenantId" /></summary>
-            public const string TenantId = "TenantId";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.SignUp.Created" /></summary>
-            public const string Created = "Created";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.SignUp.CreatedBy" /></summary>
-            public const string CreatedBy = "CreatedBy";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.SignUp.Updated" /></summary>
-            public const string Updated = "Updated";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.SignUp.UpdatedBy" /></summary>
-            public const string UpdatedBy = "UpdatedBy";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.SignUp.RowVersion" /></summary>
-            public const string RowVersion = "RowVersion";
-        }
+        #region Generated Configure
+        // table
+        builder.ToTable("SignUp", "IQ");
+
+        // key
+        builder.HasKey(t => t.Id);
+
+        // properties
+        builder.Property(t => t.Id)
+            .IsRequired()
+            .HasColumnName("Id")
+            .HasColumnType("uniqueidentifier")
+            .HasDefaultValueSql("(newsequentialid())");
+
+        builder.Property(t => t.Name)
+            .IsRequired()
+            .HasColumnName("Name")
+            .HasColumnType("nvarchar(100)")
+            .HasMaxLength(100);
+
+        builder.Property(t => t.Description)
+            .HasColumnName("Description")
+            .HasColumnType("nvarchar(max)");
+
+        builder.Property(t => t.TenantId)
+            .IsRequired()
+            .HasColumnName("TenantId")
+            .HasColumnType("uniqueidentifier");
+
+        builder.Property(t => t.Created)
+            .IsRequired()
+            .HasColumnName("Created")
+            .HasColumnType("datetimeoffset")
+            .HasDefaultValueSql("(sysutcdatetime())");
+
+        builder.Property(t => t.CreatedBy)
+            .HasColumnName("CreatedBy")
+            .HasColumnType("nvarchar(100)")
+            .HasMaxLength(100);
+
+        builder.Property(t => t.Updated)
+            .IsRequired()
+            .HasColumnName("Updated")
+            .HasColumnType("datetimeoffset")
+            .HasDefaultValueSql("(sysutcdatetime())");
+
+        builder.Property(t => t.UpdatedBy)
+            .HasColumnName("UpdatedBy")
+            .HasColumnType("nvarchar(100)")
+            .HasMaxLength(100);
+
+        builder.Property(t => t.RowVersion)
+            .IsRequired()
+            .IsRowVersion()
+            .HasColumnName("RowVersion")
+            .HasColumnType("rowversion")
+            .HasMaxLength(8)
+            .ValueGeneratedOnAddOrUpdate();
+
+        // relationships
+        builder.HasOne(t => t.Tenant)
+            .WithMany(t => t.SignUps)
+            .HasForeignKey(d => d.TenantId)
+            .HasConstraintName("FK_SignUp_Tenant_TenantId");
+
         #endregion
     }
+
+    #region Generated Constants
+    public struct Table
+    {
+        /// <summary>Table Schema name constant for entity <see cref="InstructorIQ.Core.Data.Entities.SignUp" /></summary>
+        public const string Schema = "IQ";
+        /// <summary>Table Name constant for entity <see cref="InstructorIQ.Core.Data.Entities.SignUp" /></summary>
+        public const string Name = "SignUp";
+    }
+
+    public struct Columns
+    {
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.SignUp.Id" /></summary>
+        public const string Id = "Id";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.SignUp.Name" /></summary>
+        public const string Name = "Name";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.SignUp.Description" /></summary>
+        public const string Description = "Description";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.SignUp.TenantId" /></summary>
+        public const string TenantId = "TenantId";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.SignUp.Created" /></summary>
+        public const string Created = "Created";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.SignUp.CreatedBy" /></summary>
+        public const string CreatedBy = "CreatedBy";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.SignUp.Updated" /></summary>
+        public const string Updated = "Updated";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.SignUp.UpdatedBy" /></summary>
+        public const string UpdatedBy = "UpdatedBy";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.SignUp.RowVersion" /></summary>
+        public const string RowVersion = "RowVersion";
+    }
+    #endregion
 }
diff --git a/service/src/InstructorIQ.Core/Data/Mapping/SignUpTopicMap.cs b/service/src/InstructorIQ.Core/Data/Mapping/SignUpTopicMap.cs
index 5dcd9465..e915b7bd 100644
--- a/service/src/InstructorIQ.Core/Data/Mapping/SignUpTopicMap.cs
+++ b/service/src/InstructorIQ.Core/Data/Mapping/SignUpTopicMap.cs
@@ -1,117 +1,117 @@
 using System;
 using System.Collections.Generic;
+
 using Microsoft.EntityFrameworkCore;
 
-namespace InstructorIQ.Core.Data.Mapping
+namespace InstructorIQ.Core.Data.Mapping;
+
+/// <summary>
+/// Allows configuration for an entity type <see cref="InstructorIQ.Core.Data.Entities.SignUpTopic" />
+/// </summary>
+public partial class SignUpTopicMap
+    : IEntityTypeConfiguration<InstructorIQ.Core.Data.Entities.SignUpTopic>
 {
     /// <summary>
-    /// Allows configuration for an entity type <see cref="InstructorIQ.Core.Data.Entities.SignUpTopic" />
+    /// Configures the entity of type <see cref="InstructorIQ.Core.Data.Entities.SignUpTopic" />
     /// </summary>
-    public partial class SignUpTopicMap
-        : IEntityTypeConfiguration<InstructorIQ.Core.Data.Entities.SignUpTopic>
+    /// <param name="builder">The builder to be used to configure the entity type.</param>
+    public void Configure(Microsoft.EntityFrameworkCore.Metadata.Builders.EntityTypeBuilder<InstructorIQ.Core.Data.Entities.SignUpTopic> builder)
     {
-        /// <summary>
-        /// Configures the entity of type <see cref="InstructorIQ.Core.Data.Entities.SignUpTopic" />
-        /// </summary>
-        /// <param name="builder">The builder to be used to configure the entity type.</param>
-        public void Configure(Microsoft.EntityFrameworkCore.Metadata.Builders.EntityTypeBuilder<InstructorIQ.Core.Data.Entities.SignUpTopic> builder)
-        {
-            #region Generated Configure
-            // table
-            builder.ToTable("SignUpTopic", "IQ");
-
-            // key
-            builder.HasKey(t => t.Id);
-
-            // properties
-            builder.Property(t => t.Id)
-                .IsRequired()
-                .HasColumnName("Id")
-                .HasColumnType("uniqueidentifier")
-                .HasDefaultValueSql("(newsequentialid())");
-
-            builder.Property(t => t.SignUpId)
-                .IsRequired()
-                .HasColumnName("SignUpId")
-                .HasColumnType("uniqueidentifier");
-
-            builder.Property(t => t.TopicId)
-                .IsRequired()
-                .HasColumnName("TopicId")
-                .HasColumnType("uniqueidentifier");
-
-            builder.Property(t => t.Created)
-                .IsRequired()
-                .HasColumnName("Created")
-                .HasColumnType("datetimeoffset")
-                .HasDefaultValueSql("(sysutcdatetime())");
-
-            builder.Property(t => t.CreatedBy)
-                .HasColumnName("CreatedBy")
-                .HasColumnType("nvarchar(100)")
-                .HasMaxLength(100);
-
-            builder.Property(t => t.Updated)
-                .IsRequired()
-                .HasColumnName("Updated")
-                .HasColumnType("datetimeoffset")
-                .HasDefaultValueSql("(sysutcdatetime())");
-
-            builder.Property(t => t.UpdatedBy)
-                .HasColumnName("UpdatedBy")
-                .HasColumnType("nvarchar(100)")
-                .HasMaxLength(100);
-
-            builder.Property(t => t.RowVersion)
-                .IsRequired()
-                .IsRowVersion()
-                .HasColumnName("RowVersion")
-                .HasColumnType("rowversion")
-                .HasMaxLength(8)
-                .ValueGeneratedOnAddOrUpdate();
-
-            // relationships
-            builder.HasOne(t => t.SignUp)
-                .WithMany(t => t.SignUpTopics)
-                .HasForeignKey(d => d.SignUpId)
-                .HasConstraintName("FK_SignUpTopic_SignUp_SignUpId");
-
-            builder.HasOne(t => t.Topic)
-                .WithMany(t => t.SignUpTopics)
-                .HasForeignKey(d => d.TopicId)
-                .HasConstraintName("FK_SignUpTopic_Topic_TopicId");
-
-            #endregion
-        }
-
-        #region Generated Constants
-        public struct Table
-        {
-            /// <summary>Table Schema name constant for entity <see cref="InstructorIQ.Core.Data.Entities.SignUpTopic" /></summary>
-            public const string Schema = "IQ";
-            /// <summary>Table Name constant for entity <see cref="InstructorIQ.Core.Data.Entities.SignUpTopic" /></summary>
-            public const string Name = "SignUpTopic";
-        }
-
-        public struct Columns
-        {
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.SignUpTopic.Id" /></summary>
-            public const string Id = "Id";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.SignUpTopic.SignUpId" /></summary>
-            public const string SignUpId = "SignUpId";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.SignUpTopic.TopicId" /></summary>
-            public const string TopicId = "TopicId";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.SignUpTopic.Created" /></summary>
-            public const string Created = "Created";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.SignUpTopic.CreatedBy" /></summary>
-            public const string CreatedBy = "CreatedBy";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.SignUpTopic.Updated" /></summary>
-            public const string Updated = "Updated";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.SignUpTopic.UpdatedBy" /></summary>
-            public const string UpdatedBy = "UpdatedBy";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.SignUpTopic.RowVersion" /></summary>
-            public const string RowVersion = "RowVersion";
-        }
+        #region Generated Configure
+        // table
+        builder.ToTable("SignUpTopic", "IQ");
+
+        // key
+        builder.HasKey(t => t.Id);
+
+        // properties
+        builder.Property(t => t.Id)
+            .IsRequired()
+            .HasColumnName("Id")
+            .HasColumnType("uniqueidentifier")
+            .HasDefaultValueSql("(newsequentialid())");
+
+        builder.Property(t => t.SignUpId)
+            .IsRequired()
+            .HasColumnName("SignUpId")
+            .HasColumnType("uniqueidentifier");
+
+        builder.Property(t => t.TopicId)
+            .IsRequired()
+            .HasColumnName("TopicId")
+            .HasColumnType("uniqueidentifier");
+
+        builder.Property(t => t.Created)
+            .IsRequired()
+            .HasColumnName("Created")
+            .HasColumnType("datetimeoffset")
+            .HasDefaultValueSql("(sysutcdatetime())");
+
+        builder.Property(t => t.CreatedBy)
+            .HasColumnName("CreatedBy")
+            .HasColumnType("nvarchar(100)")
+            .HasMaxLength(100);
+
+        builder.Property(t => t.Updated)
+            .IsRequired()
+            .HasColumnName("Updated")
+            .HasColumnType("datetimeoffset")
+            .HasDefaultValueSql("(sysutcdatetime())");
+
+        builder.Property(t => t.UpdatedBy)
+            .HasColumnName("UpdatedBy")
+            .HasColumnType("nvarchar(100)")
+            .HasMaxLength(100);
+
+        builder.Property(t => t.RowVersion)
+            .IsRequired()
+            .IsRowVersion()
+            .HasColumnName("RowVersion")
+            .HasColumnType("rowversion")
+            .HasMaxLength(8)
+            .ValueGeneratedOnAddOrUpdate();
+
+        // relationships
+        builder.HasOne(t => t.SignUp)
+            .WithMany(t => t.SignUpTopics)
+            .HasForeignKey(d => d.SignUpId)
+            .HasConstraintName("FK_SignUpTopic_SignUp_SignUpId");
+
+        builder.HasOne(t => t.Topic)
+            .WithMany(t => t.SignUpTopics)
+            .HasForeignKey(d => d.TopicId)
+            .HasConstraintName("FK_SignUpTopic_Topic_TopicId");
+
         #endregion
     }
+
+    #region Generated Constants
+    public struct Table
+    {
+        /// <summary>Table Schema name constant for entity <see cref="InstructorIQ.Core.Data.Entities.SignUpTopic" /></summary>
+        public const string Schema = "IQ";
+        /// <summary>Table Name constant for entity <see cref="InstructorIQ.Core.Data.Entities.SignUpTopic" /></summary>
+        public const string Name = "SignUpTopic";
+    }
+
+    public struct Columns
+    {
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.SignUpTopic.Id" /></summary>
+        public const string Id = "Id";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.SignUpTopic.SignUpId" /></summary>
+        public const string SignUpId = "SignUpId";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.SignUpTopic.TopicId" /></summary>
+        public const string TopicId = "TopicId";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.SignUpTopic.Created" /></summary>
+        public const string Created = "Created";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.SignUpTopic.CreatedBy" /></summary>
+        public const string CreatedBy = "CreatedBy";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.SignUpTopic.Updated" /></summary>
+        public const string Updated = "Updated";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.SignUpTopic.UpdatedBy" /></summary>
+        public const string UpdatedBy = "UpdatedBy";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.SignUpTopic.RowVersion" /></summary>
+        public const string RowVersion = "RowVersion";
+    }
+    #endregion
 }
diff --git a/service/src/InstructorIQ.Core/Data/Mapping/TemplateMap.cs b/service/src/InstructorIQ.Core/Data/Mapping/TemplateMap.cs
index cb69dc14..a0c66914 100644
--- a/service/src/InstructorIQ.Core/Data/Mapping/TemplateMap.cs
+++ b/service/src/InstructorIQ.Core/Data/Mapping/TemplateMap.cs
@@ -1,157 +1,157 @@
 using System;
 using System.Collections.Generic;
+
 using Microsoft.EntityFrameworkCore;
 
-namespace InstructorIQ.Core.Data.Mapping
+namespace InstructorIQ.Core.Data.Mapping;
+
+/// <summary>
+/// Allows configuration for an entity type <see cref="InstructorIQ.Core.Data.Entities.Template" />
+/// </summary>
+public partial class TemplateMap
+    : IEntityTypeConfiguration<InstructorIQ.Core.Data.Entities.Template>
 {
     /// <summary>
-    /// Allows configuration for an entity type <see cref="InstructorIQ.Core.Data.Entities.Template" />
+    /// Configures the entity of type <see cref="InstructorIQ.Core.Data.Entities.Template" />
     /// </summary>
-    public partial class TemplateMap
-        : IEntityTypeConfiguration<InstructorIQ.Core.Data.Entities.Template>
+    /// <param name="builder">The builder to be used to configure the entity type.</param>
+    public void Configure(Microsoft.EntityFrameworkCore.Metadata.Builders.EntityTypeBuilder<InstructorIQ.Core.Data.Entities.Template> builder)
     {
-        /// <summary>
-        /// Configures the entity of type <see cref="InstructorIQ.Core.Data.Entities.Template" />
-        /// </summary>
-        /// <param name="builder">The builder to be used to configure the entity type.</param>
-        public void Configure(Microsoft.EntityFrameworkCore.Metadata.Builders.EntityTypeBuilder<InstructorIQ.Core.Data.Entities.Template> builder)
-        {
-            #region Generated Configure
-            // table
-            builder.ToTable("Template", "IQ");
-
-            // key
-            builder.HasKey(t => t.Id);
-
-            // properties
-            builder.Property(t => t.Id)
-                .IsRequired()
-                .HasColumnName("Id")
-                .HasColumnType("uniqueidentifier")
-                .HasDefaultValueSql("(newsequentialid())");
-
-            builder.Property(t => t.Name)
-                .IsRequired()
-                .HasColumnName("Name")
-                .HasColumnType("nvarchar(100)")
-                .HasMaxLength(100);
-
-            builder.Property(t => t.Description)
-                .HasColumnName("Description")
-                .HasColumnType("nvarchar(255)")
-                .HasMaxLength(255);
-
-            builder.Property(t => t.TemplateBody)
-                .HasColumnName("TemplateBody")
-                .HasColumnType("nvarchar(max)");
-
-            builder.Property(t => t.TemplateType)
-                .IsRequired()
-                .HasColumnName("TemplateType")
-                .HasColumnType("nvarchar(100)")
-                .HasMaxLength(100);
-
-            builder.Property(t => t.TenantId)
-                .IsRequired()
-                .HasColumnName("TenantId")
-                .HasColumnType("uniqueidentifier");
-
-            builder.Property(t => t.Created)
-                .IsRequired()
-                .HasColumnName("Created")
-                .HasColumnType("datetimeoffset")
-                .HasDefaultValueSql("(sysutcdatetime())");
-
-            builder.Property(t => t.CreatedBy)
-                .HasColumnName("CreatedBy")
-                .HasColumnType("nvarchar(100)")
-                .HasMaxLength(100);
-
-            builder.Property(t => t.Updated)
-                .IsRequired()
-                .HasColumnName("Updated")
-                .HasColumnType("datetimeoffset")
-                .HasDefaultValueSql("(sysutcdatetime())");
-
-            builder.Property(t => t.UpdatedBy)
-                .HasColumnName("UpdatedBy")
-                .HasColumnType("nvarchar(100)")
-                .HasMaxLength(100);
-
-            builder.Property(t => t.RowVersion)
-                .IsRequired()
-                .IsRowVersion()
-                .HasColumnName("RowVersion")
-                .HasColumnType("rowversion")
-                .HasMaxLength(8)
-                .ValueGeneratedOnAddOrUpdate();
-
-            builder.Property(t => t.PeriodStart)
-                .IsRequired()
-                .HasColumnName("PeriodStart")
-                .HasColumnType("datetime2")
-                .HasDefaultValueSql("(sysutcdatetime())");
-
-            builder.Property(t => t.PeriodEnd)
-                .IsRequired()
-                .HasColumnName("PeriodEnd")
-                .HasColumnType("datetime2")
-                .HasDefaultValueSql("('9999-12-31 23:59:59.9999999')");
-
-            // relationships
-            builder.HasOne(t => t.Tenant)
-                .WithMany(t => t.Templates)
-                .HasForeignKey(d => d.TenantId)
-                .HasConstraintName("FK_Template_Tenant_TenantId");
-
-            #endregion
-
-            builder.Property(t => t.PeriodStart)
-                .ValueGeneratedOnAddOrUpdate();
-
-            builder.Property(t => t.PeriodEnd)
-                .ValueGeneratedOnAddOrUpdate();
-        }
-
-        #region Generated Constants
-        public struct Table
-        {
-            /// <summary>Table Schema name constant for entity <see cref="InstructorIQ.Core.Data.Entities.Template" /></summary>
-            public const string Schema = "IQ";
-            /// <summary>Table Name constant for entity <see cref="InstructorIQ.Core.Data.Entities.Template" /></summary>
-            public const string Name = "Template";
-        }
-
-        public struct Columns
-        {
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Template.Id" /></summary>
-            public const string Id = "Id";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Template.Name" /></summary>
-            public const string Name = "Name";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Template.Description" /></summary>
-            public const string Description = "Description";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Template.TemplateBody" /></summary>
-            public const string TemplateBody = "TemplateBody";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Template.TemplateType" /></summary>
-            public const string TemplateType = "TemplateType";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Template.TenantId" /></summary>
-            public const string TenantId = "TenantId";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Template.Created" /></summary>
-            public const string Created = "Created";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Template.CreatedBy" /></summary>
-            public const string CreatedBy = "CreatedBy";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Template.Updated" /></summary>
-            public const string Updated = "Updated";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Template.UpdatedBy" /></summary>
-            public const string UpdatedBy = "UpdatedBy";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Template.RowVersion" /></summary>
-            public const string RowVersion = "RowVersion";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Template.PeriodStart" /></summary>
-            public const string PeriodStart = "PeriodStart";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Template.PeriodEnd" /></summary>
-            public const string PeriodEnd = "PeriodEnd";
-        }
+        #region Generated Configure
+        // table
+        builder.ToTable("Template", "IQ");
+
+        // key
+        builder.HasKey(t => t.Id);
+
+        // properties
+        builder.Property(t => t.Id)
+            .IsRequired()
+            .HasColumnName("Id")
+            .HasColumnType("uniqueidentifier")
+            .HasDefaultValueSql("(newsequentialid())");
+
+        builder.Property(t => t.Name)
+            .IsRequired()
+            .HasColumnName("Name")
+            .HasColumnType("nvarchar(100)")
+            .HasMaxLength(100);
+
+        builder.Property(t => t.Description)
+            .HasColumnName("Description")
+            .HasColumnType("nvarchar(255)")
+            .HasMaxLength(255);
+
+        builder.Property(t => t.TemplateBody)
+            .HasColumnName("TemplateBody")
+            .HasColumnType("nvarchar(max)");
+
+        builder.Property(t => t.TemplateType)
+            .IsRequired()
+            .HasColumnName("TemplateType")
+            .HasColumnType("nvarchar(100)")
+            .HasMaxLength(100);
+
+        builder.Property(t => t.TenantId)
+            .IsRequired()
+            .HasColumnName("TenantId")
+            .HasColumnType("uniqueidentifier");
+
+        builder.Property(t => t.Created)
+            .IsRequired()
+            .HasColumnName("Created")
+            .HasColumnType("datetimeoffset")
+            .HasDefaultValueSql("(sysutcdatetime())");
+
+        builder.Property(t => t.CreatedBy)
+            .HasColumnName("CreatedBy")
+            .HasColumnType("nvarchar(100)")
+            .HasMaxLength(100);
+
+        builder.Property(t => t.Updated)
+            .IsRequired()
+            .HasColumnName("Updated")
+            .HasColumnType("datetimeoffset")
+            .HasDefaultValueSql("(sysutcdatetime())");
+
+        builder.Property(t => t.UpdatedBy)
+            .HasColumnName("UpdatedBy")
+            .HasColumnType("nvarchar(100)")
+            .HasMaxLength(100);
+
+        builder.Property(t => t.RowVersion)
+            .IsRequired()
+            .IsRowVersion()
+            .HasColumnName("RowVersion")
+            .HasColumnType("rowversion")
+            .HasMaxLength(8)
+            .ValueGeneratedOnAddOrUpdate();
+
+        builder.Property(t => t.PeriodStart)
+            .IsRequired()
+            .HasColumnName("PeriodStart")
+            .HasColumnType("datetime2")
+            .HasDefaultValueSql("(sysutcdatetime())");
+
+        builder.Property(t => t.PeriodEnd)
+            .IsRequired()
+            .HasColumnName("PeriodEnd")
+            .HasColumnType("datetime2")
+            .HasDefaultValueSql("('9999-12-31 23:59:59.9999999')");
+
+        // relationships
+        builder.HasOne(t => t.Tenant)
+            .WithMany(t => t.Templates)
+            .HasForeignKey(d => d.TenantId)
+            .HasConstraintName("FK_Template_Tenant_TenantId");
+
         #endregion
 
+        builder.Property(t => t.PeriodStart)
+            .ValueGeneratedOnAddOrUpdate();
+
+        builder.Property(t => t.PeriodEnd)
+            .ValueGeneratedOnAddOrUpdate();
     }
+
+    #region Generated Constants
+    public struct Table
+    {
+        /// <summary>Table Schema name constant for entity <see cref="InstructorIQ.Core.Data.Entities.Template" /></summary>
+        public const string Schema = "IQ";
+        /// <summary>Table Name constant for entity <see cref="InstructorIQ.Core.Data.Entities.Template" /></summary>
+        public const string Name = "Template";
+    }
+
+    public struct Columns
+    {
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Template.Id" /></summary>
+        public const string Id = "Id";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Template.Name" /></summary>
+        public const string Name = "Name";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Template.Description" /></summary>
+        public const string Description = "Description";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Template.TemplateBody" /></summary>
+        public const string TemplateBody = "TemplateBody";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Template.TemplateType" /></summary>
+        public const string TemplateType = "TemplateType";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Template.TenantId" /></summary>
+        public const string TenantId = "TenantId";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Template.Created" /></summary>
+        public const string Created = "Created";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Template.CreatedBy" /></summary>
+        public const string CreatedBy = "CreatedBy";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Template.Updated" /></summary>
+        public const string Updated = "Updated";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Template.UpdatedBy" /></summary>
+        public const string UpdatedBy = "UpdatedBy";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Template.RowVersion" /></summary>
+        public const string RowVersion = "RowVersion";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Template.PeriodStart" /></summary>
+        public const string PeriodStart = "PeriodStart";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Template.PeriodEnd" /></summary>
+        public const string PeriodEnd = "PeriodEnd";
+    }
+    #endregion
+
 }
diff --git a/service/src/InstructorIQ.Core/Data/Mapping/TenantMap.cs b/service/src/InstructorIQ.Core/Data/Mapping/TenantMap.cs
index 470bb2bc..3bda46dd 100644
--- a/service/src/InstructorIQ.Core/Data/Mapping/TenantMap.cs
+++ b/service/src/InstructorIQ.Core/Data/Mapping/TenantMap.cs
@@ -1,175 +1,175 @@
 using System;
 using System.Collections.Generic;
+
 using Microsoft.EntityFrameworkCore;
 
-namespace InstructorIQ.Core.Data.Mapping
+namespace InstructorIQ.Core.Data.Mapping;
+
+/// <summary>
+/// Allows configuration for an entity type <see cref="InstructorIQ.Core.Data.Entities.Tenant" />
+/// </summary>
+public partial class TenantMap
+    : IEntityTypeConfiguration<InstructorIQ.Core.Data.Entities.Tenant>
 {
     /// <summary>
-    /// Allows configuration for an entity type <see cref="InstructorIQ.Core.Data.Entities.Tenant" />
+    /// Configures the entity of type <see cref="InstructorIQ.Core.Data.Entities.Tenant" />
     /// </summary>
-    public partial class TenantMap
-        : IEntityTypeConfiguration<InstructorIQ.Core.Data.Entities.Tenant>
+    /// <param name="builder">The builder to be used to configure the entity type.</param>
+    public void Configure(Microsoft.EntityFrameworkCore.Metadata.Builders.EntityTypeBuilder<InstructorIQ.Core.Data.Entities.Tenant> builder)
     {
-        /// <summary>
-        /// Configures the entity of type <see cref="InstructorIQ.Core.Data.Entities.Tenant" />
-        /// </summary>
-        /// <param name="builder">The builder to be used to configure the entity type.</param>
-        public void Configure(Microsoft.EntityFrameworkCore.Metadata.Builders.EntityTypeBuilder<InstructorIQ.Core.Data.Entities.Tenant> builder)
-        {
-            #region Generated Configure
-            // table
-            builder.ToTable("Tenant", "IQ");
-
-            // key
-            builder.HasKey(t => t.Id);
-
-            // properties
-            builder.Property(t => t.Id)
-                .IsRequired()
-                .HasColumnName("Id")
-                .HasColumnType("uniqueidentifier")
-                .HasDefaultValueSql("(newsequentialid())");
-
-            builder.Property(t => t.Name)
-                .IsRequired()
-                .HasColumnName("Name")
-                .HasColumnType("nvarchar(256)")
-                .HasMaxLength(256);
-
-            builder.Property(t => t.Slug)
-                .IsRequired()
-                .HasColumnName("Slug")
-                .HasColumnType("nvarchar(50)")
-                .HasMaxLength(50);
-
-            builder.Property(t => t.Description)
-                .HasColumnName("Description")
-                .HasColumnType("nvarchar(max)");
-
-            builder.Property(t => t.City)
-                .HasColumnName("City")
-                .HasColumnType("nvarchar(150)")
-                .HasMaxLength(150);
-
-            builder.Property(t => t.StateProvince)
-                .HasColumnName("StateProvince")
-                .HasColumnType("nvarchar(150)")
-                .HasMaxLength(150);
-
-            builder.Property(t => t.TimeZone)
-                .IsRequired()
-                .HasColumnName("TimeZone")
-                .HasColumnType("nvarchar(150)")
-                .HasMaxLength(150)
-                .HasDefaultValueSql("('Central Standard Time')");
-
-            builder.Property(t => t.DomainName)
-                .HasColumnName("DomainName")
-                .HasColumnType("nvarchar(150)")
-                .HasMaxLength(150);
-
-            builder.Property(t => t.IsDeleted)
-                .IsRequired()
-                .HasColumnName("IsDeleted")
-                .HasColumnType("bit");
-
-            builder.Property(t => t.Created)
-                .IsRequired()
-                .HasColumnName("Created")
-                .HasColumnType("datetimeoffset")
-                .HasDefaultValueSql("(sysutcdatetime())");
-
-            builder.Property(t => t.CreatedBy)
-                .HasColumnName("CreatedBy")
-                .HasColumnType("nvarchar(100)")
-                .HasMaxLength(100);
-
-            builder.Property(t => t.Updated)
-                .IsRequired()
-                .HasColumnName("Updated")
-                .HasColumnType("datetimeoffset")
-                .HasDefaultValueSql("(sysutcdatetime())");
-
-            builder.Property(t => t.UpdatedBy)
-                .HasColumnName("UpdatedBy")
-                .HasColumnType("nvarchar(100)")
-                .HasMaxLength(100);
-
-            builder.Property(t => t.RowVersion)
-                .IsRequired()
-                .IsRowVersion()
-                .HasColumnName("RowVersion")
-                .HasColumnType("rowversion")
-                .HasMaxLength(8)
-                .ValueGeneratedOnAddOrUpdate();
-
-            builder.Property(t => t.PeriodStart)
-                .IsRequired()
-                .HasColumnName("PeriodStart")
-                .HasColumnType("datetime2")
-                .HasDefaultValueSql("(sysutcdatetime())");
-
-            builder.Property(t => t.PeriodEnd)
-                .IsRequired()
-                .HasColumnName("PeriodEnd")
-                .HasColumnType("datetime2")
-                .HasDefaultValueSql("('9999-12-31 23:59:59.9999999')");
-
-            // relationships
-            #endregion
-
-            builder.Property(t => t.PeriodStart)
-                .ValueGeneratedOnAddOrUpdate();
-
-            builder.Property(t => t.PeriodEnd)
-                .ValueGeneratedOnAddOrUpdate();
-        }
-
-        #region Generated Constants
-        public struct Table
-        {
-            /// <summary>Table Schema name constant for entity <see cref="InstructorIQ.Core.Data.Entities.Tenant" /></summary>
-            public const string Schema = "IQ";
-            /// <summary>Table Name constant for entity <see cref="InstructorIQ.Core.Data.Entities.Tenant" /></summary>
-            public const string Name = "Tenant";
-        }
-
-        public struct Columns
-        {
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Tenant.Id" /></summary>
-            public const string Id = "Id";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Tenant.Name" /></summary>
-            public const string Name = "Name";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Tenant.Slug" /></summary>
-            public const string Slug = "Slug";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Tenant.Description" /></summary>
-            public const string Description = "Description";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Tenant.City" /></summary>
-            public const string City = "City";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Tenant.StateProvince" /></summary>
-            public const string StateProvince = "StateProvince";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Tenant.TimeZone" /></summary>
-            public const string TimeZone = "TimeZone";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Tenant.DomainName" /></summary>
-            public const string DomainName = "DomainName";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Tenant.IsDeleted" /></summary>
-            public const string IsDeleted = "IsDeleted";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Tenant.Created" /></summary>
-            public const string Created = "Created";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Tenant.CreatedBy" /></summary>
-            public const string CreatedBy = "CreatedBy";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Tenant.Updated" /></summary>
-            public const string Updated = "Updated";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Tenant.UpdatedBy" /></summary>
-            public const string UpdatedBy = "UpdatedBy";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Tenant.RowVersion" /></summary>
-            public const string RowVersion = "RowVersion";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Tenant.PeriodStart" /></summary>
-            public const string PeriodStart = "PeriodStart";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Tenant.PeriodEnd" /></summary>
-            public const string PeriodEnd = "PeriodEnd";
-        }
+        #region Generated Configure
+        // table
+        builder.ToTable("Tenant", "IQ");
+
+        // key
+        builder.HasKey(t => t.Id);
+
+        // properties
+        builder.Property(t => t.Id)
+            .IsRequired()
+            .HasColumnName("Id")
+            .HasColumnType("uniqueidentifier")
+            .HasDefaultValueSql("(newsequentialid())");
+
+        builder.Property(t => t.Name)
+            .IsRequired()
+            .HasColumnName("Name")
+            .HasColumnType("nvarchar(256)")
+            .HasMaxLength(256);
+
+        builder.Property(t => t.Slug)
+            .IsRequired()
+            .HasColumnName("Slug")
+            .HasColumnType("nvarchar(50)")
+            .HasMaxLength(50);
+
+        builder.Property(t => t.Description)
+            .HasColumnName("Description")
+            .HasColumnType("nvarchar(max)");
+
+        builder.Property(t => t.City)
+            .HasColumnName("City")
+            .HasColumnType("nvarchar(150)")
+            .HasMaxLength(150);
+
+        builder.Property(t => t.StateProvince)
+            .HasColumnName("StateProvince")
+            .HasColumnType("nvarchar(150)")
+            .HasMaxLength(150);
+
+        builder.Property(t => t.TimeZone)
+            .IsRequired()
+            .HasColumnName("TimeZone")
+            .HasColumnType("nvarchar(150)")
+            .HasMaxLength(150)
+            .HasDefaultValueSql("('Central Standard Time')");
+
+        builder.Property(t => t.DomainName)
+            .HasColumnName("DomainName")
+            .HasColumnType("nvarchar(150)")
+            .HasMaxLength(150);
+
+        builder.Property(t => t.IsDeleted)
+            .IsRequired()
+            .HasColumnName("IsDeleted")
+            .HasColumnType("bit");
+
+        builder.Property(t => t.Created)
+            .IsRequired()
+            .HasColumnName("Created")
+            .HasColumnType("datetimeoffset")
+            .HasDefaultValueSql("(sysutcdatetime())");
+
+        builder.Property(t => t.CreatedBy)
+            .HasColumnName("CreatedBy")
+            .HasColumnType("nvarchar(100)")
+            .HasMaxLength(100);
+
+        builder.Property(t => t.Updated)
+            .IsRequired()
+            .HasColumnName("Updated")
+            .HasColumnType("datetimeoffset")
+            .HasDefaultValueSql("(sysutcdatetime())");
+
+        builder.Property(t => t.UpdatedBy)
+            .HasColumnName("UpdatedBy")
+            .HasColumnType("nvarchar(100)")
+            .HasMaxLength(100);
+
+        builder.Property(t => t.RowVersion)
+            .IsRequired()
+            .IsRowVersion()
+            .HasColumnName("RowVersion")
+            .HasColumnType("rowversion")
+            .HasMaxLength(8)
+            .ValueGeneratedOnAddOrUpdate();
+
+        builder.Property(t => t.PeriodStart)
+            .IsRequired()
+            .HasColumnName("PeriodStart")
+            .HasColumnType("datetime2")
+            .HasDefaultValueSql("(sysutcdatetime())");
+
+        builder.Property(t => t.PeriodEnd)
+            .IsRequired()
+            .HasColumnName("PeriodEnd")
+            .HasColumnType("datetime2")
+            .HasDefaultValueSql("('9999-12-31 23:59:59.9999999')");
+
+        // relationships
         #endregion
 
+        builder.Property(t => t.PeriodStart)
+            .ValueGeneratedOnAddOrUpdate();
+
+        builder.Property(t => t.PeriodEnd)
+            .ValueGeneratedOnAddOrUpdate();
+    }
+
+    #region Generated Constants
+    public struct Table
+    {
+        /// <summary>Table Schema name constant for entity <see cref="InstructorIQ.Core.Data.Entities.Tenant" /></summary>
+        public const string Schema = "IQ";
+        /// <summary>Table Name constant for entity <see cref="InstructorIQ.Core.Data.Entities.Tenant" /></summary>
+        public const string Name = "Tenant";
     }
+
+    public struct Columns
+    {
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Tenant.Id" /></summary>
+        public const string Id = "Id";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Tenant.Name" /></summary>
+        public const string Name = "Name";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Tenant.Slug" /></summary>
+        public const string Slug = "Slug";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Tenant.Description" /></summary>
+        public const string Description = "Description";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Tenant.City" /></summary>
+        public const string City = "City";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Tenant.StateProvince" /></summary>
+        public const string StateProvince = "StateProvince";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Tenant.TimeZone" /></summary>
+        public const string TimeZone = "TimeZone";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Tenant.DomainName" /></summary>
+        public const string DomainName = "DomainName";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Tenant.IsDeleted" /></summary>
+        public const string IsDeleted = "IsDeleted";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Tenant.Created" /></summary>
+        public const string Created = "Created";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Tenant.CreatedBy" /></summary>
+        public const string CreatedBy = "CreatedBy";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Tenant.Updated" /></summary>
+        public const string Updated = "Updated";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Tenant.UpdatedBy" /></summary>
+        public const string UpdatedBy = "UpdatedBy";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Tenant.RowVersion" /></summary>
+        public const string RowVersion = "RowVersion";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Tenant.PeriodStart" /></summary>
+        public const string PeriodStart = "PeriodStart";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Tenant.PeriodEnd" /></summary>
+        public const string PeriodEnd = "PeriodEnd";
+    }
+    #endregion
+
 }
diff --git a/service/src/InstructorIQ.Core/Data/Mapping/TenantUserRoleMap.cs b/service/src/InstructorIQ.Core/Data/Mapping/TenantUserRoleMap.cs
index 865ea818..ab9ab391 100644
--- a/service/src/InstructorIQ.Core/Data/Mapping/TenantUserRoleMap.cs
+++ b/service/src/InstructorIQ.Core/Data/Mapping/TenantUserRoleMap.cs
@@ -1,91 +1,91 @@
 using System;
 using System.Collections.Generic;
+
 using Microsoft.EntityFrameworkCore;
 
-namespace InstructorIQ.Core.Data.Mapping
+namespace InstructorIQ.Core.Data.Mapping;
+
+/// <summary>
+/// Allows configuration for an entity type <see cref="InstructorIQ.Core.Data.Entities.TenantUserRole" />
+/// </summary>
+public partial class TenantUserRoleMap
+    : IEntityTypeConfiguration<InstructorIQ.Core.Data.Entities.TenantUserRole>
 {
     /// <summary>
-    /// Allows configuration for an entity type <see cref="InstructorIQ.Core.Data.Entities.TenantUserRole" />
+    /// Configures the entity of type <see cref="InstructorIQ.Core.Data.Entities.TenantUserRole" />
     /// </summary>
-    public partial class TenantUserRoleMap
-        : IEntityTypeConfiguration<InstructorIQ.Core.Data.Entities.TenantUserRole>
+    /// <param name="builder">The builder to be used to configure the entity type.</param>
+    public void Configure(Microsoft.EntityFrameworkCore.Metadata.Builders.EntityTypeBuilder<InstructorIQ.Core.Data.Entities.TenantUserRole> builder)
     {
-        /// <summary>
-        /// Configures the entity of type <see cref="InstructorIQ.Core.Data.Entities.TenantUserRole" />
-        /// </summary>
-        /// <param name="builder">The builder to be used to configure the entity type.</param>
-        public void Configure(Microsoft.EntityFrameworkCore.Metadata.Builders.EntityTypeBuilder<InstructorIQ.Core.Data.Entities.TenantUserRole> builder)
-        {
-            #region Generated Configure
-            // table
-            builder.ToTable("TenantUserRole", "IQ");
-
-            // key
-            builder.HasKey(t => t.Id);
-
-            // properties
-            builder.Property(t => t.Id)
-                .IsRequired()
-                .HasColumnName("Id")
-                .HasColumnType("uniqueidentifier")
-                .HasDefaultValueSql("(newsequentialid())");
-
-            builder.Property(t => t.TenantId)
-                .IsRequired()
-                .HasColumnName("TenantId")
-                .HasColumnType("uniqueidentifier");
-
-            builder.Property(t => t.UserId)
-                .IsRequired()
-                .HasColumnName("UserId")
-                .HasColumnType("uniqueidentifier");
-
-            builder.Property(t => t.RoleId)
-                .IsRequired()
-                .HasColumnName("RoleId")
-                .HasColumnType("uniqueidentifier");
-
-            // relationships
-            builder.HasOne(t => t.Tenant)
-                .WithMany(t => t.TenantUserRoles)
-                .HasForeignKey(d => d.TenantId)
-                .HasConstraintName("FK_TenantUserRole_Tenant_TenantId");
-
-            #endregion
-
-            builder.HasOne(t => t.Role)
-                .WithMany(t => t.TenantUserRoles)
-                .HasForeignKey(d => d.RoleId)
-                .HasConstraintName("FK_TenantUserRole_Role_RoleId");
-
-            builder.HasOne(t => t.User)
-                .WithMany(t => t.TenantUserRoles)
-                .HasForeignKey(d => d.UserId)
-                .HasConstraintName("FK_TenantUserRole_User_UserId");
-        }
-
-        #region Generated Constants
-        public struct Table
-        {
-            /// <summary>Table Schema name constant for entity <see cref="InstructorIQ.Core.Data.Entities.TenantUserRole" /></summary>
-            public const string Schema = "IQ";
-            /// <summary>Table Name constant for entity <see cref="InstructorIQ.Core.Data.Entities.TenantUserRole" /></summary>
-            public const string Name = "TenantUserRole";
-        }
-
-        public struct Columns
-        {
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.TenantUserRole.Id" /></summary>
-            public const string Id = "Id";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.TenantUserRole.TenantId" /></summary>
-            public const string TenantId = "TenantId";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.TenantUserRole.UserId" /></summary>
-            public const string UserId = "UserId";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.TenantUserRole.RoleId" /></summary>
-            public const string RoleId = "RoleId";
-        }
+        #region Generated Configure
+        // table
+        builder.ToTable("TenantUserRole", "IQ");
+
+        // key
+        builder.HasKey(t => t.Id);
+
+        // properties
+        builder.Property(t => t.Id)
+            .IsRequired()
+            .HasColumnName("Id")
+            .HasColumnType("uniqueidentifier")
+            .HasDefaultValueSql("(newsequentialid())");
+
+        builder.Property(t => t.TenantId)
+            .IsRequired()
+            .HasColumnName("TenantId")
+            .HasColumnType("uniqueidentifier");
+
+        builder.Property(t => t.UserId)
+            .IsRequired()
+            .HasColumnName("UserId")
+            .HasColumnType("uniqueidentifier");
+
+        builder.Property(t => t.RoleId)
+            .IsRequired()
+            .HasColumnName("RoleId")
+            .HasColumnType("uniqueidentifier");
+
+        // relationships
+        builder.HasOne(t => t.Tenant)
+            .WithMany(t => t.TenantUserRoles)
+            .HasForeignKey(d => d.TenantId)
+            .HasConstraintName("FK_TenantUserRole_Tenant_TenantId");
+
         #endregion
 
+        builder.HasOne(t => t.Role)
+            .WithMany(t => t.TenantUserRoles)
+            .HasForeignKey(d => d.RoleId)
+            .HasConstraintName("FK_TenantUserRole_Role_RoleId");
 
+        builder.HasOne(t => t.User)
+            .WithMany(t => t.TenantUserRoles)
+            .HasForeignKey(d => d.UserId)
+            .HasConstraintName("FK_TenantUserRole_User_UserId");
     }
+
+    #region Generated Constants
+    public struct Table
+    {
+        /// <summary>Table Schema name constant for entity <see cref="InstructorIQ.Core.Data.Entities.TenantUserRole" /></summary>
+        public const string Schema = "IQ";
+        /// <summary>Table Name constant for entity <see cref="InstructorIQ.Core.Data.Entities.TenantUserRole" /></summary>
+        public const string Name = "TenantUserRole";
+    }
+
+    public struct Columns
+    {
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.TenantUserRole.Id" /></summary>
+        public const string Id = "Id";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.TenantUserRole.TenantId" /></summary>
+        public const string TenantId = "TenantId";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.TenantUserRole.UserId" /></summary>
+        public const string UserId = "UserId";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.TenantUserRole.RoleId" /></summary>
+        public const string RoleId = "RoleId";
+    }
+    #endregion
+
+
 }
diff --git a/service/src/InstructorIQ.Core/Data/Mapping/TopicInstructorMap.cs b/service/src/InstructorIQ.Core/Data/Mapping/TopicInstructorMap.cs
index 4a10e173..524278f2 100644
--- a/service/src/InstructorIQ.Core/Data/Mapping/TopicInstructorMap.cs
+++ b/service/src/InstructorIQ.Core/Data/Mapping/TopicInstructorMap.cs
@@ -1,145 +1,145 @@
 using System;
 using System.Collections.Generic;
+
 using Microsoft.EntityFrameworkCore;
 
-namespace InstructorIQ.Core.Data.Mapping
+namespace InstructorIQ.Core.Data.Mapping;
+
+/// <summary>
+/// Allows configuration for an entity type <see cref="InstructorIQ.Core.Data.Entities.TopicInstructor" />
+/// </summary>
+public partial class TopicInstructorMap
+    : IEntityTypeConfiguration<InstructorIQ.Core.Data.Entities.TopicInstructor>
 {
     /// <summary>
-    /// Allows configuration for an entity type <see cref="InstructorIQ.Core.Data.Entities.TopicInstructor" />
+    /// Configures the entity of type <see cref="InstructorIQ.Core.Data.Entities.TopicInstructor" />
     /// </summary>
-    public partial class TopicInstructorMap
-        : IEntityTypeConfiguration<InstructorIQ.Core.Data.Entities.TopicInstructor>
+    /// <param name="builder">The builder to be used to configure the entity type.</param>
+    public void Configure(Microsoft.EntityFrameworkCore.Metadata.Builders.EntityTypeBuilder<InstructorIQ.Core.Data.Entities.TopicInstructor> builder)
     {
-        /// <summary>
-        /// Configures the entity of type <see cref="InstructorIQ.Core.Data.Entities.TopicInstructor" />
-        /// </summary>
-        /// <param name="builder">The builder to be used to configure the entity type.</param>
-        public void Configure(Microsoft.EntityFrameworkCore.Metadata.Builders.EntityTypeBuilder<InstructorIQ.Core.Data.Entities.TopicInstructor> builder)
-        {
-            #region Generated Configure
-            // table
-            builder.ToTable("TopicInstructor", "IQ");
-
-            // key
-            builder.HasKey(t => t.Id);
-
-            // properties
-            builder.Property(t => t.Id)
-                .IsRequired()
-                .HasColumnName("Id")
-                .HasColumnType("uniqueidentifier")
-                .HasDefaultValueSql("(newsequentialid())");
-
-            builder.Property(t => t.TopicId)
-                .IsRequired()
-                .HasColumnName("TopicId")
-                .HasColumnType("uniqueidentifier");
-
-            builder.Property(t => t.InstructorId)
-                .IsRequired()
-                .HasColumnName("InstructorId")
-                .HasColumnType("uniqueidentifier");
-
-            builder.Property(t => t.InstructorRoleId)
-                .HasColumnName("InstructorRoleId")
-                .HasColumnType("uniqueidentifier");
-
-            builder.Property(t => t.Created)
-                .IsRequired()
-                .HasColumnName("Created")
-                .HasColumnType("datetimeoffset")
-                .HasDefaultValueSql("(sysutcdatetime())");
-
-            builder.Property(t => t.CreatedBy)
-                .HasColumnName("CreatedBy")
-                .HasColumnType("nvarchar(100)")
-                .HasMaxLength(100);
-
-            builder.Property(t => t.Updated)
-                .IsRequired()
-                .HasColumnName("Updated")
-                .HasColumnType("datetimeoffset")
-                .HasDefaultValueSql("(sysutcdatetime())");
-
-            builder.Property(t => t.UpdatedBy)
-                .HasColumnName("UpdatedBy")
-                .HasColumnType("nvarchar(100)")
-                .HasMaxLength(100);
-
-            builder.Property(t => t.RowVersion)
-                .IsRequired()
-                .IsRowVersion()
-                .HasColumnName("RowVersion")
-                .HasColumnType("rowversion")
-                .HasMaxLength(8)
-                .ValueGeneratedOnAddOrUpdate();
-
-            builder.Property(t => t.PeriodStart)
-                .IsRequired()
-                .HasColumnName("PeriodStart")
-                .HasColumnType("datetime2")
-                .HasDefaultValueSql("(sysutcdatetime())");
-
-            builder.Property(t => t.PeriodEnd)
-                .IsRequired()
-                .HasColumnName("PeriodEnd")
-                .HasColumnType("datetime2")
-                .HasDefaultValueSql("('9999-12-31 23:59:59.9999999')");
-
-            // relationships
-            builder.HasOne(t => t.InstructorRole)
-                .WithMany(t => t.TopicInstructors)
-                .HasForeignKey(d => d.InstructorRoleId)
-                .HasConstraintName("FK_TopicInstructor_InstructorRole_InstructorRoleId");
-
-            builder.HasOne(t => t.Topic)
-                .WithMany(t => t.TopicInstructors)
-                .HasForeignKey(d => d.TopicId)
-                .HasConstraintName("FK_TopicInstructor_Topic_TopicId");
-
-            #endregion
-
-            builder.HasOne(t => t.Instructor)
-                .WithMany(t => t.TopicInstructors)
-                .HasForeignKey(d => d.InstructorId)
-                .HasConstraintName("FK_SessionInstructor_Instructor_InstructorId");
-
-        }
-
-        #region Generated Constants
-        public struct Table
-        {
-            /// <summary>Table Schema name constant for entity <see cref="InstructorIQ.Core.Data.Entities.TopicInstructor" /></summary>
-            public const string Schema = "IQ";
-            /// <summary>Table Name constant for entity <see cref="InstructorIQ.Core.Data.Entities.TopicInstructor" /></summary>
-            public const string Name = "TopicInstructor";
-        }
-
-        public struct Columns
-        {
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.TopicInstructor.Id" /></summary>
-            public const string Id = "Id";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.TopicInstructor.TopicId" /></summary>
-            public const string TopicId = "TopicId";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.TopicInstructor.InstructorId" /></summary>
-            public const string InstructorId = "InstructorId";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.TopicInstructor.InstructorRoleId" /></summary>
-            public const string InstructorRoleId = "InstructorRoleId";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.TopicInstructor.Created" /></summary>
-            public const string Created = "Created";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.TopicInstructor.CreatedBy" /></summary>
-            public const string CreatedBy = "CreatedBy";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.TopicInstructor.Updated" /></summary>
-            public const string Updated = "Updated";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.TopicInstructor.UpdatedBy" /></summary>
-            public const string UpdatedBy = "UpdatedBy";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.TopicInstructor.RowVersion" /></summary>
-            public const string RowVersion = "RowVersion";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.TopicInstructor.PeriodStart" /></summary>
-            public const string PeriodStart = "PeriodStart";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.TopicInstructor.PeriodEnd" /></summary>
-            public const string PeriodEnd = "PeriodEnd";
-        }
+        #region Generated Configure
+        // table
+        builder.ToTable("TopicInstructor", "IQ");
+
+        // key
+        builder.HasKey(t => t.Id);
+
+        // properties
+        builder.Property(t => t.Id)
+            .IsRequired()
+            .HasColumnName("Id")
+            .HasColumnType("uniqueidentifier")
+            .HasDefaultValueSql("(newsequentialid())");
+
+        builder.Property(t => t.TopicId)
+            .IsRequired()
+            .HasColumnName("TopicId")
+            .HasColumnType("uniqueidentifier");
+
+        builder.Property(t => t.InstructorId)
+            .IsRequired()
+            .HasColumnName("InstructorId")
+            .HasColumnType("uniqueidentifier");
+
+        builder.Property(t => t.InstructorRoleId)
+            .HasColumnName("InstructorRoleId")
+            .HasColumnType("uniqueidentifier");
+
+        builder.Property(t => t.Created)
+            .IsRequired()
+            .HasColumnName("Created")
+            .HasColumnType("datetimeoffset")
+            .HasDefaultValueSql("(sysutcdatetime())");
+
+        builder.Property(t => t.CreatedBy)
+            .HasColumnName("CreatedBy")
+            .HasColumnType("nvarchar(100)")
+            .HasMaxLength(100);
+
+        builder.Property(t => t.Updated)
+            .IsRequired()
+            .HasColumnName("Updated")
+            .HasColumnType("datetimeoffset")
+            .HasDefaultValueSql("(sysutcdatetime())");
+
+        builder.Property(t => t.UpdatedBy)
+            .HasColumnName("UpdatedBy")
+            .HasColumnType("nvarchar(100)")
+            .HasMaxLength(100);
+
+        builder.Property(t => t.RowVersion)
+            .IsRequired()
+            .IsRowVersion()
+            .HasColumnName("RowVersion")
+            .HasColumnType("rowversion")
+            .HasMaxLength(8)
+            .ValueGeneratedOnAddOrUpdate();
+
+        builder.Property(t => t.PeriodStart)
+            .IsRequired()
+            .HasColumnName("PeriodStart")
+            .HasColumnType("datetime2")
+            .HasDefaultValueSql("(sysutcdatetime())");
+
+        builder.Property(t => t.PeriodEnd)
+            .IsRequired()
+            .HasColumnName("PeriodEnd")
+            .HasColumnType("datetime2")
+            .HasDefaultValueSql("('9999-12-31 23:59:59.9999999')");
+
+        // relationships
+        builder.HasOne(t => t.InstructorRole)
+            .WithMany(t => t.TopicInstructors)
+            .HasForeignKey(d => d.InstructorRoleId)
+            .HasConstraintName("FK_TopicInstructor_InstructorRole_InstructorRoleId");
+
+        builder.HasOne(t => t.Topic)
+            .WithMany(t => t.TopicInstructors)
+            .HasForeignKey(d => d.TopicId)
+            .HasConstraintName("FK_TopicInstructor_Topic_TopicId");
+
         #endregion
+
+        builder.HasOne(t => t.Instructor)
+            .WithMany(t => t.TopicInstructors)
+            .HasForeignKey(d => d.InstructorId)
+            .HasConstraintName("FK_SessionInstructor_Instructor_InstructorId");
+
+    }
+
+    #region Generated Constants
+    public struct Table
+    {
+        /// <summary>Table Schema name constant for entity <see cref="InstructorIQ.Core.Data.Entities.TopicInstructor" /></summary>
+        public const string Schema = "IQ";
+        /// <summary>Table Name constant for entity <see cref="InstructorIQ.Core.Data.Entities.TopicInstructor" /></summary>
+        public const string Name = "TopicInstructor";
+    }
+
+    public struct Columns
+    {
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.TopicInstructor.Id" /></summary>
+        public const string Id = "Id";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.TopicInstructor.TopicId" /></summary>
+        public const string TopicId = "TopicId";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.TopicInstructor.InstructorId" /></summary>
+        public const string InstructorId = "InstructorId";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.TopicInstructor.InstructorRoleId" /></summary>
+        public const string InstructorRoleId = "InstructorRoleId";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.TopicInstructor.Created" /></summary>
+        public const string Created = "Created";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.TopicInstructor.CreatedBy" /></summary>
+        public const string CreatedBy = "CreatedBy";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.TopicInstructor.Updated" /></summary>
+        public const string Updated = "Updated";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.TopicInstructor.UpdatedBy" /></summary>
+        public const string UpdatedBy = "UpdatedBy";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.TopicInstructor.RowVersion" /></summary>
+        public const string RowVersion = "RowVersion";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.TopicInstructor.PeriodStart" /></summary>
+        public const string PeriodStart = "PeriodStart";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.TopicInstructor.PeriodEnd" /></summary>
+        public const string PeriodEnd = "PeriodEnd";
     }
+    #endregion
 }
diff --git a/service/src/InstructorIQ.Core/Data/Mapping/TopicMap.cs b/service/src/InstructorIQ.Core/Data/Mapping/TopicMap.cs
index 9085b995..b3865d67 100644
--- a/service/src/InstructorIQ.Core/Data/Mapping/TopicMap.cs
+++ b/service/src/InstructorIQ.Core/Data/Mapping/TopicMap.cs
@@ -1,206 +1,206 @@
 using System;
 using System.Collections.Generic;
+
 using Microsoft.EntityFrameworkCore;
 
-namespace InstructorIQ.Core.Data.Mapping
+namespace InstructorIQ.Core.Data.Mapping;
+
+/// <summary>
+/// Allows configuration for an entity type <see cref="InstructorIQ.Core.Data.Entities.Topic" />
+/// </summary>
+public class TopicMap
+    : IEntityTypeConfiguration<InstructorIQ.Core.Data.Entities.Topic>
 {
     /// <summary>
-    /// Allows configuration for an entity type <see cref="InstructorIQ.Core.Data.Entities.Topic" />
+    /// Configures the entity of type <see cref="InstructorIQ.Core.Data.Entities.Topic" />
     /// </summary>
-    public class TopicMap
-        : IEntityTypeConfiguration<InstructorIQ.Core.Data.Entities.Topic>
+    /// <param name="builder">The builder to be used to configure the entity type.</param>
+    public void Configure(Microsoft.EntityFrameworkCore.Metadata.Builders.EntityTypeBuilder<InstructorIQ.Core.Data.Entities.Topic> builder)
     {
-        /// <summary>
-        /// Configures the entity of type <see cref="InstructorIQ.Core.Data.Entities.Topic" />
-        /// </summary>
-        /// <param name="builder">The builder to be used to configure the entity type.</param>
-        public void Configure(Microsoft.EntityFrameworkCore.Metadata.Builders.EntityTypeBuilder<InstructorIQ.Core.Data.Entities.Topic> builder)
-        {
-            #region Generated Configure
-            // table
-            builder.ToTable("Topic", "IQ");
-
-            // key
-            builder.HasKey(t => t.Id);
-
-            // properties
-            builder.Property(t => t.Id)
-                .IsRequired()
-                .HasColumnName("Id")
-                .HasColumnType("uniqueidentifier")
-                .HasDefaultValueSql("(newsequentialid())");
-
-            builder.Property(t => t.Title)
-                .IsRequired()
-                .HasColumnName("Title")
-                .HasColumnType("nvarchar(256)")
-                .HasMaxLength(256);
-
-            builder.Property(t => t.Summary)
-                .HasColumnName("Summary")
-                .HasColumnType("nvarchar(256)")
-                .HasMaxLength(256);
-
-            builder.Property(t => t.Description)
-                .HasColumnName("Description")
-                .HasColumnType("nvarchar(max)");
-
-            builder.Property(t => t.TenantId)
-                .IsRequired()
-                .HasColumnName("TenantId")
-                .HasColumnType("uniqueidentifier");
-
-            builder.Property(t => t.LeadInstructorId)
-                .HasColumnName("LeadInstructorId")
-                .HasColumnType("uniqueidentifier");
-
-            builder.Property(t => t.LessonPlan)
-                .HasColumnName("LessonPlan")
-                .HasColumnType("nvarchar(max)");
-
-            builder.Property(t => t.Notes)
-                .HasColumnName("Notes")
-                .HasColumnType("nvarchar(max)");
-
-            builder.Property(t => t.IsRequired)
-                .IsRequired()
-                .HasColumnName("IsRequired")
-                .HasColumnType("bit");
-
-            builder.Property(t => t.IsPublished)
-                .IsRequired()
-                .HasColumnName("IsPublished")
-                .HasColumnType("bit");
-
-            builder.Property(t => t.InstructorSlots)
-                .HasColumnName("InstructorSlots")
-                .HasColumnType("int");
-
-            builder.Property(t => t.CalendarYear)
-                .IsRequired()
-                .HasColumnName("CalendarYear")
-                .HasColumnType("smallint")
-                .HasDefaultValueSql("(datepart(year,getdate()))");
-
-            builder.Property(t => t.TargetMonth)
-                .HasColumnName("TargetMonth")
-                .HasColumnType("smallint");
-
-            builder.Property(t => t.Created)
-                .IsRequired()
-                .HasColumnName("Created")
-                .HasColumnType("datetimeoffset")
-                .HasDefaultValueSql("(sysutcdatetime())");
-
-            builder.Property(t => t.CreatedBy)
-                .HasColumnName("CreatedBy")
-                .HasColumnType("nvarchar(100)")
-                .HasMaxLength(100);
-
-            builder.Property(t => t.Updated)
-                .IsRequired()
-                .HasColumnName("Updated")
-                .HasColumnType("datetimeoffset")
-                .HasDefaultValueSql("(sysutcdatetime())");
-
-            builder.Property(t => t.UpdatedBy)
-                .HasColumnName("UpdatedBy")
-                .HasColumnType("nvarchar(100)")
-                .HasMaxLength(100);
-
-            builder.Property(t => t.RowVersion)
-                .IsRequired()
-                .IsRowVersion()
-                .HasColumnName("RowVersion")
-                .HasColumnType("rowversion")
-                .HasMaxLength(8)
-                .ValueGeneratedOnAddOrUpdate();
-
-            builder.Property(t => t.PeriodStart)
-                .IsRequired()
-                .HasColumnName("PeriodStart")
-                .HasColumnType("datetime2")
-                .HasDefaultValueSql("(sysutcdatetime())");
-
-            builder.Property(t => t.PeriodEnd)
-                .IsRequired()
-                .HasColumnName("PeriodEnd")
-                .HasColumnType("datetime2")
-                .HasDefaultValueSql("('9999-12-31 23:59:59.9999999')");
-
-            // relationships
-            builder.HasOne(t => t.Tenant)
-                .WithMany(t => t.Topics)
-                .HasForeignKey(d => d.TenantId)
-                .HasConstraintName("FK_Topic_Tenant_TenantId");
-
-            #endregion
-
-            builder.HasOne(t => t.LeadInstructor)
-                .WithMany(t => t.LeadTopics)
-                .HasForeignKey(d => d.LeadInstructorId)
-                .HasConstraintName("FK_Topic_Instructor_LeadInstructorId");
-
-            builder.Property(t => t.PeriodStart)
-                .ValueGeneratedOnAddOrUpdate();
-
-            builder.Property(t => t.PeriodEnd)
-                .ValueGeneratedOnAddOrUpdate();
-        }
-
-        #region Generated Constants
-        public struct Table
-        {
-            /// <summary>Table Schema name constant for entity <see cref="InstructorIQ.Core.Data.Entities.Topic" /></summary>
-            public const string Schema = "IQ";
-            /// <summary>Table Name constant for entity <see cref="InstructorIQ.Core.Data.Entities.Topic" /></summary>
-            public const string Name = "Topic";
-        }
-
-        public struct Columns
-        {
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Topic.Id" /></summary>
-            public const string Id = "Id";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Topic.Title" /></summary>
-            public const string Title = "Title";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Topic.Summary" /></summary>
-            public const string Summary = "Summary";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Topic.Description" /></summary>
-            public const string Description = "Description";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Topic.TenantId" /></summary>
-            public const string TenantId = "TenantId";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Topic.LeadInstructorId" /></summary>
-            public const string LeadInstructorId = "LeadInstructorId";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Topic.LessonPlan" /></summary>
-            public const string LessonPlan = "LessonPlan";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Topic.Notes" /></summary>
-            public const string Notes = "Notes";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Topic.IsRequired" /></summary>
-            public const string IsRequired = "IsRequired";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Topic.IsPublished" /></summary>
-            public const string IsPublished = "IsPublished";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Topic.InstructorSlots" /></summary>
-            public const string InstructorSlots = "InstructorSlots";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Topic.CalendarYear" /></summary>
-            public const string CalendarYear = "CalendarYear";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Topic.TargetMonth" /></summary>
-            public const string TargetMonth = "TargetMonth";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Topic.Created" /></summary>
-            public const string Created = "Created";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Topic.CreatedBy" /></summary>
-            public const string CreatedBy = "CreatedBy";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Topic.Updated" /></summary>
-            public const string Updated = "Updated";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Topic.UpdatedBy" /></summary>
-            public const string UpdatedBy = "UpdatedBy";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Topic.RowVersion" /></summary>
-            public const string RowVersion = "RowVersion";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Topic.PeriodStart" /></summary>
-            public const string PeriodStart = "PeriodStart";
-            /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Topic.PeriodEnd" /></summary>
-            public const string PeriodEnd = "PeriodEnd";
-        }
+        #region Generated Configure
+        // table
+        builder.ToTable("Topic", "IQ");
+
+        // key
+        builder.HasKey(t => t.Id);
+
+        // properties
+        builder.Property(t => t.Id)
+            .IsRequired()
+            .HasColumnName("Id")
+            .HasColumnType("uniqueidentifier")
+            .HasDefaultValueSql("(newsequentialid())");
+
+        builder.Property(t => t.Title)
+            .IsRequired()
+            .HasColumnName("Title")
+            .HasColumnType("nvarchar(256)")
+            .HasMaxLength(256);
+
+        builder.Property(t => t.Summary)
+            .HasColumnName("Summary")
+            .HasColumnType("nvarchar(256)")
+            .HasMaxLength(256);
+
+        builder.Property(t => t.Description)
+            .HasColumnName("Description")
+            .HasColumnType("nvarchar(max)");
+
+        builder.Property(t => t.TenantId)
+            .IsRequired()
+            .HasColumnName("TenantId")
+            .HasColumnType("uniqueidentifier");
+
+        builder.Property(t => t.LeadInstructorId)
+            .HasColumnName("LeadInstructorId")
+            .HasColumnType("uniqueidentifier");
+
+        builder.Property(t => t.LessonPlan)
+            .HasColumnName("LessonPlan")
+            .HasColumnType("nvarchar(max)");
+
+        builder.Property(t => t.Notes)
+            .HasColumnName("Notes")
+            .HasColumnType("nvarchar(max)");
+
+        builder.Property(t => t.IsRequired)
+            .IsRequired()
+            .HasColumnName("IsRequired")
+            .HasColumnType("bit");
+
+        builder.Property(t => t.IsPublished)
+            .IsRequired()
+            .HasColumnName("IsPublished")
+            .HasColumnType("bit");
+
+        builder.Property(t => t.InstructorSlots)
+            .HasColumnName("InstructorSlots")
+            .HasColumnType("int");
+
+        builder.Property(t => t.CalendarYear)
+            .IsRequired()
+            .HasColumnName("CalendarYear")
+            .HasColumnType("smallint")
+            .HasDefaultValueSql("(datepart(year,getdate()))");
+
+        builder.Property(t => t.TargetMonth)
+            .HasColumnName("TargetMonth")
+            .HasColumnType("smallint");
+
+        builder.Property(t => t.Created)
+            .IsRequired()
+            .HasColumnName("Created")
+            .HasColumnType("datetimeoffset")
+            .HasDefaultValueSql("(sysutcdatetime())");
+
+        builder.Property(t => t.CreatedBy)
+            .HasColumnName("CreatedBy")
+            .HasColumnType("nvarchar(100)")
+            .HasMaxLength(100);
+
+        builder.Property(t => t.Updated)
+            .IsRequired()
+            .HasColumnName("Updated")
+            .HasColumnType("datetimeoffset")
+            .HasDefaultValueSql("(sysutcdatetime())");
+
+        builder.Property(t => t.UpdatedBy)
+            .HasColumnName("UpdatedBy")
+            .HasColumnType("nvarchar(100)")
+            .HasMaxLength(100);
+
+        builder.Property(t => t.RowVersion)
+            .IsRequired()
+            .IsRowVersion()
+            .HasColumnName("RowVersion")
+            .HasColumnType("rowversion")
+            .HasMaxLength(8)
+            .ValueGeneratedOnAddOrUpdate();
+
+        builder.Property(t => t.PeriodStart)
+            .IsRequired()
+            .HasColumnName("PeriodStart")
+            .HasColumnType("datetime2")
+            .HasDefaultValueSql("(sysutcdatetime())");
+
+        builder.Property(t => t.PeriodEnd)
+            .IsRequired()
+            .HasColumnName("PeriodEnd")
+            .HasColumnType("datetime2")
+            .HasDefaultValueSql("('9999-12-31 23:59:59.9999999')");
+
+        // relationships
+        builder.HasOne(t => t.Tenant)
+            .WithMany(t => t.Topics)
+            .HasForeignKey(d => d.TenantId)
+            .HasConstraintName("FK_Topic_Tenant_TenantId");
+
         #endregion
 
+        builder.HasOne(t => t.LeadInstructor)
+            .WithMany(t => t.LeadTopics)
+            .HasForeignKey(d => d.LeadInstructorId)
+            .HasConstraintName("FK_Topic_Instructor_LeadInstructorId");
+
+        builder.Property(t => t.PeriodStart)
+            .ValueGeneratedOnAddOrUpdate();
+
+        builder.Property(t => t.PeriodEnd)
+            .ValueGeneratedOnAddOrUpdate();
+    }
+
+    #region Generated Constants
+    public struct Table
+    {
+        /// <summary>Table Schema name constant for entity <see cref="InstructorIQ.Core.Data.Entities.Topic" /></summary>
+        public const string Schema = "IQ";
+        /// <summary>Table Name constant for entity <see cref="InstructorIQ.Core.Data.Entities.Topic" /></summary>
+        public const string Name = "Topic";
+    }
+
+    public struct Columns
+    {
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Topic.Id" /></summary>
+        public const string Id = "Id";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Topic.Title" /></summary>
+        public const string Title = "Title";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Topic.Summary" /></summary>
+        public const string Summary = "Summary";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Topic.Description" /></summary>
+        public const string Description = "Description";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Topic.TenantId" /></summary>
+        public const string TenantId = "TenantId";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Topic.LeadInstructorId" /></summary>
+        public const string LeadInstructorId = "LeadInstructorId";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Topic.LessonPlan" /></summary>
+        public const string LessonPlan = "LessonPlan";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Topic.Notes" /></summary>
+        public const string Notes = "Notes";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Topic.IsRequired" /></summary>
+        public const string IsRequired = "IsRequired";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Topic.IsPublished" /></summary>
+        public const string IsPublished = "IsPublished";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Topic.InstructorSlots" /></summary>
+        public const string InstructorSlots = "InstructorSlots";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Topic.CalendarYear" /></summary>
+        public const string CalendarYear = "CalendarYear";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Topic.TargetMonth" /></summary>
+        public const string TargetMonth = "TargetMonth";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Topic.Created" /></summary>
+        public const string Created = "Created";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Topic.CreatedBy" /></summary>
+        public const string CreatedBy = "CreatedBy";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Topic.Updated" /></summary>
+        public const string Updated = "Updated";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Topic.UpdatedBy" /></summary>
+        public const string UpdatedBy = "UpdatedBy";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Topic.RowVersion" /></summary>
+        public const string RowVersion = "RowVersion";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Topic.PeriodStart" /></summary>
+        public const string PeriodStart = "PeriodStart";
+        /// <summary>Column Name constant for property <see cref="InstructorIQ.Core.Data.Entities.Topic.PeriodEnd" /></summary>
+        public const string PeriodEnd = "PeriodEnd";
     }
+    #endregion
+
 }
diff --git a/service/src/InstructorIQ.Core/Data/Mapping/UserClaimMap.cs b/service/src/InstructorIQ.Core/Data/Mapping/UserClaimMap.cs
index 7fe887e7..e615ec13 100644
--- a/service/src/InstructorIQ.Core/Data/Mapping/UserClaimMap.cs
+++ b/service/src/InstructorIQ.Core/Data/Mapping/UserClaimMap.cs
@@ -1,22 +1,22 @@
 using System;
+
 using Microsoft.EntityFrameworkCore;
 
-namespace InstructorIQ.Core.Data.Mapping
+namespace InstructorIQ.Core.Data.Mapping;
+
+/// <summary>
+/// Allows configuration for an entity type <see cref="InstructorIQ.Core.Data.Entities.UserClaim" />
+/// </summary>
+public class UserClaimMap
+    : IEntityTypeConfiguration<InstructorIQ.Core.Data.Entities.UserClaim>
 {
     /// <summary>
-    /// Allows configuration for an entity type <see cref="InstructorIQ.Core.Data.Entities.UserClaim" />
+    /// Configures the entity of type <see cref="InstructorIQ.Core.Data.Entities.UserClaim" />
     /// </summary>
-    public class UserClaimMap
-        : IEntityTypeConfiguration<InstructorIQ.Core.Data.Entities.UserClaim>
+    /// <param name="builder">The builder to be used to configure the entity type.</param>
+    public void Configure(Microsoft.EntityFrameworkCore.Metadata.Builders.EntityTypeBuilder<InstructorIQ.Core.Data.Entities.UserClaim> builder)
     {
-        /// <summary>
-        /// Configures the entity of type <see cref="InstructorIQ.Core.Data.Entities.UserClaim" />
-        /// </summary>
-        /// <param name="builder">The builder to be used to configure the entity type.</param>
-        public void Configure(Microsoft.EntityFrameworkCore.Metadata.Builders.EntityTypeBuilder<InstructorIQ.Core.Data.Entities.UserClaim> builder)
-        {
-            builder.ToTable("UserClaim", "Identity");
-        }
-
+        builder.ToTable("UserClaim", "Identity");
     }
-}
\ No newline at end of file
+
+}
diff --git a/service/src/InstructorIQ.Core/Data/Mapping/UserLoginMap.cs b/service/src/InstructorIQ.Core/Data/Mapping/UserLoginMap.cs
index 12935741..64098147 100644
--- a/service/src/InstructorIQ.Core/Data/Mapping/UserLoginMap.cs
+++ b/service/src/InstructorIQ.Core/Data/Mapping/UserLoginMap.cs
@@ -1,23 +1,23 @@
 using System;
 using System.Collections.Generic;
+
 using Microsoft.EntityFrameworkCore;
 
-namespace InstructorIQ.Core.Data.Mapping
+namespace InstructorIQ.Core.Data.Mapping;
+
+/// <summary>
+/// Allows configuration for an entity type <see cref="InstructorIQ.Core.Data.Entities.UserLogin" />
+/// </summary>
+public class UserLoginMap
+    : IEntityTypeConfiguration<InstructorIQ.Core.Data.Entities.UserLogin>
 {
     /// <summary>
-    /// Allows configuration for an entity type <see cref="InstructorIQ.Core.Data.Entities.UserLogin" />
+    /// Configures the entity of type <see cref="InstructorIQ.Core.Data.Entities.UserLogin" />
     /// </summary>
-    public class UserLoginMap
-        : IEntityTypeConfiguration<InstructorIQ.Core.Data.Entities.UserLogin>
+    /// <param name="builder">The builder to be used to configure the entity type.</param>
+    public void Configure(Microsoft.EntityFrameworkCore.Metadata.Builders.EntityTypeBuilder<InstructorIQ.Core.Data.Entities.UserLogin> builder)
     {
-        /// <summary>
-        /// Configures the entity of type <see cref="InstructorIQ.Core.Data.Entities.UserLogin" />
-        /// </summary>
-        /// <param name="builder">The builder to be used to configure the entity type.</param>
-        public void Configure(Microsoft.EntityFrameworkCore.Metadata.Builders.EntityTypeBuilder<InstructorIQ.Core.Data.Entities.UserLogin> builder)
-        {
-            builder.ToTable("UserLogin", "Identity");
-        }
-
+        builder.ToTable("UserLogin", "Identity");
     }
+
 }
diff --git a/service/src/InstructorIQ.Core/Data/Mapping/UserMap.cs b/service/src/InstructorIQ.Core/Data/Mapping/UserMap.cs
index c8189e1c..2576c20d 100644
--- a/service/src/InstructorIQ.Core/Data/Mapping/UserMap.cs
+++ b/service/src/InstructorIQ.Core/Data/Mapping/UserMap.cs
@@ -1,63 +1,63 @@
 using System;
 using System.Collections.Generic;
+
 using Microsoft.EntityFrameworkCore;
 
-namespace InstructorIQ.Core.Data.Mapping
+namespace InstructorIQ.Core.Data.Mapping;
+
+/// <summary>
+/// Allows configuration for an entity type <see cref="InstructorIQ.Core.Data.Entities.User" />
+/// </summary>
+public class UserMap
+    : IEntityTypeConfiguration<InstructorIQ.Core.Data.Entities.User>
 {
     /// <summary>
-    /// Allows configuration for an entity type <see cref="InstructorIQ.Core.Data.Entities.User" />
+    /// Configures the entity of type <see cref="InstructorIQ.Core.Data.Entities.User" />
     /// </summary>
-    public class UserMap
-        : IEntityTypeConfiguration<InstructorIQ.Core.Data.Entities.User>
+    /// <param name="builder">The builder to be used to configure the entity type.</param>
+    public void Configure(Microsoft.EntityFrameworkCore.Metadata.Builders.EntityTypeBuilder<InstructorIQ.Core.Data.Entities.User> builder)
     {
-        /// <summary>
-        /// Configures the entity of type <see cref="InstructorIQ.Core.Data.Entities.User" />
-        /// </summary>
-        /// <param name="builder">The builder to be used to configure the entity type.</param>
-        public void Configure(Microsoft.EntityFrameworkCore.Metadata.Builders.EntityTypeBuilder<InstructorIQ.Core.Data.Entities.User> builder)
-        {
-            builder.ToTable("User", "Identity");
-
-            builder.Property(t => t.GivenName)
-                .HasColumnName("GivenName")
-                .HasColumnType("nvarchar(256)")
-                .HasMaxLength(256);
-
-            builder.Property(t => t.MiddleName)
-                .HasColumnName("MiddleName")
-                .HasColumnType("nvarchar(256)")
-                .HasMaxLength(256);
-
-            builder.Property(t => t.FamilyName)
-                .HasColumnName("FamilyName")
-                .HasColumnType("nvarchar(256)")
-                .HasMaxLength(256);
-
-            builder.Property(t => t.DisplayName)
-                .IsRequired()
-                .HasColumnName("DisplayName")
-                .HasColumnType("nvarchar(256)")
-                .HasMaxLength(256);
-
-            builder.Property(t => t.SortName)
-                .HasColumnName("SortName")
-                .HasColumnType("nvarchar(256)")
-                .HasMaxLength(256);
-
-            builder.Property(t => t.JobTitle)
-                .HasColumnName("JobTitle")
-                .HasColumnType("nvarchar(256)")
-                .HasMaxLength(256);
-
-            builder.Property(t => t.LastTenantId)
-                .HasColumnName("LastTenantId")
-                .HasColumnType("uniqueidentifier");
-
-            builder.Property(t => t.IsGlobalAdministrator)
-                .IsRequired()
-                .HasColumnName("IsGlobalAdministrator")
-                .HasColumnType("bit");
-        }
-
+        builder.ToTable("User", "Identity");
+
+        builder.Property(t => t.GivenName)
+            .HasColumnName("GivenName")
+            .HasColumnType("nvarchar(256)")
+            .HasMaxLength(256);
+
+        builder.Property(t => t.MiddleName)
+            .HasColumnName("MiddleName")
+            .HasColumnType("nvarchar(256)")
+            .HasMaxLength(256);
+
+        builder.Property(t => t.FamilyName)
+            .HasColumnName("FamilyName")
+            .HasColumnType("nvarchar(256)")
+            .HasMaxLength(256);
+
+        builder.Property(t => t.DisplayName)
+            .IsRequired()
+            .HasColumnName("DisplayName")
+            .HasColumnType("nvarchar(256)")
+            .HasMaxLength(256);
+
+        builder.Property(t => t.SortName)
+            .HasColumnName("SortName")
+            .HasColumnType("nvarchar(256)")
+            .HasMaxLength(256);
+
+        builder.Property(t => t.JobTitle)
+            .HasColumnName("JobTitle")
+            .HasColumnType("nvarchar(256)")
+            .HasMaxLength(256);
+
+        builder.Property(t => t.LastTenantId)
+            .HasColumnName("LastTenantId")
+            .HasColumnType("uniqueidentifier");
+
+        builder.Property(t => t.IsGlobalAdministrator)
+            .IsRequired()
+            .HasColumnName("IsGlobalAdministrator")
+            .HasColumnType("bit");
     }
+
 }
diff --git a/service/src/InstructorIQ.Core/Data/Mapping/UserRoleMap.cs b/service/src/InstructorIQ.Core/Data/Mapping/UserRoleMap.cs
index 8d7ff19f..623df4c7 100644
--- a/service/src/InstructorIQ.Core/Data/Mapping/UserRoleMap.cs
+++ b/service/src/InstructorIQ.Core/Data/Mapping/UserRoleMap.cs
@@ -1,23 +1,23 @@
 using System;
 using System.Collections.Generic;
+
 using Microsoft.EntityFrameworkCore;
 
-namespace InstructorIQ.Core.Data.Mapping
+namespace InstructorIQ.Core.Data.Mapping;
+
+/// <summary>
+/// Allows configuration for an entity type <see cref="InstructorIQ.Core.Data.Entities.UserRole" />
+/// </summary>
+public class UserRoleMap
+    : IEntityTypeConfiguration<InstructorIQ.Core.Data.Entities.UserRole>
 {
     /// <summary>
-    /// Allows configuration for an entity type <see cref="InstructorIQ.Core.Data.Entities.UserRole" />
+    /// Configures the entity of type <see cref="InstructorIQ.Core.Data.Entities.UserRole" />
     /// </summary>
-    public class UserRoleMap
-        : IEntityTypeConfiguration<InstructorIQ.Core.Data.Entities.UserRole>
+    /// <param name="builder">The builder to be used to configure the entity type.</param>
+    public void Configure(Microsoft.EntityFrameworkCore.Metadata.Builders.EntityTypeBuilder<InstructorIQ.Core.Data.Entities.UserRole> builder)
     {
-        /// <summary>
-        /// Configures the entity of type <see cref="InstructorIQ.Core.Data.Entities.UserRole" />
-        /// </summary>
-        /// <param name="builder">The builder to be used to configure the entity type.</param>
-        public void Configure(Microsoft.EntityFrameworkCore.Metadata.Builders.EntityTypeBuilder<InstructorIQ.Core.Data.Entities.UserRole> builder)
-        {
-            builder.ToTable("UserRole", "Identity");
-        }
-
+        builder.ToTable("UserRole", "Identity");
     }
+
 }
diff --git a/service/src/InstructorIQ.Core/Data/Mapping/UserTokenMap.cs b/service/src/InstructorIQ.Core/Data/Mapping/UserTokenMap.cs
index a80bc115..93b6af6f 100644
--- a/service/src/InstructorIQ.Core/Data/Mapping/UserTokenMap.cs
+++ b/service/src/InstructorIQ.Core/Data/Mapping/UserTokenMap.cs
@@ -1,22 +1,22 @@
 using System;
+
 using Microsoft.EntityFrameworkCore;
 
-namespace InstructorIQ.Core.Data.Mapping
+namespace InstructorIQ.Core.Data.Mapping;
+
+/// <summary>
+/// Allows configuration for an entity type <see cref="InstructorIQ.Core.Data.Entities.UserToken" />
+/// </summary>
+public class UserTokenMap
+    : IEntityTypeConfiguration<InstructorIQ.Core.Data.Entities.UserToken>
 {
     /// <summary>
-    /// Allows configuration for an entity type <see cref="InstructorIQ.Core.Data.Entities.UserToken" />
+    /// Configures the entity of type <see cref="InstructorIQ.Core.Data.Entities.UserToken" />
     /// </summary>
-    public class UserTokenMap
-        : IEntityTypeConfiguration<InstructorIQ.Core.Data.Entities.UserToken>
+    /// <param name="builder">The builder to be used to configure the entity type.</param>
+    public void Configure(Microsoft.EntityFrameworkCore.Metadata.Builders.EntityTypeBuilder<InstructorIQ.Core.Data.Entities.UserToken> builder)
     {
-        /// <summary>
-        /// Configures the entity of type <see cref="InstructorIQ.Core.Data.Entities.UserToken" />
-        /// </summary>
-        /// <param name="builder">The builder to be used to configure the entity type.</param>
-        public void Configure(Microsoft.EntityFrameworkCore.Metadata.Builders.EntityTypeBuilder<InstructorIQ.Core.Data.Entities.UserToken> builder)
-        {
-            builder.ToTable("UserToken", "Identity");
-        }
-
+        builder.ToTable("UserToken", "Identity");
     }
-}
\ No newline at end of file
+
+}
diff --git a/service/src/InstructorIQ.Core/Data/Queries/AttendanceExtensions.cs b/service/src/InstructorIQ.Core/Data/Queries/AttendanceExtensions.cs
index 659d9a62..b1d4d03d 100644
--- a/service/src/InstructorIQ.Core/Data/Queries/AttendanceExtensions.cs
+++ b/service/src/InstructorIQ.Core/Data/Queries/AttendanceExtensions.cs
@@ -2,79 +2,79 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+
 using Microsoft.EntityFrameworkCore;
 
-namespace InstructorIQ.Core.Data.Queries
+namespace InstructorIQ.Core.Data.Queries;
+
+/// <summary>
+/// Query extensions for entity <see cref="InstructorIQ.Core.Data.Entities.Attendance" />.
+/// </summary>
+public static partial class AttendanceExtensions
 {
+    #region Generated Extensions
     /// <summary>
-    /// Query extensions for entity <see cref="InstructorIQ.Core.Data.Entities.Attendance" />.
+    /// Filters a sequence of values based on a predicate.
     /// </summary>
-    public static partial class AttendanceExtensions
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="attendeeEmail">The value to filter by.</param>
+    /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
+    public static IQueryable<InstructorIQ.Core.Data.Entities.Attendance> ByAttendeeEmail(this IQueryable<InstructorIQ.Core.Data.Entities.Attendance> queryable, string attendeeEmail)
     {
-        #region Generated Extensions
-        /// <summary>
-        /// Filters a sequence of values based on a predicate.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="attendeeEmail">The value to filter by.</param>
-        /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
-        public static IQueryable<InstructorIQ.Core.Data.Entities.Attendance> ByAttendeeEmail(this IQueryable<InstructorIQ.Core.Data.Entities.Attendance> queryable, string attendeeEmail)
-        {
-            return queryable.Where(q => q.AttendeeEmail == attendeeEmail);
-        }
+        return queryable.Where(q => q.AttendeeEmail == attendeeEmail);
+    }
 
-        /// <summary>
-        /// Gets an instance by the primary key.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="id">The value to filter by.</param>
-        /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.Attendance"/> or null if not found.</returns>
-        public static InstructorIQ.Core.Data.Entities.Attendance GetByKey(this IQueryable<InstructorIQ.Core.Data.Entities.Attendance> queryable, Guid id)
-        {
-            if (queryable is DbSet<InstructorIQ.Core.Data.Entities.Attendance> dbSet)
-                return dbSet.Find(id);
+    /// <summary>
+    /// Gets an instance by the primary key.
+    /// </summary>
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="id">The value to filter by.</param>
+    /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.Attendance"/> or null if not found.</returns>
+    public static InstructorIQ.Core.Data.Entities.Attendance GetByKey(this IQueryable<InstructorIQ.Core.Data.Entities.Attendance> queryable, Guid id)
+    {
+        if (queryable is DbSet<InstructorIQ.Core.Data.Entities.Attendance> dbSet)
+            return dbSet.Find(id);
 
-            return queryable.FirstOrDefault(q => q.Id == id);
-        }
+        return queryable.FirstOrDefault(q => q.Id == id);
+    }
 
-        /// <summary>
-        /// Gets an instance by the primary key.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="id">The value to filter by.</param>
-        /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.Attendance"/> or null if not found.</returns>
-        public static ValueTask<InstructorIQ.Core.Data.Entities.Attendance> GetByKeyAsync(this IQueryable<InstructorIQ.Core.Data.Entities.Attendance> queryable, Guid id)
-        {
-            if (queryable is DbSet<InstructorIQ.Core.Data.Entities.Attendance> dbSet)
-                return dbSet.FindAsync(id);
+    /// <summary>
+    /// Gets an instance by the primary key.
+    /// </summary>
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="id">The value to filter by.</param>
+    /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.Attendance"/> or null if not found.</returns>
+    public static ValueTask<InstructorIQ.Core.Data.Entities.Attendance> GetByKeyAsync(this IQueryable<InstructorIQ.Core.Data.Entities.Attendance> queryable, Guid id)
+    {
+        if (queryable is DbSet<InstructorIQ.Core.Data.Entities.Attendance> dbSet)
+            return dbSet.FindAsync(id);
 
-            var task = queryable.FirstOrDefaultAsync(q => q.Id == id);
-            return new ValueTask<InstructorIQ.Core.Data.Entities.Attendance>(task);
-        }
+        var task = queryable.FirstOrDefaultAsync(q => q.Id == id);
+        return new ValueTask<InstructorIQ.Core.Data.Entities.Attendance>(task);
+    }
 
-        /// <summary>
-        /// Filters a sequence of values based on a predicate.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="sessionId">The value to filter by.</param>
-        /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
-        public static IQueryable<InstructorIQ.Core.Data.Entities.Attendance> BySessionId(this IQueryable<InstructorIQ.Core.Data.Entities.Attendance> queryable, Guid sessionId)
-        {
-            return queryable.Where(q => q.SessionId == sessionId);
-        }
+    /// <summary>
+    /// Filters a sequence of values based on a predicate.
+    /// </summary>
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="sessionId">The value to filter by.</param>
+    /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
+    public static IQueryable<InstructorIQ.Core.Data.Entities.Attendance> BySessionId(this IQueryable<InstructorIQ.Core.Data.Entities.Attendance> queryable, Guid sessionId)
+    {
+        return queryable.Where(q => q.SessionId == sessionId);
+    }
 
-        /// <summary>
-        /// Filters a sequence of values based on a predicate.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="tenantId">The value to filter by.</param>
-        /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
-        public static IQueryable<InstructorIQ.Core.Data.Entities.Attendance> ByTenantId(this IQueryable<InstructorIQ.Core.Data.Entities.Attendance> queryable, Guid tenantId)
-        {
-            return queryable.Where(q => q.TenantId == tenantId);
-        }
+    /// <summary>
+    /// Filters a sequence of values based on a predicate.
+    /// </summary>
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="tenantId">The value to filter by.</param>
+    /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
+    public static IQueryable<InstructorIQ.Core.Data.Entities.Attendance> ByTenantId(this IQueryable<InstructorIQ.Core.Data.Entities.Attendance> queryable, Guid tenantId)
+    {
+        return queryable.Where(q => q.TenantId == tenantId);
+    }
 
-        #endregion
+    #endregion
 
-    }
 }
diff --git a/service/src/InstructorIQ.Core/Data/Queries/AuthenticationEventExtensions.cs b/service/src/InstructorIQ.Core/Data/Queries/AuthenticationEventExtensions.cs
index e0e32477..27c787d5 100644
--- a/service/src/InstructorIQ.Core/Data/Queries/AuthenticationEventExtensions.cs
+++ b/service/src/InstructorIQ.Core/Data/Queries/AuthenticationEventExtensions.cs
@@ -2,68 +2,68 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+
 using Microsoft.EntityFrameworkCore;
 
-namespace InstructorIQ.Core.Data.Queries
+namespace InstructorIQ.Core.Data.Queries;
+
+/// <summary>
+/// Query extensions for entity <see cref="InstructorIQ.Core.Data.Entities.AuthenticationEvent" />.
+/// </summary>
+public static partial class AuthenticationEventExtensions
 {
+    #region Generated Extensions
     /// <summary>
-    /// Query extensions for entity <see cref="InstructorIQ.Core.Data.Entities.AuthenticationEvent" />.
+    /// Filters a sequence of values based on a predicate.
     /// </summary>
-    public static partial class AuthenticationEventExtensions
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="emailAddress">The value to filter by.</param>
+    /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
+    public static IQueryable<InstructorIQ.Core.Data.Entities.AuthenticationEvent> ByEmailAddress(this IQueryable<InstructorIQ.Core.Data.Entities.AuthenticationEvent> queryable, string emailAddress)
     {
-        #region Generated Extensions
-        /// <summary>
-        /// Filters a sequence of values based on a predicate.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="emailAddress">The value to filter by.</param>
-        /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
-        public static IQueryable<InstructorIQ.Core.Data.Entities.AuthenticationEvent> ByEmailAddress(this IQueryable<InstructorIQ.Core.Data.Entities.AuthenticationEvent> queryable, string emailAddress)
-        {
-            return queryable.Where(q => q.EmailAddress == emailAddress);
-        }
+        return queryable.Where(q => q.EmailAddress == emailAddress);
+    }
 
-        /// <summary>
-        /// Gets an instance by the primary key.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="id">The value to filter by.</param>
-        /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.AuthenticationEvent"/> or null if not found.</returns>
-        public static InstructorIQ.Core.Data.Entities.AuthenticationEvent GetByKey(this IQueryable<InstructorIQ.Core.Data.Entities.AuthenticationEvent> queryable, Guid id)
-        {
-            if (queryable is DbSet<InstructorIQ.Core.Data.Entities.AuthenticationEvent> dbSet)
-                return dbSet.Find(id);
+    /// <summary>
+    /// Gets an instance by the primary key.
+    /// </summary>
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="id">The value to filter by.</param>
+    /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.AuthenticationEvent"/> or null if not found.</returns>
+    public static InstructorIQ.Core.Data.Entities.AuthenticationEvent GetByKey(this IQueryable<InstructorIQ.Core.Data.Entities.AuthenticationEvent> queryable, Guid id)
+    {
+        if (queryable is DbSet<InstructorIQ.Core.Data.Entities.AuthenticationEvent> dbSet)
+            return dbSet.Find(id);
 
-            return queryable.FirstOrDefault(q => q.Id == id);
-        }
+        return queryable.FirstOrDefault(q => q.Id == id);
+    }
 
-        /// <summary>
-        /// Gets an instance by the primary key.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="id">The value to filter by.</param>
-        /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.AuthenticationEvent"/> or null if not found.</returns>
-        public static ValueTask<InstructorIQ.Core.Data.Entities.AuthenticationEvent> GetByKeyAsync(this IQueryable<InstructorIQ.Core.Data.Entities.AuthenticationEvent> queryable, Guid id)
-        {
-            if (queryable is DbSet<InstructorIQ.Core.Data.Entities.AuthenticationEvent> dbSet)
-                return dbSet.FindAsync(id);
+    /// <summary>
+    /// Gets an instance by the primary key.
+    /// </summary>
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="id">The value to filter by.</param>
+    /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.AuthenticationEvent"/> or null if not found.</returns>
+    public static ValueTask<InstructorIQ.Core.Data.Entities.AuthenticationEvent> GetByKeyAsync(this IQueryable<InstructorIQ.Core.Data.Entities.AuthenticationEvent> queryable, Guid id)
+    {
+        if (queryable is DbSet<InstructorIQ.Core.Data.Entities.AuthenticationEvent> dbSet)
+            return dbSet.FindAsync(id);
 
-            var task = queryable.FirstOrDefaultAsync(q => q.Id == id);
-            return new ValueTask<InstructorIQ.Core.Data.Entities.AuthenticationEvent>(task);
-        }
+        var task = queryable.FirstOrDefaultAsync(q => q.Id == id);
+        return new ValueTask<InstructorIQ.Core.Data.Entities.AuthenticationEvent>(task);
+    }
 
-        /// <summary>
-        /// Filters a sequence of values based on a predicate.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="userName">The value to filter by.</param>
-        /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
-        public static IQueryable<InstructorIQ.Core.Data.Entities.AuthenticationEvent> ByUserName(this IQueryable<InstructorIQ.Core.Data.Entities.AuthenticationEvent> queryable, string userName)
-        {
-            return queryable.Where(q => q.UserName == userName);
-        }
+    /// <summary>
+    /// Filters a sequence of values based on a predicate.
+    /// </summary>
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="userName">The value to filter by.</param>
+    /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
+    public static IQueryable<InstructorIQ.Core.Data.Entities.AuthenticationEvent> ByUserName(this IQueryable<InstructorIQ.Core.Data.Entities.AuthenticationEvent> queryable, string userName)
+    {
+        return queryable.Where(q => q.UserName == userName);
+    }
 
-        #endregion
+    #endregion
 
-    }
 }
diff --git a/service/src/InstructorIQ.Core/Data/Queries/DiscussionExtensions.cs b/service/src/InstructorIQ.Core/Data/Queries/DiscussionExtensions.cs
index 5a136e0e..53f9f672 100644
--- a/service/src/InstructorIQ.Core/Data/Queries/DiscussionExtensions.cs
+++ b/service/src/InstructorIQ.Core/Data/Queries/DiscussionExtensions.cs
@@ -2,68 +2,68 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+
 using Microsoft.EntityFrameworkCore;
 
-namespace InstructorIQ.Core.Data.Queries
+namespace InstructorIQ.Core.Data.Queries;
+
+/// <summary>
+/// Query extensions for entity <see cref="InstructorIQ.Core.Data.Entities.Discussion" />.
+/// </summary>
+public static partial class DiscussionExtensions
 {
+    #region Generated Extensions
     /// <summary>
-    /// Query extensions for entity <see cref="InstructorIQ.Core.Data.Entities.Discussion" />.
+    /// Gets an instance by the primary key.
     /// </summary>
-    public static partial class DiscussionExtensions
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="id">The value to filter by.</param>
+    /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.Discussion"/> or null if not found.</returns>
+    public static InstructorIQ.Core.Data.Entities.Discussion GetByKey(this IQueryable<InstructorIQ.Core.Data.Entities.Discussion> queryable, Guid id)
     {
-        #region Generated Extensions
-        /// <summary>
-        /// Gets an instance by the primary key.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="id">The value to filter by.</param>
-        /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.Discussion"/> or null if not found.</returns>
-        public static InstructorIQ.Core.Data.Entities.Discussion GetByKey(this IQueryable<InstructorIQ.Core.Data.Entities.Discussion> queryable, Guid id)
-        {
-            if (queryable is DbSet<InstructorIQ.Core.Data.Entities.Discussion> dbSet)
-                return dbSet.Find(id);
+        if (queryable is DbSet<InstructorIQ.Core.Data.Entities.Discussion> dbSet)
+            return dbSet.Find(id);
 
-            return queryable.FirstOrDefault(q => q.Id == id);
-        }
+        return queryable.FirstOrDefault(q => q.Id == id);
+    }
 
-        /// <summary>
-        /// Gets an instance by the primary key.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="id">The value to filter by.</param>
-        /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.Discussion"/> or null if not found.</returns>
-        public static ValueTask<InstructorIQ.Core.Data.Entities.Discussion> GetByKeyAsync(this IQueryable<InstructorIQ.Core.Data.Entities.Discussion> queryable, Guid id)
-        {
-            if (queryable is DbSet<InstructorIQ.Core.Data.Entities.Discussion> dbSet)
-                return dbSet.FindAsync(id);
+    /// <summary>
+    /// Gets an instance by the primary key.
+    /// </summary>
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="id">The value to filter by.</param>
+    /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.Discussion"/> or null if not found.</returns>
+    public static ValueTask<InstructorIQ.Core.Data.Entities.Discussion> GetByKeyAsync(this IQueryable<InstructorIQ.Core.Data.Entities.Discussion> queryable, Guid id)
+    {
+        if (queryable is DbSet<InstructorIQ.Core.Data.Entities.Discussion> dbSet)
+            return dbSet.FindAsync(id);
 
-            var task = queryable.FirstOrDefaultAsync(q => q.Id == id);
-            return new ValueTask<InstructorIQ.Core.Data.Entities.Discussion>(task);
-        }
+        var task = queryable.FirstOrDefaultAsync(q => q.Id == id);
+        return new ValueTask<InstructorIQ.Core.Data.Entities.Discussion>(task);
+    }
 
-        /// <summary>
-        /// Filters a sequence of values based on a predicate.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="tenantId">The value to filter by.</param>
-        /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
-        public static IQueryable<InstructorIQ.Core.Data.Entities.Discussion> ByTenantId(this IQueryable<InstructorIQ.Core.Data.Entities.Discussion> queryable, Guid tenantId)
-        {
-            return queryable.Where(q => q.TenantId == tenantId);
-        }
+    /// <summary>
+    /// Filters a sequence of values based on a predicate.
+    /// </summary>
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="tenantId">The value to filter by.</param>
+    /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
+    public static IQueryable<InstructorIQ.Core.Data.Entities.Discussion> ByTenantId(this IQueryable<InstructorIQ.Core.Data.Entities.Discussion> queryable, Guid tenantId)
+    {
+        return queryable.Where(q => q.TenantId == tenantId);
+    }
 
-        /// <summary>
-        /// Filters a sequence of values based on a predicate.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="topicId">The value to filter by.</param>
-        /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
-        public static IQueryable<InstructorIQ.Core.Data.Entities.Discussion> ByTopicId(this IQueryable<InstructorIQ.Core.Data.Entities.Discussion> queryable, Guid topicId)
-        {
-            return queryable.Where(q => q.TopicId == topicId);
-        }
+    /// <summary>
+    /// Filters a sequence of values based on a predicate.
+    /// </summary>
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="topicId">The value to filter by.</param>
+    /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
+    public static IQueryable<InstructorIQ.Core.Data.Entities.Discussion> ByTopicId(this IQueryable<InstructorIQ.Core.Data.Entities.Discussion> queryable, Guid topicId)
+    {
+        return queryable.Where(q => q.TopicId == topicId);
+    }
 
-        #endregion
+    #endregion
 
-    }
 }
diff --git a/service/src/InstructorIQ.Core/Data/Queries/EmailDeliveryExtensions.cs b/service/src/InstructorIQ.Core/Data/Queries/EmailDeliveryExtensions.cs
index a4810776..eebf6690 100644
--- a/service/src/InstructorIQ.Core/Data/Queries/EmailDeliveryExtensions.cs
+++ b/service/src/InstructorIQ.Core/Data/Queries/EmailDeliveryExtensions.cs
@@ -2,72 +2,72 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+
 using Microsoft.EntityFrameworkCore;
 
-namespace InstructorIQ.Core.Data.Queries
+namespace InstructorIQ.Core.Data.Queries;
+
+/// <summary>
+/// Query extensions for entity <see cref="InstructorIQ.Core.Data.Entities.EmailDelivery" />.
+/// </summary>
+public static partial class EmailDeliveryExtensions
 {
+    #region Generated Extensions
     /// <summary>
-    /// Query extensions for entity <see cref="InstructorIQ.Core.Data.Entities.EmailDelivery" />.
+    /// Gets an instance by the primary key.
     /// </summary>
-    public static partial class EmailDeliveryExtensions
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="id">The value to filter by.</param>
+    /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.EmailDelivery"/> or null if not found.</returns>
+    public static InstructorIQ.Core.Data.Entities.EmailDelivery GetByKey(this IQueryable<InstructorIQ.Core.Data.Entities.EmailDelivery> queryable, Guid id)
     {
-        #region Generated Extensions
-        /// <summary>
-        /// Gets an instance by the primary key.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="id">The value to filter by.</param>
-        /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.EmailDelivery"/> or null if not found.</returns>
-        public static InstructorIQ.Core.Data.Entities.EmailDelivery GetByKey(this IQueryable<InstructorIQ.Core.Data.Entities.EmailDelivery> queryable, Guid id)
-        {
-            if (queryable is DbSet<InstructorIQ.Core.Data.Entities.EmailDelivery> dbSet)
-                return dbSet.Find(id);
+        if (queryable is DbSet<InstructorIQ.Core.Data.Entities.EmailDelivery> dbSet)
+            return dbSet.Find(id);
 
-            return queryable.FirstOrDefault(q => q.Id == id);
-        }
+        return queryable.FirstOrDefault(q => q.Id == id);
+    }
 
-        /// <summary>
-        /// Gets an instance by the primary key.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="id">The value to filter by.</param>
-        /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.EmailDelivery"/> or null if not found.</returns>
-        public static ValueTask<InstructorIQ.Core.Data.Entities.EmailDelivery> GetByKeyAsync(this IQueryable<InstructorIQ.Core.Data.Entities.EmailDelivery> queryable, Guid id)
-        {
-            if (queryable is DbSet<InstructorIQ.Core.Data.Entities.EmailDelivery> dbSet)
-                return dbSet.FindAsync(id);
+    /// <summary>
+    /// Gets an instance by the primary key.
+    /// </summary>
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="id">The value to filter by.</param>
+    /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.EmailDelivery"/> or null if not found.</returns>
+    public static ValueTask<InstructorIQ.Core.Data.Entities.EmailDelivery> GetByKeyAsync(this IQueryable<InstructorIQ.Core.Data.Entities.EmailDelivery> queryable, Guid id)
+    {
+        if (queryable is DbSet<InstructorIQ.Core.Data.Entities.EmailDelivery> dbSet)
+            return dbSet.FindAsync(id);
 
-            var task = queryable.FirstOrDefaultAsync(q => q.Id == id);
-            return new ValueTask<InstructorIQ.Core.Data.Entities.EmailDelivery>(task);
-        }
+        var task = queryable.FirstOrDefaultAsync(q => q.Id == id);
+        return new ValueTask<InstructorIQ.Core.Data.Entities.EmailDelivery>(task);
+    }
 
-        /// <summary>
-        /// Filters a sequence of values based on a predicate.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="isProcessing">The value to filter by.</param>
-        /// <param name="isDelivered">The value to filter by.</param>
-        /// <param name="nextAttempt">The value to filter by.</param>
-        /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
-        public static IQueryable<InstructorIQ.Core.Data.Entities.EmailDelivery> ByIsProcessingIsDeliveredNextAttempt(this IQueryable<InstructorIQ.Core.Data.Entities.EmailDelivery> queryable, bool isProcessing, bool isDelivered, DateTimeOffset? nextAttempt)
-        {
-            return queryable.Where(q => q.IsProcessing == isProcessing
-                && q.IsDelivered == isDelivered
-                    && (q.NextAttempt == nextAttempt || (nextAttempt == null && q.NextAttempt == null)));
-            }
+    /// <summary>
+    /// Filters a sequence of values based on a predicate.
+    /// </summary>
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="isProcessing">The value to filter by.</param>
+    /// <param name="isDelivered">The value to filter by.</param>
+    /// <param name="nextAttempt">The value to filter by.</param>
+    /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
+    public static IQueryable<InstructorIQ.Core.Data.Entities.EmailDelivery> ByIsProcessingIsDeliveredNextAttempt(this IQueryable<InstructorIQ.Core.Data.Entities.EmailDelivery> queryable, bool isProcessing, bool isDelivered, DateTimeOffset? nextAttempt)
+    {
+        return queryable.Where(q => q.IsProcessing == isProcessing
+            && q.IsDelivered == isDelivered
+                && (q.NextAttempt == nextAttempt || (nextAttempt == null && q.NextAttempt == null)));
+    }
 
-            /// <summary>
-            /// Filters a sequence of values based on a predicate.
-            /// </summary>
-            /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-            /// <param name="tenantId">The value to filter by.</param>
-            /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
-            public static IQueryable<InstructorIQ.Core.Data.Entities.EmailDelivery> ByTenantId(this IQueryable<InstructorIQ.Core.Data.Entities.EmailDelivery> queryable, Guid? tenantId)
-            {
-                return queryable.Where(q => (q.TenantId == tenantId || (tenantId == null && q.TenantId == null)));
-            }
+    /// <summary>
+    /// Filters a sequence of values based on a predicate.
+    /// </summary>
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="tenantId">The value to filter by.</param>
+    /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
+    public static IQueryable<InstructorIQ.Core.Data.Entities.EmailDelivery> ByTenantId(this IQueryable<InstructorIQ.Core.Data.Entities.EmailDelivery> queryable, Guid? tenantId)
+    {
+        return queryable.Where(q => (q.TenantId == tenantId || (tenantId == null && q.TenantId == null)));
+    }
 
-            #endregion
+    #endregion
 
-        }
-    }
+}
diff --git a/service/src/InstructorIQ.Core/Data/Queries/EmailTemplateExtensions.cs b/service/src/InstructorIQ.Core/Data/Queries/EmailTemplateExtensions.cs
index a8d0f280..b39ba93c 100644
--- a/service/src/InstructorIQ.Core/Data/Queries/EmailTemplateExtensions.cs
+++ b/service/src/InstructorIQ.Core/Data/Queries/EmailTemplateExtensions.cs
@@ -2,79 +2,79 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+
 using Microsoft.EntityFrameworkCore;
 
-namespace InstructorIQ.Core.Data.Queries
+namespace InstructorIQ.Core.Data.Queries;
+
+/// <summary>
+/// Query extensions for entity <see cref="InstructorIQ.Core.Data.Entities.EmailTemplate" />.
+/// </summary>
+public static partial class EmailTemplateExtensions
 {
+    #region Generated Extensions
     /// <summary>
-    /// Query extensions for entity <see cref="InstructorIQ.Core.Data.Entities.EmailTemplate" />.
+    /// Gets an instance by the primary key.
     /// </summary>
-    public static partial class EmailTemplateExtensions
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="id">The value to filter by.</param>
+    /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.EmailTemplate"/> or null if not found.</returns>
+    public static InstructorIQ.Core.Data.Entities.EmailTemplate GetByKey(this IQueryable<InstructorIQ.Core.Data.Entities.EmailTemplate> queryable, Guid id)
     {
-        #region Generated Extensions
-        /// <summary>
-        /// Gets an instance by the primary key.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="id">The value to filter by.</param>
-        /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.EmailTemplate"/> or null if not found.</returns>
-        public static InstructorIQ.Core.Data.Entities.EmailTemplate GetByKey(this IQueryable<InstructorIQ.Core.Data.Entities.EmailTemplate> queryable, Guid id)
-        {
-            if (queryable is DbSet<InstructorIQ.Core.Data.Entities.EmailTemplate> dbSet)
-                return dbSet.Find(id);
+        if (queryable is DbSet<InstructorIQ.Core.Data.Entities.EmailTemplate> dbSet)
+            return dbSet.Find(id);
 
-            return queryable.FirstOrDefault(q => q.Id == id);
-        }
+        return queryable.FirstOrDefault(q => q.Id == id);
+    }
 
-        /// <summary>
-        /// Gets an instance by the primary key.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="id">The value to filter by.</param>
-        /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.EmailTemplate"/> or null if not found.</returns>
-        public static ValueTask<InstructorIQ.Core.Data.Entities.EmailTemplate> GetByKeyAsync(this IQueryable<InstructorIQ.Core.Data.Entities.EmailTemplate> queryable, Guid id)
-        {
-            if (queryable is DbSet<InstructorIQ.Core.Data.Entities.EmailTemplate> dbSet)
-                return dbSet.FindAsync(id);
+    /// <summary>
+    /// Gets an instance by the primary key.
+    /// </summary>
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="id">The value to filter by.</param>
+    /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.EmailTemplate"/> or null if not found.</returns>
+    public static ValueTask<InstructorIQ.Core.Data.Entities.EmailTemplate> GetByKeyAsync(this IQueryable<InstructorIQ.Core.Data.Entities.EmailTemplate> queryable, Guid id)
+    {
+        if (queryable is DbSet<InstructorIQ.Core.Data.Entities.EmailTemplate> dbSet)
+            return dbSet.FindAsync(id);
 
-            var task = queryable.FirstOrDefaultAsync(q => q.Id == id);
-            return new ValueTask<InstructorIQ.Core.Data.Entities.EmailTemplate>(task);
-        }
+        var task = queryable.FirstOrDefaultAsync(q => q.Id == id);
+        return new ValueTask<InstructorIQ.Core.Data.Entities.EmailTemplate>(task);
+    }
 
-        /// <summary>
-        /// Gets an instance of <see cref="T:InstructorIQ.Core.Data.Entities.EmailTemplate"/> by using a unique index.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="key">The value to filter by.</param>
-        /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.EmailTemplate"/> or null if not found.</returns>
-        public static InstructorIQ.Core.Data.Entities.EmailTemplate GetByKey(this IQueryable<InstructorIQ.Core.Data.Entities.EmailTemplate> queryable, string key)
-        {
-            return queryable.FirstOrDefault(q => q.Key == key);
-        }
+    /// <summary>
+    /// Gets an instance of <see cref="T:InstructorIQ.Core.Data.Entities.EmailTemplate"/> by using a unique index.
+    /// </summary>
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="key">The value to filter by.</param>
+    /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.EmailTemplate"/> or null if not found.</returns>
+    public static InstructorIQ.Core.Data.Entities.EmailTemplate GetByKey(this IQueryable<InstructorIQ.Core.Data.Entities.EmailTemplate> queryable, string key)
+    {
+        return queryable.FirstOrDefault(q => q.Key == key);
+    }
 
-        /// <summary>
-        /// Gets an instance of <see cref="T:InstructorIQ.Core.Data.Entities.EmailTemplate"/> by using a unique index.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="key">The value to filter by.</param>
-        /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.EmailTemplate"/> or null if not found.</returns>
-        public static Task<InstructorIQ.Core.Data.Entities.EmailTemplate> GetByKeyAsync(this IQueryable<InstructorIQ.Core.Data.Entities.EmailTemplate> queryable, string key)
-        {
-            return queryable.FirstOrDefaultAsync(q => q.Key == key);
-        }
+    /// <summary>
+    /// Gets an instance of <see cref="T:InstructorIQ.Core.Data.Entities.EmailTemplate"/> by using a unique index.
+    /// </summary>
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="key">The value to filter by.</param>
+    /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.EmailTemplate"/> or null if not found.</returns>
+    public static Task<InstructorIQ.Core.Data.Entities.EmailTemplate> GetByKeyAsync(this IQueryable<InstructorIQ.Core.Data.Entities.EmailTemplate> queryable, string key)
+    {
+        return queryable.FirstOrDefaultAsync(q => q.Key == key);
+    }
 
-        /// <summary>
-        /// Filters a sequence of values based on a predicate.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="tenantId">The value to filter by.</param>
-        /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
-        public static IQueryable<InstructorIQ.Core.Data.Entities.EmailTemplate> ByTenantId(this IQueryable<InstructorIQ.Core.Data.Entities.EmailTemplate> queryable, Guid? tenantId)
-        {
-            return queryable.Where(q => (q.TenantId == tenantId || (tenantId == null && q.TenantId == null)));
-        }
+    /// <summary>
+    /// Filters a sequence of values based on a predicate.
+    /// </summary>
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="tenantId">The value to filter by.</param>
+    /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
+    public static IQueryable<InstructorIQ.Core.Data.Entities.EmailTemplate> ByTenantId(this IQueryable<InstructorIQ.Core.Data.Entities.EmailTemplate> queryable, Guid? tenantId)
+    {
+        return queryable.Where(q => (q.TenantId == tenantId || (tenantId == null && q.TenantId == null)));
+    }
 
-        #endregion
+    #endregion
 
-    }
 }
diff --git a/service/src/InstructorIQ.Core/Data/Queries/GroupExtensions.cs b/service/src/InstructorIQ.Core/Data/Queries/GroupExtensions.cs
index 6ba9c810..63e27d66 100644
--- a/service/src/InstructorIQ.Core/Data/Queries/GroupExtensions.cs
+++ b/service/src/InstructorIQ.Core/Data/Queries/GroupExtensions.cs
@@ -2,68 +2,68 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+
 using Microsoft.EntityFrameworkCore;
 
-namespace InstructorIQ.Core.Data.Queries
+namespace InstructorIQ.Core.Data.Queries;
+
+/// <summary>
+/// Query extensions for entity <see cref="InstructorIQ.Core.Data.Entities.Group" />.
+/// </summary>
+public static partial class GroupExtensions
 {
+    #region Generated Extensions
     /// <summary>
-    /// Query extensions for entity <see cref="InstructorIQ.Core.Data.Entities.Group" />.
+    /// Gets an instance by the primary key.
     /// </summary>
-    public static partial class GroupExtensions
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="id">The value to filter by.</param>
+    /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.Group"/> or null if not found.</returns>
+    public static InstructorIQ.Core.Data.Entities.Group GetByKey(this IQueryable<InstructorIQ.Core.Data.Entities.Group> queryable, Guid id)
     {
-        #region Generated Extensions
-        /// <summary>
-        /// Gets an instance by the primary key.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="id">The value to filter by.</param>
-        /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.Group"/> or null if not found.</returns>
-        public static InstructorIQ.Core.Data.Entities.Group GetByKey(this IQueryable<InstructorIQ.Core.Data.Entities.Group> queryable, Guid id)
-        {
-            if (queryable is DbSet<InstructorIQ.Core.Data.Entities.Group> dbSet)
-                return dbSet.Find(id);
+        if (queryable is DbSet<InstructorIQ.Core.Data.Entities.Group> dbSet)
+            return dbSet.Find(id);
 
-            return queryable.FirstOrDefault(q => q.Id == id);
-        }
+        return queryable.FirstOrDefault(q => q.Id == id);
+    }
 
-        /// <summary>
-        /// Gets an instance by the primary key.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="id">The value to filter by.</param>
-        /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.Group"/> or null if not found.</returns>
-        public static ValueTask<InstructorIQ.Core.Data.Entities.Group> GetByKeyAsync(this IQueryable<InstructorIQ.Core.Data.Entities.Group> queryable, Guid id)
-        {
-            if (queryable is DbSet<InstructorIQ.Core.Data.Entities.Group> dbSet)
-                return dbSet.FindAsync(id);
+    /// <summary>
+    /// Gets an instance by the primary key.
+    /// </summary>
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="id">The value to filter by.</param>
+    /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.Group"/> or null if not found.</returns>
+    public static ValueTask<InstructorIQ.Core.Data.Entities.Group> GetByKeyAsync(this IQueryable<InstructorIQ.Core.Data.Entities.Group> queryable, Guid id)
+    {
+        if (queryable is DbSet<InstructorIQ.Core.Data.Entities.Group> dbSet)
+            return dbSet.FindAsync(id);
 
-            var task = queryable.FirstOrDefaultAsync(q => q.Id == id);
-            return new ValueTask<InstructorIQ.Core.Data.Entities.Group>(task);
-        }
+        var task = queryable.FirstOrDefaultAsync(q => q.Id == id);
+        return new ValueTask<InstructorIQ.Core.Data.Entities.Group>(task);
+    }
 
-        /// <summary>
-        /// Filters a sequence of values based on a predicate.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="name">The value to filter by.</param>
-        /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
-        public static IQueryable<InstructorIQ.Core.Data.Entities.Group> ByName(this IQueryable<InstructorIQ.Core.Data.Entities.Group> queryable, string name)
-        {
-            return queryable.Where(q => q.Name == name);
-        }
+    /// <summary>
+    /// Filters a sequence of values based on a predicate.
+    /// </summary>
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="name">The value to filter by.</param>
+    /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
+    public static IQueryable<InstructorIQ.Core.Data.Entities.Group> ByName(this IQueryable<InstructorIQ.Core.Data.Entities.Group> queryable, string name)
+    {
+        return queryable.Where(q => q.Name == name);
+    }
 
-        /// <summary>
-        /// Filters a sequence of values based on a predicate.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="tenantId">The value to filter by.</param>
-        /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
-        public static IQueryable<InstructorIQ.Core.Data.Entities.Group> ByTenantId(this IQueryable<InstructorIQ.Core.Data.Entities.Group> queryable, Guid tenantId)
-        {
-            return queryable.Where(q => q.TenantId == tenantId);
-        }
+    /// <summary>
+    /// Filters a sequence of values based on a predicate.
+    /// </summary>
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="tenantId">The value to filter by.</param>
+    /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
+    public static IQueryable<InstructorIQ.Core.Data.Entities.Group> ByTenantId(this IQueryable<InstructorIQ.Core.Data.Entities.Group> queryable, Guid tenantId)
+    {
+        return queryable.Where(q => q.TenantId == tenantId);
+    }
 
-        #endregion
+    #endregion
 
-    }
 }
diff --git a/service/src/InstructorIQ.Core/Data/Queries/HistoryRecordExtensions.cs b/service/src/InstructorIQ.Core/Data/Queries/HistoryRecordExtensions.cs
index dcd92816..2cd59c7f 100644
--- a/service/src/InstructorIQ.Core/Data/Queries/HistoryRecordExtensions.cs
+++ b/service/src/InstructorIQ.Core/Data/Queries/HistoryRecordExtensions.cs
@@ -2,59 +2,59 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+
 using Microsoft.EntityFrameworkCore;
 
-namespace InstructorIQ.Core.Data.Queries
+namespace InstructorIQ.Core.Data.Queries;
+
+/// <summary>
+/// Query extensions for entity <see cref="InstructorIQ.Core.Data.Entities.HistoryRecord" />.
+/// </summary>
+public static partial class HistoryRecordExtensions
 {
+    #region Generated Extensions
+    /// <summary>
+    /// Gets an instance by the primary key.
+    /// </summary>
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="id">The value to filter by.</param>
+    /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.HistoryRecord"/> or null if not found.</returns>
+    public static InstructorIQ.Core.Data.Entities.HistoryRecord GetByKey(this IQueryable<InstructorIQ.Core.Data.Entities.HistoryRecord> queryable, Guid id)
+    {
+        if (queryable is DbSet<InstructorIQ.Core.Data.Entities.HistoryRecord> dbSet)
+            return dbSet.Find(id);
+
+        return queryable.FirstOrDefault(q => q.Id == id);
+    }
+
     /// <summary>
-    /// Query extensions for entity <see cref="InstructorIQ.Core.Data.Entities.HistoryRecord" />.
+    /// Gets an instance by the primary key.
     /// </summary>
-    public static partial class HistoryRecordExtensions
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="id">The value to filter by.</param>
+    /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.HistoryRecord"/> or null if not found.</returns>
+    public static ValueTask<InstructorIQ.Core.Data.Entities.HistoryRecord> GetByKeyAsync(this IQueryable<InstructorIQ.Core.Data.Entities.HistoryRecord> queryable, Guid id)
     {
-        #region Generated Extensions
-        /// <summary>
-        /// Gets an instance by the primary key.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="id">The value to filter by.</param>
-        /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.HistoryRecord"/> or null if not found.</returns>
-        public static InstructorIQ.Core.Data.Entities.HistoryRecord GetByKey(this IQueryable<InstructorIQ.Core.Data.Entities.HistoryRecord> queryable, Guid id)
-        {
-            if (queryable is DbSet<InstructorIQ.Core.Data.Entities.HistoryRecord> dbSet)
-                return dbSet.Find(id);
-
-            return queryable.FirstOrDefault(q => q.Id == id);
-        }
-
-        /// <summary>
-        /// Gets an instance by the primary key.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="id">The value to filter by.</param>
-        /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.HistoryRecord"/> or null if not found.</returns>
-        public static ValueTask<InstructorIQ.Core.Data.Entities.HistoryRecord> GetByKeyAsync(this IQueryable<InstructorIQ.Core.Data.Entities.HistoryRecord> queryable, Guid id)
-        {
-            if (queryable is DbSet<InstructorIQ.Core.Data.Entities.HistoryRecord> dbSet)
-                return dbSet.FindAsync(id);
-
-            var task = queryable.FirstOrDefaultAsync(q => q.Id == id);
-            return new ValueTask<InstructorIQ.Core.Data.Entities.HistoryRecord>(task);
-        }
-
-        /// <summary>
-        /// Filters a sequence of values based on a predicate.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="key">The value to filter by.</param>
-        /// <param name="entity">The value to filter by.</param>
-        /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
-        public static IQueryable<InstructorIQ.Core.Data.Entities.HistoryRecord> ByKeyEntity(this IQueryable<InstructorIQ.Core.Data.Entities.HistoryRecord> queryable, Guid key, string entity)
-        {
-            return queryable.Where(q => q.Key == key
-                && q.Entity == entity);
-        }
-
-        #endregion
+        if (queryable is DbSet<InstructorIQ.Core.Data.Entities.HistoryRecord> dbSet)
+            return dbSet.FindAsync(id);
 
+        var task = queryable.FirstOrDefaultAsync(q => q.Id == id);
+        return new ValueTask<InstructorIQ.Core.Data.Entities.HistoryRecord>(task);
     }
+
+    /// <summary>
+    /// Filters a sequence of values based on a predicate.
+    /// </summary>
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="key">The value to filter by.</param>
+    /// <param name="entity">The value to filter by.</param>
+    /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
+    public static IQueryable<InstructorIQ.Core.Data.Entities.HistoryRecord> ByKeyEntity(this IQueryable<InstructorIQ.Core.Data.Entities.HistoryRecord> queryable, Guid key, string entity)
+    {
+        return queryable.Where(q => q.Key == key
+            && q.Entity == entity);
+    }
+
+    #endregion
+
 }
diff --git a/service/src/InstructorIQ.Core/Data/Queries/ImportJobExtensions.cs b/service/src/InstructorIQ.Core/Data/Queries/ImportJobExtensions.cs
index 7600a030..c8e51640 100644
--- a/service/src/InstructorIQ.Core/Data/Queries/ImportJobExtensions.cs
+++ b/service/src/InstructorIQ.Core/Data/Queries/ImportJobExtensions.cs
@@ -2,57 +2,57 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+
 using Microsoft.EntityFrameworkCore;
 
-namespace InstructorIQ.Core.Data.Queries
+namespace InstructorIQ.Core.Data.Queries;
+
+/// <summary>
+/// Query extensions for entity <see cref="InstructorIQ.Core.Data.Entities.ImportJob" />.
+/// </summary>
+public static partial class ImportJobExtensions
 {
+    #region Generated Extensions
+    /// <summary>
+    /// Gets an instance by the primary key.
+    /// </summary>
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="id">The value to filter by.</param>
+    /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.ImportJob"/> or null if not found.</returns>
+    public static InstructorIQ.Core.Data.Entities.ImportJob GetByKey(this IQueryable<InstructorIQ.Core.Data.Entities.ImportJob> queryable, Guid id)
+    {
+        if (queryable is DbSet<InstructorIQ.Core.Data.Entities.ImportJob> dbSet)
+            return dbSet.Find(id);
+
+        return queryable.FirstOrDefault(q => q.Id == id);
+    }
+
     /// <summary>
-    /// Query extensions for entity <see cref="InstructorIQ.Core.Data.Entities.ImportJob" />.
+    /// Gets an instance by the primary key.
     /// </summary>
-    public static partial class ImportJobExtensions
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="id">The value to filter by.</param>
+    /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.ImportJob"/> or null if not found.</returns>
+    public static ValueTask<InstructorIQ.Core.Data.Entities.ImportJob> GetByKeyAsync(this IQueryable<InstructorIQ.Core.Data.Entities.ImportJob> queryable, Guid id)
     {
-        #region Generated Extensions
-        /// <summary>
-        /// Gets an instance by the primary key.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="id">The value to filter by.</param>
-        /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.ImportJob"/> or null if not found.</returns>
-        public static InstructorIQ.Core.Data.Entities.ImportJob GetByKey(this IQueryable<InstructorIQ.Core.Data.Entities.ImportJob> queryable, Guid id)
-        {
-            if (queryable is DbSet<InstructorIQ.Core.Data.Entities.ImportJob> dbSet)
-                return dbSet.Find(id);
-
-            return queryable.FirstOrDefault(q => q.Id == id);
-        }
-
-        /// <summary>
-        /// Gets an instance by the primary key.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="id">The value to filter by.</param>
-        /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.ImportJob"/> or null if not found.</returns>
-        public static ValueTask<InstructorIQ.Core.Data.Entities.ImportJob> GetByKeyAsync(this IQueryable<InstructorIQ.Core.Data.Entities.ImportJob> queryable, Guid id)
-        {
-            if (queryable is DbSet<InstructorIQ.Core.Data.Entities.ImportJob> dbSet)
-                return dbSet.FindAsync(id);
-
-            var task = queryable.FirstOrDefaultAsync(q => q.Id == id);
-            return new ValueTask<InstructorIQ.Core.Data.Entities.ImportJob>(task);
-        }
-
-        /// <summary>
-        /// Filters a sequence of values based on a predicate.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="tenantId">The value to filter by.</param>
-        /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
-        public static IQueryable<InstructorIQ.Core.Data.Entities.ImportJob> ByTenantId(this IQueryable<InstructorIQ.Core.Data.Entities.ImportJob> queryable, Guid tenantId)
-        {
-            return queryable.Where(q => q.TenantId == tenantId);
-        }
-
-        #endregion
+        if (queryable is DbSet<InstructorIQ.Core.Data.Entities.ImportJob> dbSet)
+            return dbSet.FindAsync(id);
 
+        var task = queryable.FirstOrDefaultAsync(q => q.Id == id);
+        return new ValueTask<InstructorIQ.Core.Data.Entities.ImportJob>(task);
     }
+
+    /// <summary>
+    /// Filters a sequence of values based on a predicate.
+    /// </summary>
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="tenantId">The value to filter by.</param>
+    /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
+    public static IQueryable<InstructorIQ.Core.Data.Entities.ImportJob> ByTenantId(this IQueryable<InstructorIQ.Core.Data.Entities.ImportJob> queryable, Guid tenantId)
+    {
+        return queryable.Where(q => q.TenantId == tenantId);
+    }
+
+    #endregion
+
 }
diff --git a/service/src/InstructorIQ.Core/Data/Queries/InstructorRoleExtensions.cs b/service/src/InstructorIQ.Core/Data/Queries/InstructorRoleExtensions.cs
index be8ca44d..2b327d86 100644
--- a/service/src/InstructorIQ.Core/Data/Queries/InstructorRoleExtensions.cs
+++ b/service/src/InstructorIQ.Core/Data/Queries/InstructorRoleExtensions.cs
@@ -2,68 +2,68 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+
 using Microsoft.EntityFrameworkCore;
 
-namespace InstructorIQ.Core.Data.Queries
+namespace InstructorIQ.Core.Data.Queries;
+
+/// <summary>
+/// Query extensions for entity <see cref="InstructorIQ.Core.Data.Entities.InstructorRole" />.
+/// </summary>
+public static partial class InstructorRoleExtensions
 {
+    #region Generated Extensions
     /// <summary>
-    /// Query extensions for entity <see cref="InstructorIQ.Core.Data.Entities.InstructorRole" />.
+    /// Gets an instance by the primary key.
     /// </summary>
-    public static partial class InstructorRoleExtensions
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="id">The value to filter by.</param>
+    /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.InstructorRole"/> or null if not found.</returns>
+    public static InstructorIQ.Core.Data.Entities.InstructorRole GetByKey(this IQueryable<InstructorIQ.Core.Data.Entities.InstructorRole> queryable, Guid id)
     {
-        #region Generated Extensions
-        /// <summary>
-        /// Gets an instance by the primary key.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="id">The value to filter by.</param>
-        /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.InstructorRole"/> or null if not found.</returns>
-        public static InstructorIQ.Core.Data.Entities.InstructorRole GetByKey(this IQueryable<InstructorIQ.Core.Data.Entities.InstructorRole> queryable, Guid id)
-        {
-            if (queryable is DbSet<InstructorIQ.Core.Data.Entities.InstructorRole> dbSet)
-                return dbSet.Find(id);
+        if (queryable is DbSet<InstructorIQ.Core.Data.Entities.InstructorRole> dbSet)
+            return dbSet.Find(id);
 
-            return queryable.FirstOrDefault(q => q.Id == id);
-        }
+        return queryable.FirstOrDefault(q => q.Id == id);
+    }
 
-        /// <summary>
-        /// Gets an instance by the primary key.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="id">The value to filter by.</param>
-        /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.InstructorRole"/> or null if not found.</returns>
-        public static ValueTask<InstructorIQ.Core.Data.Entities.InstructorRole> GetByKeyAsync(this IQueryable<InstructorIQ.Core.Data.Entities.InstructorRole> queryable, Guid id)
-        {
-            if (queryable is DbSet<InstructorIQ.Core.Data.Entities.InstructorRole> dbSet)
-                return dbSet.FindAsync(id);
+    /// <summary>
+    /// Gets an instance by the primary key.
+    /// </summary>
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="id">The value to filter by.</param>
+    /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.InstructorRole"/> or null if not found.</returns>
+    public static ValueTask<InstructorIQ.Core.Data.Entities.InstructorRole> GetByKeyAsync(this IQueryable<InstructorIQ.Core.Data.Entities.InstructorRole> queryable, Guid id)
+    {
+        if (queryable is DbSet<InstructorIQ.Core.Data.Entities.InstructorRole> dbSet)
+            return dbSet.FindAsync(id);
 
-            var task = queryable.FirstOrDefaultAsync(q => q.Id == id);
-            return new ValueTask<InstructorIQ.Core.Data.Entities.InstructorRole>(task);
-        }
+        var task = queryable.FirstOrDefaultAsync(q => q.Id == id);
+        return new ValueTask<InstructorIQ.Core.Data.Entities.InstructorRole>(task);
+    }
 
-        /// <summary>
-        /// Filters a sequence of values based on a predicate.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="name">The value to filter by.</param>
-        /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
-        public static IQueryable<InstructorIQ.Core.Data.Entities.InstructorRole> ByName(this IQueryable<InstructorIQ.Core.Data.Entities.InstructorRole> queryable, string name)
-        {
-            return queryable.Where(q => q.Name == name);
-        }
+    /// <summary>
+    /// Filters a sequence of values based on a predicate.
+    /// </summary>
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="name">The value to filter by.</param>
+    /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
+    public static IQueryable<InstructorIQ.Core.Data.Entities.InstructorRole> ByName(this IQueryable<InstructorIQ.Core.Data.Entities.InstructorRole> queryable, string name)
+    {
+        return queryable.Where(q => q.Name == name);
+    }
 
-        /// <summary>
-        /// Filters a sequence of values based on a predicate.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="tenantId">The value to filter by.</param>
-        /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
-        public static IQueryable<InstructorIQ.Core.Data.Entities.InstructorRole> ByTenantId(this IQueryable<InstructorIQ.Core.Data.Entities.InstructorRole> queryable, Guid tenantId)
-        {
-            return queryable.Where(q => q.TenantId == tenantId);
-        }
+    /// <summary>
+    /// Filters a sequence of values based on a predicate.
+    /// </summary>
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="tenantId">The value to filter by.</param>
+    /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
+    public static IQueryable<InstructorIQ.Core.Data.Entities.InstructorRole> ByTenantId(this IQueryable<InstructorIQ.Core.Data.Entities.InstructorRole> queryable, Guid tenantId)
+    {
+        return queryable.Where(q => q.TenantId == tenantId);
+    }
 
-        #endregion
+    #endregion
 
-    }
 }
diff --git a/service/src/InstructorIQ.Core/Data/Queries/LinkTokenExtensions.cs b/service/src/InstructorIQ.Core/Data/Queries/LinkTokenExtensions.cs
index 63361e56..3554e472 100644
--- a/service/src/InstructorIQ.Core/Data/Queries/LinkTokenExtensions.cs
+++ b/service/src/InstructorIQ.Core/Data/Queries/LinkTokenExtensions.cs
@@ -2,90 +2,90 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+
 using Microsoft.EntityFrameworkCore;
 
-namespace InstructorIQ.Core.Data.Queries
+namespace InstructorIQ.Core.Data.Queries;
+
+/// <summary>
+/// Query extensions for entity <see cref="InstructorIQ.Core.Data.Entities.LinkToken" />.
+/// </summary>
+public static partial class LinkTokenExtensions
 {
+    #region Generated Extensions
     /// <summary>
-    /// Query extensions for entity <see cref="InstructorIQ.Core.Data.Entities.LinkToken" />.
+    /// Gets an instance by the primary key.
     /// </summary>
-    public static partial class LinkTokenExtensions
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="id">The value to filter by.</param>
+    /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.LinkToken"/> or null if not found.</returns>
+    public static InstructorIQ.Core.Data.Entities.LinkToken GetByKey(this IQueryable<InstructorIQ.Core.Data.Entities.LinkToken> queryable, Guid id)
     {
-        #region Generated Extensions
-        /// <summary>
-        /// Gets an instance by the primary key.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="id">The value to filter by.</param>
-        /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.LinkToken"/> or null if not found.</returns>
-        public static InstructorIQ.Core.Data.Entities.LinkToken GetByKey(this IQueryable<InstructorIQ.Core.Data.Entities.LinkToken> queryable, Guid id)
-        {
-            if (queryable is DbSet<InstructorIQ.Core.Data.Entities.LinkToken> dbSet)
-                return dbSet.Find(id);
+        if (queryable is DbSet<InstructorIQ.Core.Data.Entities.LinkToken> dbSet)
+            return dbSet.Find(id);
 
-            return queryable.FirstOrDefault(q => q.Id == id);
-        }
+        return queryable.FirstOrDefault(q => q.Id == id);
+    }
 
-        /// <summary>
-        /// Gets an instance by the primary key.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="id">The value to filter by.</param>
-        /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.LinkToken"/> or null if not found.</returns>
-        public static ValueTask<InstructorIQ.Core.Data.Entities.LinkToken> GetByKeyAsync(this IQueryable<InstructorIQ.Core.Data.Entities.LinkToken> queryable, Guid id)
-        {
-            if (queryable is DbSet<InstructorIQ.Core.Data.Entities.LinkToken> dbSet)
-                return dbSet.FindAsync(id);
+    /// <summary>
+    /// Gets an instance by the primary key.
+    /// </summary>
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="id">The value to filter by.</param>
+    /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.LinkToken"/> or null if not found.</returns>
+    public static ValueTask<InstructorIQ.Core.Data.Entities.LinkToken> GetByKeyAsync(this IQueryable<InstructorIQ.Core.Data.Entities.LinkToken> queryable, Guid id)
+    {
+        if (queryable is DbSet<InstructorIQ.Core.Data.Entities.LinkToken> dbSet)
+            return dbSet.FindAsync(id);
 
-            var task = queryable.FirstOrDefaultAsync(q => q.Id == id);
-            return new ValueTask<InstructorIQ.Core.Data.Entities.LinkToken>(task);
-        }
+        var task = queryable.FirstOrDefaultAsync(q => q.Id == id);
+        return new ValueTask<InstructorIQ.Core.Data.Entities.LinkToken>(task);
+    }
 
-        /// <summary>
-        /// Filters a sequence of values based on a predicate.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="tenantId">The value to filter by.</param>
-        /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
-        public static IQueryable<InstructorIQ.Core.Data.Entities.LinkToken> ByTenantId(this IQueryable<InstructorIQ.Core.Data.Entities.LinkToken> queryable, Guid? tenantId)
-        {
-            return queryable.Where(q => (q.TenantId == tenantId || (tenantId == null && q.TenantId == null)));
-        }
+    /// <summary>
+    /// Filters a sequence of values based on a predicate.
+    /// </summary>
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="tenantId">The value to filter by.</param>
+    /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
+    public static IQueryable<InstructorIQ.Core.Data.Entities.LinkToken> ByTenantId(this IQueryable<InstructorIQ.Core.Data.Entities.LinkToken> queryable, Guid? tenantId)
+    {
+        return queryable.Where(q => (q.TenantId == tenantId || (tenantId == null && q.TenantId == null)));
+    }
 
-        /// <summary>
-        /// Gets an instance of <see cref="T:InstructorIQ.Core.Data.Entities.LinkToken"/> by using a unique index.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="tokenHash">The value to filter by.</param>
-        /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.LinkToken"/> or null if not found.</returns>
-        public static InstructorIQ.Core.Data.Entities.LinkToken GetByTokenHash(this IQueryable<InstructorIQ.Core.Data.Entities.LinkToken> queryable, string tokenHash)
-        {
-            return queryable.FirstOrDefault(q => q.TokenHash == tokenHash);
-        }
+    /// <summary>
+    /// Gets an instance of <see cref="T:InstructorIQ.Core.Data.Entities.LinkToken"/> by using a unique index.
+    /// </summary>
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="tokenHash">The value to filter by.</param>
+    /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.LinkToken"/> or null if not found.</returns>
+    public static InstructorIQ.Core.Data.Entities.LinkToken GetByTokenHash(this IQueryable<InstructorIQ.Core.Data.Entities.LinkToken> queryable, string tokenHash)
+    {
+        return queryable.FirstOrDefault(q => q.TokenHash == tokenHash);
+    }
 
-        /// <summary>
-        /// Gets an instance of <see cref="T:InstructorIQ.Core.Data.Entities.LinkToken"/> by using a unique index.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="tokenHash">The value to filter by.</param>
-        /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.LinkToken"/> or null if not found.</returns>
-        public static Task<InstructorIQ.Core.Data.Entities.LinkToken> GetByTokenHashAsync(this IQueryable<InstructorIQ.Core.Data.Entities.LinkToken> queryable, string tokenHash)
-        {
-            return queryable.FirstOrDefaultAsync(q => q.TokenHash == tokenHash);
-        }
+    /// <summary>
+    /// Gets an instance of <see cref="T:InstructorIQ.Core.Data.Entities.LinkToken"/> by using a unique index.
+    /// </summary>
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="tokenHash">The value to filter by.</param>
+    /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.LinkToken"/> or null if not found.</returns>
+    public static Task<InstructorIQ.Core.Data.Entities.LinkToken> GetByTokenHashAsync(this IQueryable<InstructorIQ.Core.Data.Entities.LinkToken> queryable, string tokenHash)
+    {
+        return queryable.FirstOrDefaultAsync(q => q.TokenHash == tokenHash);
+    }
 
-        /// <summary>
-        /// Filters a sequence of values based on a predicate.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="userName">The value to filter by.</param>
-        /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
-        public static IQueryable<InstructorIQ.Core.Data.Entities.LinkToken> ByUserName(this IQueryable<InstructorIQ.Core.Data.Entities.LinkToken> queryable, string userName)
-        {
-            return queryable.Where(q => q.UserName == userName);
-        }
+    /// <summary>
+    /// Filters a sequence of values based on a predicate.
+    /// </summary>
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="userName">The value to filter by.</param>
+    /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
+    public static IQueryable<InstructorIQ.Core.Data.Entities.LinkToken> ByUserName(this IQueryable<InstructorIQ.Core.Data.Entities.LinkToken> queryable, string userName)
+    {
+        return queryable.Where(q => q.UserName == userName);
+    }
 
-        #endregion
+    #endregion
 
-    }
 }
diff --git a/service/src/InstructorIQ.Core/Data/Queries/LocationExtensions.cs b/service/src/InstructorIQ.Core/Data/Queries/LocationExtensions.cs
index 409dcbcc..cedd888d 100644
--- a/service/src/InstructorIQ.Core/Data/Queries/LocationExtensions.cs
+++ b/service/src/InstructorIQ.Core/Data/Queries/LocationExtensions.cs
@@ -2,68 +2,68 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+
 using Microsoft.EntityFrameworkCore;
 
-namespace InstructorIQ.Core.Data.Queries
+namespace InstructorIQ.Core.Data.Queries;
+
+/// <summary>
+/// Query extensions for entity <see cref="InstructorIQ.Core.Data.Entities.Location" />.
+/// </summary>
+public static partial class LocationExtensions
 {
+    #region Generated Extensions
     /// <summary>
-    /// Query extensions for entity <see cref="InstructorIQ.Core.Data.Entities.Location" />.
+    /// Gets an instance by the primary key.
     /// </summary>
-    public static partial class LocationExtensions
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="id">The value to filter by.</param>
+    /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.Location"/> or null if not found.</returns>
+    public static InstructorIQ.Core.Data.Entities.Location GetByKey(this IQueryable<InstructorIQ.Core.Data.Entities.Location> queryable, Guid id)
     {
-        #region Generated Extensions
-        /// <summary>
-        /// Gets an instance by the primary key.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="id">The value to filter by.</param>
-        /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.Location"/> or null if not found.</returns>
-        public static InstructorIQ.Core.Data.Entities.Location GetByKey(this IQueryable<InstructorIQ.Core.Data.Entities.Location> queryable, Guid id)
-        {
-            if (queryable is DbSet<InstructorIQ.Core.Data.Entities.Location> dbSet)
-                return dbSet.Find(id);
+        if (queryable is DbSet<InstructorIQ.Core.Data.Entities.Location> dbSet)
+            return dbSet.Find(id);
 
-            return queryable.FirstOrDefault(q => q.Id == id);
-        }
+        return queryable.FirstOrDefault(q => q.Id == id);
+    }
 
-        /// <summary>
-        /// Gets an instance by the primary key.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="id">The value to filter by.</param>
-        /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.Location"/> or null if not found.</returns>
-        public static ValueTask<InstructorIQ.Core.Data.Entities.Location> GetByKeyAsync(this IQueryable<InstructorIQ.Core.Data.Entities.Location> queryable, Guid id)
-        {
-            if (queryable is DbSet<InstructorIQ.Core.Data.Entities.Location> dbSet)
-                return dbSet.FindAsync(id);
+    /// <summary>
+    /// Gets an instance by the primary key.
+    /// </summary>
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="id">The value to filter by.</param>
+    /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.Location"/> or null if not found.</returns>
+    public static ValueTask<InstructorIQ.Core.Data.Entities.Location> GetByKeyAsync(this IQueryable<InstructorIQ.Core.Data.Entities.Location> queryable, Guid id)
+    {
+        if (queryable is DbSet<InstructorIQ.Core.Data.Entities.Location> dbSet)
+            return dbSet.FindAsync(id);
 
-            var task = queryable.FirstOrDefaultAsync(q => q.Id == id);
-            return new ValueTask<InstructorIQ.Core.Data.Entities.Location>(task);
-        }
+        var task = queryable.FirstOrDefaultAsync(q => q.Id == id);
+        return new ValueTask<InstructorIQ.Core.Data.Entities.Location>(task);
+    }
 
-        /// <summary>
-        /// Filters a sequence of values based on a predicate.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="name">The value to filter by.</param>
-        /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
-        public static IQueryable<InstructorIQ.Core.Data.Entities.Location> ByName(this IQueryable<InstructorIQ.Core.Data.Entities.Location> queryable, string name)
-        {
-            return queryable.Where(q => q.Name == name);
-        }
+    /// <summary>
+    /// Filters a sequence of values based on a predicate.
+    /// </summary>
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="name">The value to filter by.</param>
+    /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
+    public static IQueryable<InstructorIQ.Core.Data.Entities.Location> ByName(this IQueryable<InstructorIQ.Core.Data.Entities.Location> queryable, string name)
+    {
+        return queryable.Where(q => q.Name == name);
+    }
 
-        /// <summary>
-        /// Filters a sequence of values based on a predicate.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="tenantId">The value to filter by.</param>
-        /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
-        public static IQueryable<InstructorIQ.Core.Data.Entities.Location> ByTenantId(this IQueryable<InstructorIQ.Core.Data.Entities.Location> queryable, Guid tenantId)
-        {
-            return queryable.Where(q => q.TenantId == tenantId);
-        }
+    /// <summary>
+    /// Filters a sequence of values based on a predicate.
+    /// </summary>
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="tenantId">The value to filter by.</param>
+    /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
+    public static IQueryable<InstructorIQ.Core.Data.Entities.Location> ByTenantId(this IQueryable<InstructorIQ.Core.Data.Entities.Location> queryable, Guid tenantId)
+    {
+        return queryable.Where(q => q.TenantId == tenantId);
+    }
 
-        #endregion
+    #endregion
 
-    }
 }
diff --git a/service/src/InstructorIQ.Core/Data/Queries/NotificationExtensions.cs b/service/src/InstructorIQ.Core/Data/Queries/NotificationExtensions.cs
index 2c52bb32..0d1112cb 100644
--- a/service/src/InstructorIQ.Core/Data/Queries/NotificationExtensions.cs
+++ b/service/src/InstructorIQ.Core/Data/Queries/NotificationExtensions.cs
@@ -2,68 +2,68 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+
 using Microsoft.EntityFrameworkCore;
 
-namespace InstructorIQ.Core.Data.Queries
+namespace InstructorIQ.Core.Data.Queries;
+
+/// <summary>
+/// Query extensions for entity <see cref="InstructorIQ.Core.Data.Entities.Notification" />.
+/// </summary>
+public static partial class NotificationExtensions
 {
+    #region Generated Extensions
     /// <summary>
-    /// Query extensions for entity <see cref="InstructorIQ.Core.Data.Entities.Notification" />.
+    /// Gets an instance by the primary key.
     /// </summary>
-    public static partial class NotificationExtensions
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="id">The value to filter by.</param>
+    /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.Notification"/> or null if not found.</returns>
+    public static InstructorIQ.Core.Data.Entities.Notification GetByKey(this IQueryable<InstructorIQ.Core.Data.Entities.Notification> queryable, Guid id)
     {
-        #region Generated Extensions
-        /// <summary>
-        /// Gets an instance by the primary key.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="id">The value to filter by.</param>
-        /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.Notification"/> or null if not found.</returns>
-        public static InstructorIQ.Core.Data.Entities.Notification GetByKey(this IQueryable<InstructorIQ.Core.Data.Entities.Notification> queryable, Guid id)
-        {
-            if (queryable is DbSet<InstructorIQ.Core.Data.Entities.Notification> dbSet)
-                return dbSet.Find(id);
+        if (queryable is DbSet<InstructorIQ.Core.Data.Entities.Notification> dbSet)
+            return dbSet.Find(id);
 
-            return queryable.FirstOrDefault(q => q.Id == id);
-        }
+        return queryable.FirstOrDefault(q => q.Id == id);
+    }
 
-        /// <summary>
-        /// Gets an instance by the primary key.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="id">The value to filter by.</param>
-        /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.Notification"/> or null if not found.</returns>
-        public static ValueTask<InstructorIQ.Core.Data.Entities.Notification> GetByKeyAsync(this IQueryable<InstructorIQ.Core.Data.Entities.Notification> queryable, Guid id)
-        {
-            if (queryable is DbSet<InstructorIQ.Core.Data.Entities.Notification> dbSet)
-                return dbSet.FindAsync(id);
+    /// <summary>
+    /// Gets an instance by the primary key.
+    /// </summary>
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="id">The value to filter by.</param>
+    /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.Notification"/> or null if not found.</returns>
+    public static ValueTask<InstructorIQ.Core.Data.Entities.Notification> GetByKeyAsync(this IQueryable<InstructorIQ.Core.Data.Entities.Notification> queryable, Guid id)
+    {
+        if (queryable is DbSet<InstructorIQ.Core.Data.Entities.Notification> dbSet)
+            return dbSet.FindAsync(id);
 
-            var task = queryable.FirstOrDefaultAsync(q => q.Id == id);
-            return new ValueTask<InstructorIQ.Core.Data.Entities.Notification>(task);
-        }
+        var task = queryable.FirstOrDefaultAsync(q => q.Id == id);
+        return new ValueTask<InstructorIQ.Core.Data.Entities.Notification>(task);
+    }
 
-        /// <summary>
-        /// Filters a sequence of values based on a predicate.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="tenantId">The value to filter by.</param>
-        /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
-        public static IQueryable<InstructorIQ.Core.Data.Entities.Notification> ByTenantId(this IQueryable<InstructorIQ.Core.Data.Entities.Notification> queryable, Guid tenantId)
-        {
-            return queryable.Where(q => q.TenantId == tenantId);
-        }
+    /// <summary>
+    /// Filters a sequence of values based on a predicate.
+    /// </summary>
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="tenantId">The value to filter by.</param>
+    /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
+    public static IQueryable<InstructorIQ.Core.Data.Entities.Notification> ByTenantId(this IQueryable<InstructorIQ.Core.Data.Entities.Notification> queryable, Guid tenantId)
+    {
+        return queryable.Where(q => q.TenantId == tenantId);
+    }
 
-        /// <summary>
-        /// Filters a sequence of values based on a predicate.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="userName">The value to filter by.</param>
-        /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
-        public static IQueryable<InstructorIQ.Core.Data.Entities.Notification> ByUserName(this IQueryable<InstructorIQ.Core.Data.Entities.Notification> queryable, string userName)
-        {
-            return queryable.Where(q => q.UserName == userName);
-        }
+    /// <summary>
+    /// Filters a sequence of values based on a predicate.
+    /// </summary>
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="userName">The value to filter by.</param>
+    /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
+    public static IQueryable<InstructorIQ.Core.Data.Entities.Notification> ByUserName(this IQueryable<InstructorIQ.Core.Data.Entities.Notification> queryable, string userName)
+    {
+        return queryable.Where(q => q.UserName == userName);
+    }
 
-        #endregion
+    #endregion
 
-    }
 }
diff --git a/service/src/InstructorIQ.Core/Data/Queries/RefreshTokenExtensions.cs b/service/src/InstructorIQ.Core/Data/Queries/RefreshTokenExtensions.cs
index abb14cc3..557bb29d 100644
--- a/service/src/InstructorIQ.Core/Data/Queries/RefreshTokenExtensions.cs
+++ b/service/src/InstructorIQ.Core/Data/Queries/RefreshTokenExtensions.cs
@@ -2,79 +2,79 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+
 using Microsoft.EntityFrameworkCore;
 
-namespace InstructorIQ.Core.Data.Queries
+namespace InstructorIQ.Core.Data.Queries;
+
+/// <summary>
+/// Query extensions for entity <see cref="InstructorIQ.Core.Data.Entities.RefreshToken" />.
+/// </summary>
+public static partial class RefreshTokenExtensions
 {
+    #region Generated Extensions
     /// <summary>
-    /// Query extensions for entity <see cref="InstructorIQ.Core.Data.Entities.RefreshToken" />.
+    /// Gets an instance by the primary key.
     /// </summary>
-    public static partial class RefreshTokenExtensions
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="id">The value to filter by.</param>
+    /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.RefreshToken"/> or null if not found.</returns>
+    public static InstructorIQ.Core.Data.Entities.RefreshToken GetByKey(this IQueryable<InstructorIQ.Core.Data.Entities.RefreshToken> queryable, Guid id)
     {
-        #region Generated Extensions
-        /// <summary>
-        /// Gets an instance by the primary key.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="id">The value to filter by.</param>
-        /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.RefreshToken"/> or null if not found.</returns>
-        public static InstructorIQ.Core.Data.Entities.RefreshToken GetByKey(this IQueryable<InstructorIQ.Core.Data.Entities.RefreshToken> queryable, Guid id)
-        {
-            if (queryable is DbSet<InstructorIQ.Core.Data.Entities.RefreshToken> dbSet)
-                return dbSet.Find(id);
+        if (queryable is DbSet<InstructorIQ.Core.Data.Entities.RefreshToken> dbSet)
+            return dbSet.Find(id);
 
-            return queryable.FirstOrDefault(q => q.Id == id);
-        }
+        return queryable.FirstOrDefault(q => q.Id == id);
+    }
 
-        /// <summary>
-        /// Gets an instance by the primary key.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="id">The value to filter by.</param>
-        /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.RefreshToken"/> or null if not found.</returns>
-        public static ValueTask<InstructorIQ.Core.Data.Entities.RefreshToken> GetByKeyAsync(this IQueryable<InstructorIQ.Core.Data.Entities.RefreshToken> queryable, Guid id)
-        {
-            if (queryable is DbSet<InstructorIQ.Core.Data.Entities.RefreshToken> dbSet)
-                return dbSet.FindAsync(id);
+    /// <summary>
+    /// Gets an instance by the primary key.
+    /// </summary>
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="id">The value to filter by.</param>
+    /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.RefreshToken"/> or null if not found.</returns>
+    public static ValueTask<InstructorIQ.Core.Data.Entities.RefreshToken> GetByKeyAsync(this IQueryable<InstructorIQ.Core.Data.Entities.RefreshToken> queryable, Guid id)
+    {
+        if (queryable is DbSet<InstructorIQ.Core.Data.Entities.RefreshToken> dbSet)
+            return dbSet.FindAsync(id);
 
-            var task = queryable.FirstOrDefaultAsync(q => q.Id == id);
-            return new ValueTask<InstructorIQ.Core.Data.Entities.RefreshToken>(task);
-        }
+        var task = queryable.FirstOrDefaultAsync(q => q.Id == id);
+        return new ValueTask<InstructorIQ.Core.Data.Entities.RefreshToken>(task);
+    }
 
-        /// <summary>
-        /// Gets an instance of <see cref="T:InstructorIQ.Core.Data.Entities.RefreshToken"/> by using a unique index.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="tokenHash">The value to filter by.</param>
-        /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.RefreshToken"/> or null if not found.</returns>
-        public static InstructorIQ.Core.Data.Entities.RefreshToken GetByTokenHash(this IQueryable<InstructorIQ.Core.Data.Entities.RefreshToken> queryable, string tokenHash)
-        {
-            return queryable.FirstOrDefault(q => q.TokenHash == tokenHash);
-        }
+    /// <summary>
+    /// Gets an instance of <see cref="T:InstructorIQ.Core.Data.Entities.RefreshToken"/> by using a unique index.
+    /// </summary>
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="tokenHash">The value to filter by.</param>
+    /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.RefreshToken"/> or null if not found.</returns>
+    public static InstructorIQ.Core.Data.Entities.RefreshToken GetByTokenHash(this IQueryable<InstructorIQ.Core.Data.Entities.RefreshToken> queryable, string tokenHash)
+    {
+        return queryable.FirstOrDefault(q => q.TokenHash == tokenHash);
+    }
 
-        /// <summary>
-        /// Gets an instance of <see cref="T:InstructorIQ.Core.Data.Entities.RefreshToken"/> by using a unique index.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="tokenHash">The value to filter by.</param>
-        /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.RefreshToken"/> or null if not found.</returns>
-        public static Task<InstructorIQ.Core.Data.Entities.RefreshToken> GetByTokenHashAsync(this IQueryable<InstructorIQ.Core.Data.Entities.RefreshToken> queryable, string tokenHash)
-        {
-            return queryable.FirstOrDefaultAsync(q => q.TokenHash == tokenHash);
-        }
+    /// <summary>
+    /// Gets an instance of <see cref="T:InstructorIQ.Core.Data.Entities.RefreshToken"/> by using a unique index.
+    /// </summary>
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="tokenHash">The value to filter by.</param>
+    /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.RefreshToken"/> or null if not found.</returns>
+    public static Task<InstructorIQ.Core.Data.Entities.RefreshToken> GetByTokenHashAsync(this IQueryable<InstructorIQ.Core.Data.Entities.RefreshToken> queryable, string tokenHash)
+    {
+        return queryable.FirstOrDefaultAsync(q => q.TokenHash == tokenHash);
+    }
 
-        /// <summary>
-        /// Filters a sequence of values based on a predicate.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="userName">The value to filter by.</param>
-        /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
-        public static IQueryable<InstructorIQ.Core.Data.Entities.RefreshToken> ByUserName(this IQueryable<InstructorIQ.Core.Data.Entities.RefreshToken> queryable, string userName)
-        {
-            return queryable.Where(q => q.UserName == userName);
-        }
+    /// <summary>
+    /// Filters a sequence of values based on a predicate.
+    /// </summary>
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="userName">The value to filter by.</param>
+    /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
+    public static IQueryable<InstructorIQ.Core.Data.Entities.RefreshToken> ByUserName(this IQueryable<InstructorIQ.Core.Data.Entities.RefreshToken> queryable, string userName)
+    {
+        return queryable.Where(q => q.UserName == userName);
+    }
 
-        #endregion
+    #endregion
 
-    }
 }
diff --git a/service/src/InstructorIQ.Core/Data/Queries/SessionExtensions.cs b/service/src/InstructorIQ.Core/Data/Queries/SessionExtensions.cs
index 50653141..ac7df543 100644
--- a/service/src/InstructorIQ.Core/Data/Queries/SessionExtensions.cs
+++ b/service/src/InstructorIQ.Core/Data/Queries/SessionExtensions.cs
@@ -2,101 +2,101 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+
 using Microsoft.EntityFrameworkCore;
 
-namespace InstructorIQ.Core.Data.Queries
+namespace InstructorIQ.Core.Data.Queries;
+
+/// <summary>
+/// Query extensions for entity <see cref="InstructorIQ.Core.Data.Entities.Session" />.
+/// </summary>
+public static partial class SessionExtensions
 {
+    #region Generated Extensions
     /// <summary>
-    /// Query extensions for entity <see cref="InstructorIQ.Core.Data.Entities.Session" />.
+    /// Filters a sequence of values based on a predicate.
     /// </summary>
-    public static partial class SessionExtensions
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="groupId">The value to filter by.</param>
+    /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
+    public static IQueryable<InstructorIQ.Core.Data.Entities.Session> ByGroupId(this IQueryable<InstructorIQ.Core.Data.Entities.Session> queryable, Guid? groupId)
     {
-        #region Generated Extensions
-        /// <summary>
-        /// Filters a sequence of values based on a predicate.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="groupId">The value to filter by.</param>
-        /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
-        public static IQueryable<InstructorIQ.Core.Data.Entities.Session> ByGroupId(this IQueryable<InstructorIQ.Core.Data.Entities.Session> queryable, Guid? groupId)
-        {
-            return queryable.Where(q => (q.GroupId == groupId || (groupId == null && q.GroupId == null)));
-        }
+        return queryable.Where(q => (q.GroupId == groupId || (groupId == null && q.GroupId == null)));
+    }
 
-        /// <summary>
-        /// Gets an instance by the primary key.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="id">The value to filter by.</param>
-        /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.Session"/> or null if not found.</returns>
-        public static InstructorIQ.Core.Data.Entities.Session GetByKey(this IQueryable<InstructorIQ.Core.Data.Entities.Session> queryable, Guid id)
-        {
-            if (queryable is DbSet<InstructorIQ.Core.Data.Entities.Session> dbSet)
-                return dbSet.Find(id);
+    /// <summary>
+    /// Gets an instance by the primary key.
+    /// </summary>
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="id">The value to filter by.</param>
+    /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.Session"/> or null if not found.</returns>
+    public static InstructorIQ.Core.Data.Entities.Session GetByKey(this IQueryable<InstructorIQ.Core.Data.Entities.Session> queryable, Guid id)
+    {
+        if (queryable is DbSet<InstructorIQ.Core.Data.Entities.Session> dbSet)
+            return dbSet.Find(id);
 
-            return queryable.FirstOrDefault(q => q.Id == id);
-        }
+        return queryable.FirstOrDefault(q => q.Id == id);
+    }
 
-        /// <summary>
-        /// Gets an instance by the primary key.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="id">The value to filter by.</param>
-        /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.Session"/> or null if not found.</returns>
-        public static ValueTask<InstructorIQ.Core.Data.Entities.Session> GetByKeyAsync(this IQueryable<InstructorIQ.Core.Data.Entities.Session> queryable, Guid id)
-        {
-            if (queryable is DbSet<InstructorIQ.Core.Data.Entities.Session> dbSet)
-                return dbSet.FindAsync(id);
+    /// <summary>
+    /// Gets an instance by the primary key.
+    /// </summary>
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="id">The value to filter by.</param>
+    /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.Session"/> or null if not found.</returns>
+    public static ValueTask<InstructorIQ.Core.Data.Entities.Session> GetByKeyAsync(this IQueryable<InstructorIQ.Core.Data.Entities.Session> queryable, Guid id)
+    {
+        if (queryable is DbSet<InstructorIQ.Core.Data.Entities.Session> dbSet)
+            return dbSet.FindAsync(id);
 
-            var task = queryable.FirstOrDefaultAsync(q => q.Id == id);
-            return new ValueTask<InstructorIQ.Core.Data.Entities.Session>(task);
-        }
+        var task = queryable.FirstOrDefaultAsync(q => q.Id == id);
+        return new ValueTask<InstructorIQ.Core.Data.Entities.Session>(task);
+    }
 
-        /// <summary>
-        /// Filters a sequence of values based on a predicate.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="locationId">The value to filter by.</param>
-        /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
-        public static IQueryable<InstructorIQ.Core.Data.Entities.Session> ByLocationId(this IQueryable<InstructorIQ.Core.Data.Entities.Session> queryable, Guid? locationId)
-        {
-            return queryable.Where(q => (q.LocationId == locationId || (locationId == null && q.LocationId == null)));
-        }
+    /// <summary>
+    /// Filters a sequence of values based on a predicate.
+    /// </summary>
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="locationId">The value to filter by.</param>
+    /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
+    public static IQueryable<InstructorIQ.Core.Data.Entities.Session> ByLocationId(this IQueryable<InstructorIQ.Core.Data.Entities.Session> queryable, Guid? locationId)
+    {
+        return queryable.Where(q => (q.LocationId == locationId || (locationId == null && q.LocationId == null)));
+    }
 
-        /// <summary>
-        /// Filters a sequence of values based on a predicate.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="startDate">The value to filter by.</param>
-        /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
-        public static IQueryable<InstructorIQ.Core.Data.Entities.Session> ByStartDate(this IQueryable<InstructorIQ.Core.Data.Entities.Session> queryable, DateTime? startDate)
-        {
-            return queryable.Where(q => (q.StartDate == startDate || (startDate == null && q.StartDate == null)));
-        }
+    /// <summary>
+    /// Filters a sequence of values based on a predicate.
+    /// </summary>
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="startDate">The value to filter by.</param>
+    /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
+    public static IQueryable<InstructorIQ.Core.Data.Entities.Session> ByStartDate(this IQueryable<InstructorIQ.Core.Data.Entities.Session> queryable, DateTime? startDate)
+    {
+        return queryable.Where(q => (q.StartDate == startDate || (startDate == null && q.StartDate == null)));
+    }
 
-        /// <summary>
-        /// Filters a sequence of values based on a predicate.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="tenantId">The value to filter by.</param>
-        /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
-        public static IQueryable<InstructorIQ.Core.Data.Entities.Session> ByTenantId(this IQueryable<InstructorIQ.Core.Data.Entities.Session> queryable, Guid tenantId)
-        {
-            return queryable.Where(q => q.TenantId == tenantId);
-        }
+    /// <summary>
+    /// Filters a sequence of values based on a predicate.
+    /// </summary>
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="tenantId">The value to filter by.</param>
+    /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
+    public static IQueryable<InstructorIQ.Core.Data.Entities.Session> ByTenantId(this IQueryable<InstructorIQ.Core.Data.Entities.Session> queryable, Guid tenantId)
+    {
+        return queryable.Where(q => q.TenantId == tenantId);
+    }
 
-        /// <summary>
-        /// Filters a sequence of values based on a predicate.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="topicId">The value to filter by.</param>
-        /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
-        public static IQueryable<InstructorIQ.Core.Data.Entities.Session> ByTopicId(this IQueryable<InstructorIQ.Core.Data.Entities.Session> queryable, Guid topicId)
-        {
-            return queryable.Where(q => q.TopicId == topicId);
-        }
+    /// <summary>
+    /// Filters a sequence of values based on a predicate.
+    /// </summary>
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="topicId">The value to filter by.</param>
+    /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
+    public static IQueryable<InstructorIQ.Core.Data.Entities.Session> ByTopicId(this IQueryable<InstructorIQ.Core.Data.Entities.Session> queryable, Guid topicId)
+    {
+        return queryable.Where(q => q.TopicId == topicId);
+    }
 
-        #endregion
+    #endregion
 
-    }
 }
diff --git a/service/src/InstructorIQ.Core/Data/Queries/SessionInstructorExtensions.cs b/service/src/InstructorIQ.Core/Data/Queries/SessionInstructorExtensions.cs
index e4491800..828657da 100644
--- a/service/src/InstructorIQ.Core/Data/Queries/SessionInstructorExtensions.cs
+++ b/service/src/InstructorIQ.Core/Data/Queries/SessionInstructorExtensions.cs
@@ -2,83 +2,83 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+
 using Microsoft.EntityFrameworkCore;
 
-namespace InstructorIQ.Core.Data.Queries
+namespace InstructorIQ.Core.Data.Queries;
+
+/// <summary>
+/// Query extensions for entity <see cref="InstructorIQ.Core.Data.Entities.SessionInstructor" />.
+/// </summary>
+public static partial class SessionInstructorExtensions
 {
+    #region Generated Extensions
     /// <summary>
-    /// Query extensions for entity <see cref="InstructorIQ.Core.Data.Entities.SessionInstructor" />.
+    /// Gets an instance by the primary key.
     /// </summary>
-    public static partial class SessionInstructorExtensions
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="id">The value to filter by.</param>
+    /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.SessionInstructor"/> or null if not found.</returns>
+    public static InstructorIQ.Core.Data.Entities.SessionInstructor GetByKey(this IQueryable<InstructorIQ.Core.Data.Entities.SessionInstructor> queryable, Guid id)
     {
-        #region Generated Extensions
-        /// <summary>
-        /// Gets an instance by the primary key.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="id">The value to filter by.</param>
-        /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.SessionInstructor"/> or null if not found.</returns>
-        public static InstructorIQ.Core.Data.Entities.SessionInstructor GetByKey(this IQueryable<InstructorIQ.Core.Data.Entities.SessionInstructor> queryable, Guid id)
-        {
-            if (queryable is DbSet<InstructorIQ.Core.Data.Entities.SessionInstructor> dbSet)
-                return dbSet.Find(id);
+        if (queryable is DbSet<InstructorIQ.Core.Data.Entities.SessionInstructor> dbSet)
+            return dbSet.Find(id);
 
-            return queryable.FirstOrDefault(q => q.Id == id);
-        }
+        return queryable.FirstOrDefault(q => q.Id == id);
+    }
 
-        /// <summary>
-        /// Gets an instance by the primary key.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="id">The value to filter by.</param>
-        /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.SessionInstructor"/> or null if not found.</returns>
-        public static ValueTask<InstructorIQ.Core.Data.Entities.SessionInstructor> GetByKeyAsync(this IQueryable<InstructorIQ.Core.Data.Entities.SessionInstructor> queryable, Guid id)
-        {
-            if (queryable is DbSet<InstructorIQ.Core.Data.Entities.SessionInstructor> dbSet)
-                return dbSet.FindAsync(id);
+    /// <summary>
+    /// Gets an instance by the primary key.
+    /// </summary>
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="id">The value to filter by.</param>
+    /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.SessionInstructor"/> or null if not found.</returns>
+    public static ValueTask<InstructorIQ.Core.Data.Entities.SessionInstructor> GetByKeyAsync(this IQueryable<InstructorIQ.Core.Data.Entities.SessionInstructor> queryable, Guid id)
+    {
+        if (queryable is DbSet<InstructorIQ.Core.Data.Entities.SessionInstructor> dbSet)
+            return dbSet.FindAsync(id);
 
-            var task = queryable.FirstOrDefaultAsync(q => q.Id == id);
-            return new ValueTask<InstructorIQ.Core.Data.Entities.SessionInstructor>(task);
-        }
+        var task = queryable.FirstOrDefaultAsync(q => q.Id == id);
+        return new ValueTask<InstructorIQ.Core.Data.Entities.SessionInstructor>(task);
+    }
 
-        /// <summary>
-        /// Filters a sequence of values based on a predicate.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="instructorRoleId">The value to filter by.</param>
-        /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
-        public static IQueryable<InstructorIQ.Core.Data.Entities.SessionInstructor> ByInstructorRoleId(this IQueryable<InstructorIQ.Core.Data.Entities.SessionInstructor> queryable, Guid? instructorRoleId)
-        {
-            return queryable.Where(q => (q.InstructorRoleId == instructorRoleId || (instructorRoleId == null && q.InstructorRoleId == null)));
-        }
+    /// <summary>
+    /// Filters a sequence of values based on a predicate.
+    /// </summary>
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="instructorRoleId">The value to filter by.</param>
+    /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
+    public static IQueryable<InstructorIQ.Core.Data.Entities.SessionInstructor> ByInstructorRoleId(this IQueryable<InstructorIQ.Core.Data.Entities.SessionInstructor> queryable, Guid? instructorRoleId)
+    {
+        return queryable.Where(q => (q.InstructorRoleId == instructorRoleId || (instructorRoleId == null && q.InstructorRoleId == null)));
+    }
 
-        /// <summary>
-        /// Filters a sequence of values based on a predicate.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="sessionId">The value to filter by.</param>
-        /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
-        public static IQueryable<InstructorIQ.Core.Data.Entities.SessionInstructor> BySessionId(this IQueryable<InstructorIQ.Core.Data.Entities.SessionInstructor> queryable, Guid sessionId)
-        {
-            return queryable.Where(q => q.SessionId == sessionId);
-        }
+    /// <summary>
+    /// Filters a sequence of values based on a predicate.
+    /// </summary>
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="sessionId">The value to filter by.</param>
+    /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
+    public static IQueryable<InstructorIQ.Core.Data.Entities.SessionInstructor> BySessionId(this IQueryable<InstructorIQ.Core.Data.Entities.SessionInstructor> queryable, Guid sessionId)
+    {
+        return queryable.Where(q => q.SessionId == sessionId);
+    }
 
-        /// <summary>
-        /// Filters a sequence of values based on a predicate.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="sessionId">The value to filter by.</param>
-        /// <param name="instructorId">The value to filter by.</param>
-        /// <param name="instructorRoleId">The value to filter by.</param>
-        /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
-        public static IQueryable<InstructorIQ.Core.Data.Entities.SessionInstructor> BySessionIdInstructorIdInstructorRoleId(this IQueryable<InstructorIQ.Core.Data.Entities.SessionInstructor> queryable, Guid sessionId, Guid instructorId, Guid? instructorRoleId)
-        {
-            return queryable.Where(q => q.SessionId == sessionId
-                && q.InstructorId == instructorId
-                    && (q.InstructorRoleId == instructorRoleId || (instructorRoleId == null && q.InstructorRoleId == null)));
-            }
+    /// <summary>
+    /// Filters a sequence of values based on a predicate.
+    /// </summary>
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="sessionId">The value to filter by.</param>
+    /// <param name="instructorId">The value to filter by.</param>
+    /// <param name="instructorRoleId">The value to filter by.</param>
+    /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
+    public static IQueryable<InstructorIQ.Core.Data.Entities.SessionInstructor> BySessionIdInstructorIdInstructorRoleId(this IQueryable<InstructorIQ.Core.Data.Entities.SessionInstructor> queryable, Guid sessionId, Guid instructorId, Guid? instructorRoleId)
+    {
+        return queryable.Where(q => q.SessionId == sessionId
+            && q.InstructorId == instructorId
+                && (q.InstructorRoleId == instructorRoleId || (instructorRoleId == null && q.InstructorRoleId == null)));
+    }
 
-            #endregion
+    #endregion
 
-    }
 }
diff --git a/service/src/InstructorIQ.Core/Data/Queries/SignUpExtensions.cs b/service/src/InstructorIQ.Core/Data/Queries/SignUpExtensions.cs
index 30d14d2e..20391314 100644
--- a/service/src/InstructorIQ.Core/Data/Queries/SignUpExtensions.cs
+++ b/service/src/InstructorIQ.Core/Data/Queries/SignUpExtensions.cs
@@ -2,57 +2,57 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+
 using Microsoft.EntityFrameworkCore;
 
-namespace InstructorIQ.Core.Data.Queries
+namespace InstructorIQ.Core.Data.Queries;
+
+/// <summary>
+/// Query extensions for entity <see cref="InstructorIQ.Core.Data.Entities.SignUp" />.
+/// </summary>
+public static partial class SignUpExtensions
 {
+    #region Generated Extensions
+    /// <summary>
+    /// Gets an instance by the primary key.
+    /// </summary>
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="id">The value to filter by.</param>
+    /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.SignUp"/> or null if not found.</returns>
+    public static InstructorIQ.Core.Data.Entities.SignUp GetByKey(this IQueryable<InstructorIQ.Core.Data.Entities.SignUp> queryable, Guid id)
+    {
+        if (queryable is DbSet<InstructorIQ.Core.Data.Entities.SignUp> dbSet)
+            return dbSet.Find(id);
+
+        return queryable.FirstOrDefault(q => q.Id == id);
+    }
+
     /// <summary>
-    /// Query extensions for entity <see cref="InstructorIQ.Core.Data.Entities.SignUp" />.
+    /// Gets an instance by the primary key.
     /// </summary>
-    public static partial class SignUpExtensions
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="id">The value to filter by.</param>
+    /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.SignUp"/> or null if not found.</returns>
+    public static ValueTask<InstructorIQ.Core.Data.Entities.SignUp> GetByKeyAsync(this IQueryable<InstructorIQ.Core.Data.Entities.SignUp> queryable, Guid id)
     {
-        #region Generated Extensions
-        /// <summary>
-        /// Gets an instance by the primary key.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="id">The value to filter by.</param>
-        /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.SignUp"/> or null if not found.</returns>
-        public static InstructorIQ.Core.Data.Entities.SignUp GetByKey(this IQueryable<InstructorIQ.Core.Data.Entities.SignUp> queryable, Guid id)
-        {
-            if (queryable is DbSet<InstructorIQ.Core.Data.Entities.SignUp> dbSet)
-                return dbSet.Find(id);
-
-            return queryable.FirstOrDefault(q => q.Id == id);
-        }
-
-        /// <summary>
-        /// Gets an instance by the primary key.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="id">The value to filter by.</param>
-        /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.SignUp"/> or null if not found.</returns>
-        public static ValueTask<InstructorIQ.Core.Data.Entities.SignUp> GetByKeyAsync(this IQueryable<InstructorIQ.Core.Data.Entities.SignUp> queryable, Guid id)
-        {
-            if (queryable is DbSet<InstructorIQ.Core.Data.Entities.SignUp> dbSet)
-                return dbSet.FindAsync(id);
-
-            var task = queryable.FirstOrDefaultAsync(q => q.Id == id);
-            return new ValueTask<InstructorIQ.Core.Data.Entities.SignUp>(task);
-        }
-
-        /// <summary>
-        /// Filters a sequence of values based on a predicate.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="tenantId">The value to filter by.</param>
-        /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
-        public static IQueryable<InstructorIQ.Core.Data.Entities.SignUp> ByTenantId(this IQueryable<InstructorIQ.Core.Data.Entities.SignUp> queryable, Guid tenantId)
-        {
-            return queryable.Where(q => q.TenantId == tenantId);
-        }
-
-        #endregion
+        if (queryable is DbSet<InstructorIQ.Core.Data.Entities.SignUp> dbSet)
+            return dbSet.FindAsync(id);
 
+        var task = queryable.FirstOrDefaultAsync(q => q.Id == id);
+        return new ValueTask<InstructorIQ.Core.Data.Entities.SignUp>(task);
     }
+
+    /// <summary>
+    /// Filters a sequence of values based on a predicate.
+    /// </summary>
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="tenantId">The value to filter by.</param>
+    /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
+    public static IQueryable<InstructorIQ.Core.Data.Entities.SignUp> ByTenantId(this IQueryable<InstructorIQ.Core.Data.Entities.SignUp> queryable, Guid tenantId)
+    {
+        return queryable.Where(q => q.TenantId == tenantId);
+    }
+
+    #endregion
+
 }
diff --git a/service/src/InstructorIQ.Core/Data/Queries/SignUpTopicExtensions.cs b/service/src/InstructorIQ.Core/Data/Queries/SignUpTopicExtensions.cs
index 84e3d885..ff475d5f 100644
--- a/service/src/InstructorIQ.Core/Data/Queries/SignUpTopicExtensions.cs
+++ b/service/src/InstructorIQ.Core/Data/Queries/SignUpTopicExtensions.cs
@@ -2,68 +2,68 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+
 using Microsoft.EntityFrameworkCore;
 
-namespace InstructorIQ.Core.Data.Queries
+namespace InstructorIQ.Core.Data.Queries;
+
+/// <summary>
+/// Query extensions for entity <see cref="InstructorIQ.Core.Data.Entities.SignUpTopic" />.
+/// </summary>
+public static partial class SignUpTopicExtensions
 {
+    #region Generated Extensions
     /// <summary>
-    /// Query extensions for entity <see cref="InstructorIQ.Core.Data.Entities.SignUpTopic" />.
+    /// Gets an instance by the primary key.
     /// </summary>
-    public static partial class SignUpTopicExtensions
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="id">The value to filter by.</param>
+    /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.SignUpTopic"/> or null if not found.</returns>
+    public static InstructorIQ.Core.Data.Entities.SignUpTopic GetByKey(this IQueryable<InstructorIQ.Core.Data.Entities.SignUpTopic> queryable, Guid id)
     {
-        #region Generated Extensions
-        /// <summary>
-        /// Gets an instance by the primary key.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="id">The value to filter by.</param>
-        /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.SignUpTopic"/> or null if not found.</returns>
-        public static InstructorIQ.Core.Data.Entities.SignUpTopic GetByKey(this IQueryable<InstructorIQ.Core.Data.Entities.SignUpTopic> queryable, Guid id)
-        {
-            if (queryable is DbSet<InstructorIQ.Core.Data.Entities.SignUpTopic> dbSet)
-                return dbSet.Find(id);
+        if (queryable is DbSet<InstructorIQ.Core.Data.Entities.SignUpTopic> dbSet)
+            return dbSet.Find(id);
 
-            return queryable.FirstOrDefault(q => q.Id == id);
-        }
+        return queryable.FirstOrDefault(q => q.Id == id);
+    }
 
-        /// <summary>
-        /// Gets an instance by the primary key.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="id">The value to filter by.</param>
-        /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.SignUpTopic"/> or null if not found.</returns>
-        public static ValueTask<InstructorIQ.Core.Data.Entities.SignUpTopic> GetByKeyAsync(this IQueryable<InstructorIQ.Core.Data.Entities.SignUpTopic> queryable, Guid id)
-        {
-            if (queryable is DbSet<InstructorIQ.Core.Data.Entities.SignUpTopic> dbSet)
-                return dbSet.FindAsync(id);
+    /// <summary>
+    /// Gets an instance by the primary key.
+    /// </summary>
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="id">The value to filter by.</param>
+    /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.SignUpTopic"/> or null if not found.</returns>
+    public static ValueTask<InstructorIQ.Core.Data.Entities.SignUpTopic> GetByKeyAsync(this IQueryable<InstructorIQ.Core.Data.Entities.SignUpTopic> queryable, Guid id)
+    {
+        if (queryable is DbSet<InstructorIQ.Core.Data.Entities.SignUpTopic> dbSet)
+            return dbSet.FindAsync(id);
 
-            var task = queryable.FirstOrDefaultAsync(q => q.Id == id);
-            return new ValueTask<InstructorIQ.Core.Data.Entities.SignUpTopic>(task);
-        }
+        var task = queryable.FirstOrDefaultAsync(q => q.Id == id);
+        return new ValueTask<InstructorIQ.Core.Data.Entities.SignUpTopic>(task);
+    }
 
-        /// <summary>
-        /// Filters a sequence of values based on a predicate.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="signUpId">The value to filter by.</param>
-        /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
-        public static IQueryable<InstructorIQ.Core.Data.Entities.SignUpTopic> BySignUpId(this IQueryable<InstructorIQ.Core.Data.Entities.SignUpTopic> queryable, Guid signUpId)
-        {
-            return queryable.Where(q => q.SignUpId == signUpId);
-        }
+    /// <summary>
+    /// Filters a sequence of values based on a predicate.
+    /// </summary>
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="signUpId">The value to filter by.</param>
+    /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
+    public static IQueryable<InstructorIQ.Core.Data.Entities.SignUpTopic> BySignUpId(this IQueryable<InstructorIQ.Core.Data.Entities.SignUpTopic> queryable, Guid signUpId)
+    {
+        return queryable.Where(q => q.SignUpId == signUpId);
+    }
 
-        /// <summary>
-        /// Filters a sequence of values based on a predicate.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="topicId">The value to filter by.</param>
-        /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
-        public static IQueryable<InstructorIQ.Core.Data.Entities.SignUpTopic> ByTopicId(this IQueryable<InstructorIQ.Core.Data.Entities.SignUpTopic> queryable, Guid topicId)
-        {
-            return queryable.Where(q => q.TopicId == topicId);
-        }
+    /// <summary>
+    /// Filters a sequence of values based on a predicate.
+    /// </summary>
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="topicId">The value to filter by.</param>
+    /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
+    public static IQueryable<InstructorIQ.Core.Data.Entities.SignUpTopic> ByTopicId(this IQueryable<InstructorIQ.Core.Data.Entities.SignUpTopic> queryable, Guid topicId)
+    {
+        return queryable.Where(q => q.TopicId == topicId);
+    }
 
-        #endregion
+    #endregion
 
-    }
 }
diff --git a/service/src/InstructorIQ.Core/Data/Queries/TemplateExtensions.cs b/service/src/InstructorIQ.Core/Data/Queries/TemplateExtensions.cs
index fa7a2587..379ce217 100644
--- a/service/src/InstructorIQ.Core/Data/Queries/TemplateExtensions.cs
+++ b/service/src/InstructorIQ.Core/Data/Queries/TemplateExtensions.cs
@@ -2,79 +2,79 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+
 using Microsoft.EntityFrameworkCore;
 
-namespace InstructorIQ.Core.Data.Queries
+namespace InstructorIQ.Core.Data.Queries;
+
+/// <summary>
+/// Query extensions for entity <see cref="InstructorIQ.Core.Data.Entities.Template" />.
+/// </summary>
+public static partial class TemplateExtensions
 {
+    #region Generated Extensions
     /// <summary>
-    /// Query extensions for entity <see cref="InstructorIQ.Core.Data.Entities.Template" />.
+    /// Gets an instance by the primary key.
     /// </summary>
-    public static partial class TemplateExtensions
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="id">The value to filter by.</param>
+    /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.Template"/> or null if not found.</returns>
+    public static InstructorIQ.Core.Data.Entities.Template GetByKey(this IQueryable<InstructorIQ.Core.Data.Entities.Template> queryable, Guid id)
     {
-        #region Generated Extensions
-        /// <summary>
-        /// Gets an instance by the primary key.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="id">The value to filter by.</param>
-        /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.Template"/> or null if not found.</returns>
-        public static InstructorIQ.Core.Data.Entities.Template GetByKey(this IQueryable<InstructorIQ.Core.Data.Entities.Template> queryable, Guid id)
-        {
-            if (queryable is DbSet<InstructorIQ.Core.Data.Entities.Template> dbSet)
-                return dbSet.Find(id);
+        if (queryable is DbSet<InstructorIQ.Core.Data.Entities.Template> dbSet)
+            return dbSet.Find(id);
 
-            return queryable.FirstOrDefault(q => q.Id == id);
-        }
+        return queryable.FirstOrDefault(q => q.Id == id);
+    }
 
-        /// <summary>
-        /// Gets an instance by the primary key.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="id">The value to filter by.</param>
-        /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.Template"/> or null if not found.</returns>
-        public static ValueTask<InstructorIQ.Core.Data.Entities.Template> GetByKeyAsync(this IQueryable<InstructorIQ.Core.Data.Entities.Template> queryable, Guid id)
-        {
-            if (queryable is DbSet<InstructorIQ.Core.Data.Entities.Template> dbSet)
-                return dbSet.FindAsync(id);
+    /// <summary>
+    /// Gets an instance by the primary key.
+    /// </summary>
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="id">The value to filter by.</param>
+    /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.Template"/> or null if not found.</returns>
+    public static ValueTask<InstructorIQ.Core.Data.Entities.Template> GetByKeyAsync(this IQueryable<InstructorIQ.Core.Data.Entities.Template> queryable, Guid id)
+    {
+        if (queryable is DbSet<InstructorIQ.Core.Data.Entities.Template> dbSet)
+            return dbSet.FindAsync(id);
 
-            var task = queryable.FirstOrDefaultAsync(q => q.Id == id);
-            return new ValueTask<InstructorIQ.Core.Data.Entities.Template>(task);
-        }
+        var task = queryable.FirstOrDefaultAsync(q => q.Id == id);
+        return new ValueTask<InstructorIQ.Core.Data.Entities.Template>(task);
+    }
 
-        /// <summary>
-        /// Filters a sequence of values based on a predicate.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="name">The value to filter by.</param>
-        /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
-        public static IQueryable<InstructorIQ.Core.Data.Entities.Template> ByName(this IQueryable<InstructorIQ.Core.Data.Entities.Template> queryable, string name)
-        {
-            return queryable.Where(q => q.Name == name);
-        }
+    /// <summary>
+    /// Filters a sequence of values based on a predicate.
+    /// </summary>
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="name">The value to filter by.</param>
+    /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
+    public static IQueryable<InstructorIQ.Core.Data.Entities.Template> ByName(this IQueryable<InstructorIQ.Core.Data.Entities.Template> queryable, string name)
+    {
+        return queryable.Where(q => q.Name == name);
+    }
 
-        /// <summary>
-        /// Filters a sequence of values based on a predicate.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="templateType">The value to filter by.</param>
-        /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
-        public static IQueryable<InstructorIQ.Core.Data.Entities.Template> ByTemplateType(this IQueryable<InstructorIQ.Core.Data.Entities.Template> queryable, string templateType)
-        {
-            return queryable.Where(q => q.TemplateType == templateType);
-        }
+    /// <summary>
+    /// Filters a sequence of values based on a predicate.
+    /// </summary>
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="templateType">The value to filter by.</param>
+    /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
+    public static IQueryable<InstructorIQ.Core.Data.Entities.Template> ByTemplateType(this IQueryable<InstructorIQ.Core.Data.Entities.Template> queryable, string templateType)
+    {
+        return queryable.Where(q => q.TemplateType == templateType);
+    }
 
-        /// <summary>
-        /// Filters a sequence of values based on a predicate.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="tenantId">The value to filter by.</param>
-        /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
-        public static IQueryable<InstructorIQ.Core.Data.Entities.Template> ByTenantId(this IQueryable<InstructorIQ.Core.Data.Entities.Template> queryable, Guid tenantId)
-        {
-            return queryable.Where(q => q.TenantId == tenantId);
-        }
+    /// <summary>
+    /// Filters a sequence of values based on a predicate.
+    /// </summary>
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="tenantId">The value to filter by.</param>
+    /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
+    public static IQueryable<InstructorIQ.Core.Data.Entities.Template> ByTenantId(this IQueryable<InstructorIQ.Core.Data.Entities.Template> queryable, Guid tenantId)
+    {
+        return queryable.Where(q => q.TenantId == tenantId);
+    }
 
-        #endregion
+    #endregion
 
-    }
 }
diff --git a/service/src/InstructorIQ.Core/Data/Queries/TenantExtensions.cs b/service/src/InstructorIQ.Core/Data/Queries/TenantExtensions.cs
index 16aaf152..7564a064 100644
--- a/service/src/InstructorIQ.Core/Data/Queries/TenantExtensions.cs
+++ b/service/src/InstructorIQ.Core/Data/Queries/TenantExtensions.cs
@@ -2,90 +2,90 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+
 using Microsoft.EntityFrameworkCore;
 
-namespace InstructorIQ.Core.Data.Queries
+namespace InstructorIQ.Core.Data.Queries;
+
+/// <summary>
+/// Query extensions for entity <see cref="InstructorIQ.Core.Data.Entities.Tenant" />.
+/// </summary>
+public static partial class TenantExtensions
 {
+    #region Generated Extensions
     /// <summary>
-    /// Query extensions for entity <see cref="InstructorIQ.Core.Data.Entities.Tenant" />.
+    /// Gets an instance by the primary key.
     /// </summary>
-    public static partial class TenantExtensions
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="id">The value to filter by.</param>
+    /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.Tenant"/> or null if not found.</returns>
+    public static InstructorIQ.Core.Data.Entities.Tenant GetByKey(this IQueryable<InstructorIQ.Core.Data.Entities.Tenant> queryable, Guid id)
     {
-        #region Generated Extensions
-        /// <summary>
-        /// Gets an instance by the primary key.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="id">The value to filter by.</param>
-        /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.Tenant"/> or null if not found.</returns>
-        public static InstructorIQ.Core.Data.Entities.Tenant GetByKey(this IQueryable<InstructorIQ.Core.Data.Entities.Tenant> queryable, Guid id)
-        {
-            if (queryable is DbSet<InstructorIQ.Core.Data.Entities.Tenant> dbSet)
-                return dbSet.Find(id);
+        if (queryable is DbSet<InstructorIQ.Core.Data.Entities.Tenant> dbSet)
+            return dbSet.Find(id);
 
-            return queryable.FirstOrDefault(q => q.Id == id);
-        }
+        return queryable.FirstOrDefault(q => q.Id == id);
+    }
 
-        /// <summary>
-        /// Gets an instance by the primary key.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="id">The value to filter by.</param>
-        /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.Tenant"/> or null if not found.</returns>
-        public static ValueTask<InstructorIQ.Core.Data.Entities.Tenant> GetByKeyAsync(this IQueryable<InstructorIQ.Core.Data.Entities.Tenant> queryable, Guid id)
-        {
-            if (queryable is DbSet<InstructorIQ.Core.Data.Entities.Tenant> dbSet)
-                return dbSet.FindAsync(id);
+    /// <summary>
+    /// Gets an instance by the primary key.
+    /// </summary>
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="id">The value to filter by.</param>
+    /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.Tenant"/> or null if not found.</returns>
+    public static ValueTask<InstructorIQ.Core.Data.Entities.Tenant> GetByKeyAsync(this IQueryable<InstructorIQ.Core.Data.Entities.Tenant> queryable, Guid id)
+    {
+        if (queryable is DbSet<InstructorIQ.Core.Data.Entities.Tenant> dbSet)
+            return dbSet.FindAsync(id);
 
-            var task = queryable.FirstOrDefaultAsync(q => q.Id == id);
-            return new ValueTask<InstructorIQ.Core.Data.Entities.Tenant>(task);
-        }
+        var task = queryable.FirstOrDefaultAsync(q => q.Id == id);
+        return new ValueTask<InstructorIQ.Core.Data.Entities.Tenant>(task);
+    }
 
-        /// <summary>
-        /// Filters a sequence of values based on a predicate.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="isDeleted">The value to filter by.</param>
-        /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
-        public static IQueryable<InstructorIQ.Core.Data.Entities.Tenant> ByIsDeleted(this IQueryable<InstructorIQ.Core.Data.Entities.Tenant> queryable, bool isDeleted)
-        {
-            return queryable.Where(q => q.IsDeleted == isDeleted);
-        }
+    /// <summary>
+    /// Filters a sequence of values based on a predicate.
+    /// </summary>
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="isDeleted">The value to filter by.</param>
+    /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
+    public static IQueryable<InstructorIQ.Core.Data.Entities.Tenant> ByIsDeleted(this IQueryable<InstructorIQ.Core.Data.Entities.Tenant> queryable, bool isDeleted)
+    {
+        return queryable.Where(q => q.IsDeleted == isDeleted);
+    }
 
-        /// <summary>
-        /// Filters a sequence of values based on a predicate.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="name">The value to filter by.</param>
-        /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
-        public static IQueryable<InstructorIQ.Core.Data.Entities.Tenant> ByName(this IQueryable<InstructorIQ.Core.Data.Entities.Tenant> queryable, string name)
-        {
-            return queryable.Where(q => q.Name == name);
-        }
+    /// <summary>
+    /// Filters a sequence of values based on a predicate.
+    /// </summary>
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="name">The value to filter by.</param>
+    /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
+    public static IQueryable<InstructorIQ.Core.Data.Entities.Tenant> ByName(this IQueryable<InstructorIQ.Core.Data.Entities.Tenant> queryable, string name)
+    {
+        return queryable.Where(q => q.Name == name);
+    }
 
-        /// <summary>
-        /// Gets an instance of <see cref="T:InstructorIQ.Core.Data.Entities.Tenant"/> by using a unique index.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="slug">The value to filter by.</param>
-        /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.Tenant"/> or null if not found.</returns>
-        public static InstructorIQ.Core.Data.Entities.Tenant GetBySlug(this IQueryable<InstructorIQ.Core.Data.Entities.Tenant> queryable, string slug)
-        {
-            return queryable.FirstOrDefault(q => q.Slug == slug);
-        }
+    /// <summary>
+    /// Gets an instance of <see cref="T:InstructorIQ.Core.Data.Entities.Tenant"/> by using a unique index.
+    /// </summary>
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="slug">The value to filter by.</param>
+    /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.Tenant"/> or null if not found.</returns>
+    public static InstructorIQ.Core.Data.Entities.Tenant GetBySlug(this IQueryable<InstructorIQ.Core.Data.Entities.Tenant> queryable, string slug)
+    {
+        return queryable.FirstOrDefault(q => q.Slug == slug);
+    }
 
-        /// <summary>
-        /// Gets an instance of <see cref="T:InstructorIQ.Core.Data.Entities.Tenant"/> by using a unique index.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="slug">The value to filter by.</param>
-        /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.Tenant"/> or null if not found.</returns>
-        public static Task<InstructorIQ.Core.Data.Entities.Tenant> GetBySlugAsync(this IQueryable<InstructorIQ.Core.Data.Entities.Tenant> queryable, string slug)
-        {
-            return queryable.FirstOrDefaultAsync(q => q.Slug == slug);
-        }
+    /// <summary>
+    /// Gets an instance of <see cref="T:InstructorIQ.Core.Data.Entities.Tenant"/> by using a unique index.
+    /// </summary>
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="slug">The value to filter by.</param>
+    /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.Tenant"/> or null if not found.</returns>
+    public static Task<InstructorIQ.Core.Data.Entities.Tenant> GetBySlugAsync(this IQueryable<InstructorIQ.Core.Data.Entities.Tenant> queryable, string slug)
+    {
+        return queryable.FirstOrDefaultAsync(q => q.Slug == slug);
+    }
 
-        #endregion
+    #endregion
 
-    }
 }
diff --git a/service/src/InstructorIQ.Core/Data/Queries/TenantUserRoleExtensions.cs b/service/src/InstructorIQ.Core/Data/Queries/TenantUserRoleExtensions.cs
index 3079f5ce..b9627554 100644
--- a/service/src/InstructorIQ.Core/Data/Queries/TenantUserRoleExtensions.cs
+++ b/service/src/InstructorIQ.Core/Data/Queries/TenantUserRoleExtensions.cs
@@ -2,70 +2,70 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+
 using Microsoft.EntityFrameworkCore;
 
-namespace InstructorIQ.Core.Data.Queries
+namespace InstructorIQ.Core.Data.Queries;
+
+/// <summary>
+/// Query extensions for entity <see cref="InstructorIQ.Core.Data.Entities.TenantUserRole" />.
+/// </summary>
+public static partial class TenantUserRoleExtensions
 {
+    #region Generated Extensions
     /// <summary>
-    /// Query extensions for entity <see cref="InstructorIQ.Core.Data.Entities.TenantUserRole" />.
+    /// Gets an instance by the primary key.
     /// </summary>
-    public static partial class TenantUserRoleExtensions
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="id">The value to filter by.</param>
+    /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.TenantUserRole"/> or null if not found.</returns>
+    public static InstructorIQ.Core.Data.Entities.TenantUserRole GetByKey(this IQueryable<InstructorIQ.Core.Data.Entities.TenantUserRole> queryable, Guid id)
     {
-        #region Generated Extensions
-        /// <summary>
-        /// Gets an instance by the primary key.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="id">The value to filter by.</param>
-        /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.TenantUserRole"/> or null if not found.</returns>
-        public static InstructorIQ.Core.Data.Entities.TenantUserRole GetByKey(this IQueryable<InstructorIQ.Core.Data.Entities.TenantUserRole> queryable, Guid id)
-        {
-            if (queryable is DbSet<InstructorIQ.Core.Data.Entities.TenantUserRole> dbSet)
-                return dbSet.Find(id);
+        if (queryable is DbSet<InstructorIQ.Core.Data.Entities.TenantUserRole> dbSet)
+            return dbSet.Find(id);
 
-            return queryable.FirstOrDefault(q => q.Id == id);
-        }
+        return queryable.FirstOrDefault(q => q.Id == id);
+    }
 
-        /// <summary>
-        /// Gets an instance by the primary key.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="id">The value to filter by.</param>
-        /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.TenantUserRole"/> or null if not found.</returns>
-        public static ValueTask<InstructorIQ.Core.Data.Entities.TenantUserRole> GetByKeyAsync(this IQueryable<InstructorIQ.Core.Data.Entities.TenantUserRole> queryable, Guid id)
-        {
-            if (queryable is DbSet<InstructorIQ.Core.Data.Entities.TenantUserRole> dbSet)
-                return dbSet.FindAsync(id);
+    /// <summary>
+    /// Gets an instance by the primary key.
+    /// </summary>
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="id">The value to filter by.</param>
+    /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.TenantUserRole"/> or null if not found.</returns>
+    public static ValueTask<InstructorIQ.Core.Data.Entities.TenantUserRole> GetByKeyAsync(this IQueryable<InstructorIQ.Core.Data.Entities.TenantUserRole> queryable, Guid id)
+    {
+        if (queryable is DbSet<InstructorIQ.Core.Data.Entities.TenantUserRole> dbSet)
+            return dbSet.FindAsync(id);
 
-            var task = queryable.FirstOrDefaultAsync(q => q.Id == id);
-            return new ValueTask<InstructorIQ.Core.Data.Entities.TenantUserRole>(task);
-        }
+        var task = queryable.FirstOrDefaultAsync(q => q.Id == id);
+        return new ValueTask<InstructorIQ.Core.Data.Entities.TenantUserRole>(task);
+    }
 
-        /// <summary>
-        /// Filters a sequence of values based on a predicate.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="tenantId">The value to filter by.</param>
-        /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
-        public static IQueryable<InstructorIQ.Core.Data.Entities.TenantUserRole> ByTenantId(this IQueryable<InstructorIQ.Core.Data.Entities.TenantUserRole> queryable, Guid tenantId)
-        {
-            return queryable.Where(q => q.TenantId == tenantId);
-        }
+    /// <summary>
+    /// Filters a sequence of values based on a predicate.
+    /// </summary>
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="tenantId">The value to filter by.</param>
+    /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
+    public static IQueryable<InstructorIQ.Core.Data.Entities.TenantUserRole> ByTenantId(this IQueryable<InstructorIQ.Core.Data.Entities.TenantUserRole> queryable, Guid tenantId)
+    {
+        return queryable.Where(q => q.TenantId == tenantId);
+    }
 
-        /// <summary>
-        /// Filters a sequence of values based on a predicate.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="tenantId">The value to filter by.</param>
-        /// <param name="userId">The value to filter by.</param>
-        /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
-        public static IQueryable<InstructorIQ.Core.Data.Entities.TenantUserRole> ByTenantIdUserId(this IQueryable<InstructorIQ.Core.Data.Entities.TenantUserRole> queryable, Guid tenantId, Guid userId)
-        {
-            return queryable.Where(q => q.TenantId == tenantId
-                && q.UserId == userId);
-        }
+    /// <summary>
+    /// Filters a sequence of values based on a predicate.
+    /// </summary>
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="tenantId">The value to filter by.</param>
+    /// <param name="userId">The value to filter by.</param>
+    /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
+    public static IQueryable<InstructorIQ.Core.Data.Entities.TenantUserRole> ByTenantIdUserId(this IQueryable<InstructorIQ.Core.Data.Entities.TenantUserRole> queryable, Guid tenantId, Guid userId)
+    {
+        return queryable.Where(q => q.TenantId == tenantId
+            && q.UserId == userId);
+    }
 
-        #endregion
+    #endregion
 
-    }
 }
diff --git a/service/src/InstructorIQ.Core/Data/Queries/TopicExtensions.cs b/service/src/InstructorIQ.Core/Data/Queries/TopicExtensions.cs
index 46a9bae2..84182306 100644
--- a/service/src/InstructorIQ.Core/Data/Queries/TopicExtensions.cs
+++ b/service/src/InstructorIQ.Core/Data/Queries/TopicExtensions.cs
@@ -2,79 +2,79 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+
 using Microsoft.EntityFrameworkCore;
 
-namespace InstructorIQ.Core.Data.Queries
+namespace InstructorIQ.Core.Data.Queries;
+
+/// <summary>
+/// Query extensions for entity <see cref="InstructorIQ.Core.Data.Entities.Topic" />.
+/// </summary>
+public static partial class TopicExtensions
 {
+    #region Generated Extensions
     /// <summary>
-    /// Query extensions for entity <see cref="InstructorIQ.Core.Data.Entities.Topic" />.
+    /// Filters a sequence of values based on a predicate.
     /// </summary>
-    public static partial class TopicExtensions
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="calendarYear">The value to filter by.</param>
+    /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
+    public static IQueryable<InstructorIQ.Core.Data.Entities.Topic> ByCalendarYear(this IQueryable<InstructorIQ.Core.Data.Entities.Topic> queryable, short calendarYear)
     {
-        #region Generated Extensions
-        /// <summary>
-        /// Filters a sequence of values based on a predicate.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="calendarYear">The value to filter by.</param>
-        /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
-        public static IQueryable<InstructorIQ.Core.Data.Entities.Topic> ByCalendarYear(this IQueryable<InstructorIQ.Core.Data.Entities.Topic> queryable, short calendarYear)
-        {
-            return queryable.Where(q => q.CalendarYear == calendarYear);
-        }
+        return queryable.Where(q => q.CalendarYear == calendarYear);
+    }
 
-        /// <summary>
-        /// Gets an instance by the primary key.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="id">The value to filter by.</param>
-        /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.Topic"/> or null if not found.</returns>
-        public static InstructorIQ.Core.Data.Entities.Topic GetByKey(this IQueryable<InstructorIQ.Core.Data.Entities.Topic> queryable, Guid id)
-        {
-            if (queryable is DbSet<InstructorIQ.Core.Data.Entities.Topic> dbSet)
-                return dbSet.Find(id);
+    /// <summary>
+    /// Gets an instance by the primary key.
+    /// </summary>
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="id">The value to filter by.</param>
+    /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.Topic"/> or null if not found.</returns>
+    public static InstructorIQ.Core.Data.Entities.Topic GetByKey(this IQueryable<InstructorIQ.Core.Data.Entities.Topic> queryable, Guid id)
+    {
+        if (queryable is DbSet<InstructorIQ.Core.Data.Entities.Topic> dbSet)
+            return dbSet.Find(id);
 
-            return queryable.FirstOrDefault(q => q.Id == id);
-        }
+        return queryable.FirstOrDefault(q => q.Id == id);
+    }
 
-        /// <summary>
-        /// Gets an instance by the primary key.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="id">The value to filter by.</param>
-        /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.Topic"/> or null if not found.</returns>
-        public static ValueTask<InstructorIQ.Core.Data.Entities.Topic> GetByKeyAsync(this IQueryable<InstructorIQ.Core.Data.Entities.Topic> queryable, Guid id)
-        {
-            if (queryable is DbSet<InstructorIQ.Core.Data.Entities.Topic> dbSet)
-                return dbSet.FindAsync(id);
+    /// <summary>
+    /// Gets an instance by the primary key.
+    /// </summary>
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="id">The value to filter by.</param>
+    /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.Topic"/> or null if not found.</returns>
+    public static ValueTask<InstructorIQ.Core.Data.Entities.Topic> GetByKeyAsync(this IQueryable<InstructorIQ.Core.Data.Entities.Topic> queryable, Guid id)
+    {
+        if (queryable is DbSet<InstructorIQ.Core.Data.Entities.Topic> dbSet)
+            return dbSet.FindAsync(id);
 
-            var task = queryable.FirstOrDefaultAsync(q => q.Id == id);
-            return new ValueTask<InstructorIQ.Core.Data.Entities.Topic>(task);
-        }
+        var task = queryable.FirstOrDefaultAsync(q => q.Id == id);
+        return new ValueTask<InstructorIQ.Core.Data.Entities.Topic>(task);
+    }
 
-        /// <summary>
-        /// Filters a sequence of values based on a predicate.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="tenantId">The value to filter by.</param>
-        /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
-        public static IQueryable<InstructorIQ.Core.Data.Entities.Topic> ByTenantId(this IQueryable<InstructorIQ.Core.Data.Entities.Topic> queryable, Guid tenantId)
-        {
-            return queryable.Where(q => q.TenantId == tenantId);
-        }
+    /// <summary>
+    /// Filters a sequence of values based on a predicate.
+    /// </summary>
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="tenantId">The value to filter by.</param>
+    /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
+    public static IQueryable<InstructorIQ.Core.Data.Entities.Topic> ByTenantId(this IQueryable<InstructorIQ.Core.Data.Entities.Topic> queryable, Guid tenantId)
+    {
+        return queryable.Where(q => q.TenantId == tenantId);
+    }
 
-        /// <summary>
-        /// Filters a sequence of values based on a predicate.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="title">The value to filter by.</param>
-        /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
-        public static IQueryable<InstructorIQ.Core.Data.Entities.Topic> ByTitle(this IQueryable<InstructorIQ.Core.Data.Entities.Topic> queryable, string title)
-        {
-            return queryable.Where(q => q.Title == title);
-        }
+    /// <summary>
+    /// Filters a sequence of values based on a predicate.
+    /// </summary>
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="title">The value to filter by.</param>
+    /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
+    public static IQueryable<InstructorIQ.Core.Data.Entities.Topic> ByTitle(this IQueryable<InstructorIQ.Core.Data.Entities.Topic> queryable, string title)
+    {
+        return queryable.Where(q => q.Title == title);
+    }
 
-        #endregion
+    #endregion
 
-    }
 }
diff --git a/service/src/InstructorIQ.Core/Data/Queries/TopicInstructorExtensions.cs b/service/src/InstructorIQ.Core/Data/Queries/TopicInstructorExtensions.cs
index 926866f2..9e80f506 100644
--- a/service/src/InstructorIQ.Core/Data/Queries/TopicInstructorExtensions.cs
+++ b/service/src/InstructorIQ.Core/Data/Queries/TopicInstructorExtensions.cs
@@ -2,83 +2,83 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+
 using Microsoft.EntityFrameworkCore;
 
-namespace InstructorIQ.Core.Data.Queries
+namespace InstructorIQ.Core.Data.Queries;
+
+/// <summary>
+/// Query extensions for entity <see cref="InstructorIQ.Core.Data.Entities.TopicInstructor" />.
+/// </summary>
+public static partial class TopicInstructorExtensions
 {
+    #region Generated Extensions
     /// <summary>
-    /// Query extensions for entity <see cref="InstructorIQ.Core.Data.Entities.TopicInstructor" />.
+    /// Gets an instance by the primary key.
     /// </summary>
-    public static partial class TopicInstructorExtensions
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="id">The value to filter by.</param>
+    /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.TopicInstructor"/> or null if not found.</returns>
+    public static InstructorIQ.Core.Data.Entities.TopicInstructor GetByKey(this IQueryable<InstructorIQ.Core.Data.Entities.TopicInstructor> queryable, Guid id)
     {
-        #region Generated Extensions
-        /// <summary>
-        /// Gets an instance by the primary key.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="id">The value to filter by.</param>
-        /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.TopicInstructor"/> or null if not found.</returns>
-        public static InstructorIQ.Core.Data.Entities.TopicInstructor GetByKey(this IQueryable<InstructorIQ.Core.Data.Entities.TopicInstructor> queryable, Guid id)
-        {
-            if (queryable is DbSet<InstructorIQ.Core.Data.Entities.TopicInstructor> dbSet)
-                return dbSet.Find(id);
+        if (queryable is DbSet<InstructorIQ.Core.Data.Entities.TopicInstructor> dbSet)
+            return dbSet.Find(id);
 
-            return queryable.FirstOrDefault(q => q.Id == id);
-        }
+        return queryable.FirstOrDefault(q => q.Id == id);
+    }
 
-        /// <summary>
-        /// Gets an instance by the primary key.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="id">The value to filter by.</param>
-        /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.TopicInstructor"/> or null if not found.</returns>
-        public static ValueTask<InstructorIQ.Core.Data.Entities.TopicInstructor> GetByKeyAsync(this IQueryable<InstructorIQ.Core.Data.Entities.TopicInstructor> queryable, Guid id)
-        {
-            if (queryable is DbSet<InstructorIQ.Core.Data.Entities.TopicInstructor> dbSet)
-                return dbSet.FindAsync(id);
+    /// <summary>
+    /// Gets an instance by the primary key.
+    /// </summary>
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="id">The value to filter by.</param>
+    /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.TopicInstructor"/> or null if not found.</returns>
+    public static ValueTask<InstructorIQ.Core.Data.Entities.TopicInstructor> GetByKeyAsync(this IQueryable<InstructorIQ.Core.Data.Entities.TopicInstructor> queryable, Guid id)
+    {
+        if (queryable is DbSet<InstructorIQ.Core.Data.Entities.TopicInstructor> dbSet)
+            return dbSet.FindAsync(id);
 
-            var task = queryable.FirstOrDefaultAsync(q => q.Id == id);
-            return new ValueTask<InstructorIQ.Core.Data.Entities.TopicInstructor>(task);
-        }
+        var task = queryable.FirstOrDefaultAsync(q => q.Id == id);
+        return new ValueTask<InstructorIQ.Core.Data.Entities.TopicInstructor>(task);
+    }
 
-        /// <summary>
-        /// Filters a sequence of values based on a predicate.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="instructorRoleId">The value to filter by.</param>
-        /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
-        public static IQueryable<InstructorIQ.Core.Data.Entities.TopicInstructor> ByInstructorRoleId(this IQueryable<InstructorIQ.Core.Data.Entities.TopicInstructor> queryable, Guid? instructorRoleId)
-        {
-            return queryable.Where(q => (q.InstructorRoleId == instructorRoleId || (instructorRoleId == null && q.InstructorRoleId == null)));
-        }
+    /// <summary>
+    /// Filters a sequence of values based on a predicate.
+    /// </summary>
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="instructorRoleId">The value to filter by.</param>
+    /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
+    public static IQueryable<InstructorIQ.Core.Data.Entities.TopicInstructor> ByInstructorRoleId(this IQueryable<InstructorIQ.Core.Data.Entities.TopicInstructor> queryable, Guid? instructorRoleId)
+    {
+        return queryable.Where(q => (q.InstructorRoleId == instructorRoleId || (instructorRoleId == null && q.InstructorRoleId == null)));
+    }
 
-        /// <summary>
-        /// Filters a sequence of values based on a predicate.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="topicId">The value to filter by.</param>
-        /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
-        public static IQueryable<InstructorIQ.Core.Data.Entities.TopicInstructor> ByTopicId(this IQueryable<InstructorIQ.Core.Data.Entities.TopicInstructor> queryable, Guid topicId)
-        {
-            return queryable.Where(q => q.TopicId == topicId);
-        }
+    /// <summary>
+    /// Filters a sequence of values based on a predicate.
+    /// </summary>
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="topicId">The value to filter by.</param>
+    /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
+    public static IQueryable<InstructorIQ.Core.Data.Entities.TopicInstructor> ByTopicId(this IQueryable<InstructorIQ.Core.Data.Entities.TopicInstructor> queryable, Guid topicId)
+    {
+        return queryable.Where(q => q.TopicId == topicId);
+    }
 
-        /// <summary>
-        /// Filters a sequence of values based on a predicate.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="topicId">The value to filter by.</param>
-        /// <param name="instructorId">The value to filter by.</param>
-        /// <param name="instructorRoleId">The value to filter by.</param>
-        /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
-        public static IQueryable<InstructorIQ.Core.Data.Entities.TopicInstructor> ByTopicIdInstructorIdInstructorRoleId(this IQueryable<InstructorIQ.Core.Data.Entities.TopicInstructor> queryable, Guid topicId, Guid instructorId, Guid? instructorRoleId)
-        {
-            return queryable.Where(q => q.TopicId == topicId
-                && q.InstructorId == instructorId
-                    && (q.InstructorRoleId == instructorRoleId || (instructorRoleId == null && q.InstructorRoleId == null)));
-            }
+    /// <summary>
+    /// Filters a sequence of values based on a predicate.
+    /// </summary>
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="topicId">The value to filter by.</param>
+    /// <param name="instructorId">The value to filter by.</param>
+    /// <param name="instructorRoleId">The value to filter by.</param>
+    /// <returns>An <see cref="T: System.Linq.IQueryable`1" /> that contains elements from the input sequence that satisfy the condition specified.</returns>
+    public static IQueryable<InstructorIQ.Core.Data.Entities.TopicInstructor> ByTopicIdInstructorIdInstructorRoleId(this IQueryable<InstructorIQ.Core.Data.Entities.TopicInstructor> queryable, Guid topicId, Guid instructorId, Guid? instructorRoleId)
+    {
+        return queryable.Where(q => q.TopicId == topicId
+            && q.InstructorId == instructorId
+                && (q.InstructorRoleId == instructorRoleId || (instructorRoleId == null && q.InstructorRoleId == null)));
+    }
 
-            #endregion
+    #endregion
 
-        }
-    }
+}
diff --git a/service/src/InstructorIQ.Core/Data/Queries/UserExtensions.cs b/service/src/InstructorIQ.Core/Data/Queries/UserExtensions.cs
index aec20966..568ec0b1 100644
--- a/service/src/InstructorIQ.Core/Data/Queries/UserExtensions.cs
+++ b/service/src/InstructorIQ.Core/Data/Queries/UserExtensions.cs
@@ -2,69 +2,69 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+
 using Microsoft.EntityFrameworkCore;
 
-namespace InstructorIQ.Core.Data.Queries
+namespace InstructorIQ.Core.Data.Queries;
+
+/// <summary>
+/// Query extensions for entity <see cref="InstructorIQ.Core.Data.Entities.User" />.
+/// </summary>
+public static partial class UserExtensions
 {
+    #region Generated Extensions
     /// <summary>
-    /// Query extensions for entity <see cref="InstructorIQ.Core.Data.Entities.User" />.
+    /// Gets an instance by the primary key.
     /// </summary>
-    public static partial class UserExtensions
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="id">The value to filter by.</param>
+    /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.User"/> or null if not found.</returns>
+    public static InstructorIQ.Core.Data.Entities.User GetByKey(this IQueryable<InstructorIQ.Core.Data.Entities.User> queryable, Guid id)
     {
-        #region Generated Extensions
-        /// <summary>
-        /// Gets an instance by the primary key.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="id">The value to filter by.</param>
-        /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.User"/> or null if not found.</returns>
-        public static InstructorIQ.Core.Data.Entities.User GetByKey(this IQueryable<InstructorIQ.Core.Data.Entities.User> queryable, Guid id)
-        {
-            if (queryable is DbSet<InstructorIQ.Core.Data.Entities.User> dbSet)
-                return dbSet.Find(id);
+        if (queryable is DbSet<InstructorIQ.Core.Data.Entities.User> dbSet)
+            return dbSet.Find(id);
 
-            return queryable.FirstOrDefault(q => q.Id == id);
-        }
+        return queryable.FirstOrDefault(q => q.Id == id);
+    }
 
-        /// <summary>
-        /// Gets an instance by the primary key.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="id">The value to filter by.</param>
-        /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.User"/> or null if not found.</returns>
-        public static ValueTask<InstructorIQ.Core.Data.Entities.User> GetByKeyAsync(this IQueryable<InstructorIQ.Core.Data.Entities.User> queryable, Guid id)
-        {
-            if (queryable is DbSet<InstructorIQ.Core.Data.Entities.User> dbSet)
-                return dbSet.FindAsync(id);
+    /// <summary>
+    /// Gets an instance by the primary key.
+    /// </summary>
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="id">The value to filter by.</param>
+    /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.User"/> or null if not found.</returns>
+    public static ValueTask<InstructorIQ.Core.Data.Entities.User> GetByKeyAsync(this IQueryable<InstructorIQ.Core.Data.Entities.User> queryable, Guid id)
+    {
+        if (queryable is DbSet<InstructorIQ.Core.Data.Entities.User> dbSet)
+            return dbSet.FindAsync(id);
 
-            var task = queryable.FirstOrDefaultAsync(q => q.Id == id);
-            return new ValueTask<InstructorIQ.Core.Data.Entities.User>(task);
-        }
+        var task = queryable.FirstOrDefaultAsync(q => q.Id == id);
+        return new ValueTask<InstructorIQ.Core.Data.Entities.User>(task);
+    }
 
-        /// <summary>
-        /// Gets an instance of <see cref="T:InstructorIQ.Core.Data.Entities.User"/> by using a unique index.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="emailAddress">The value to filter by.</param>
-        /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.User"/> or null if not found.</returns>
-        public static InstructorIQ.Core.Data.Entities.User GetByEmailAddress(this IQueryable<InstructorIQ.Core.Data.Entities.User> queryable, string emailAddress)
-        {
-            return queryable.FirstOrDefault(q => q.Email == emailAddress);
-        }
+    /// <summary>
+    /// Gets an instance of <see cref="T:InstructorIQ.Core.Data.Entities.User"/> by using a unique index.
+    /// </summary>
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="emailAddress">The value to filter by.</param>
+    /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.User"/> or null if not found.</returns>
+    public static InstructorIQ.Core.Data.Entities.User GetByEmailAddress(this IQueryable<InstructorIQ.Core.Data.Entities.User> queryable, string emailAddress)
+    {
+        return queryable.FirstOrDefault(q => q.Email == emailAddress);
+    }
 
-        /// <summary>
-        /// Gets an instance of <see cref="T:InstructorIQ.Core.Data.Entities.User"/> by using a unique index.
-        /// </summary>
-        /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
-        /// <param name="emailAddress">The value to filter by.</param>
-        /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.User"/> or null if not found.</returns>
-        public static Task<InstructorIQ.Core.Data.Entities.User> GetByEmailAddressAsync(this IQueryable<InstructorIQ.Core.Data.Entities.User> queryable, string emailAddress)
-        {
-            return queryable.FirstOrDefaultAsync(q => q.Email == emailAddress);
-        }
+    /// <summary>
+    /// Gets an instance of <see cref="T:InstructorIQ.Core.Data.Entities.User"/> by using a unique index.
+    /// </summary>
+    /// <param name="queryable">An <see cref="T:System.Linq.IQueryable`1" /> to filter.</param>
+    /// <param name="emailAddress">The value to filter by.</param>
+    /// <returns>An instance of <see cref="T:InstructorIQ.Core.Data.Entities.User"/> or null if not found.</returns>
+    public static Task<InstructorIQ.Core.Data.Entities.User> GetByEmailAddressAsync(this IQueryable<InstructorIQ.Core.Data.Entities.User> queryable, string emailAddress)
+    {
+        return queryable.FirstOrDefaultAsync(q => q.Email == emailAddress);
+    }
 
 
-        #endregion
+    #endregion
 
-    }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Attendance/AttendanceServiceRegistration.cs b/service/src/InstructorIQ.Core/Domain/Attendance/AttendanceServiceRegistration.cs
index c3a85ec5..c6610e1d 100644
--- a/service/src/InstructorIQ.Core/Domain/Attendance/AttendanceServiceRegistration.cs
+++ b/service/src/InstructorIQ.Core/Domain/Attendance/AttendanceServiceRegistration.cs
@@ -14,20 +14,19 @@
 using Microsoft.Extensions.DependencyInjection.Extensions;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain
+namespace InstructorIQ.Core.Domain;
+
+public class AttendanceServiceRegistration : DomainServiceRegistrationBase
 {
-    public class AttendanceServiceRegistration : DomainServiceRegistrationBase
+    [RegisterServices]
+    public override void Register(IServiceCollection services)
     {
-        [RegisterServices]
-        public override void Register(IServiceCollection services)
-        {
-            RegisterEntityQuery<Guid, Attendance, AttendanceReadModel>(services);
-            RegisterEntityQuery<Guid, Attendance, AttendanceSessionModel>(services);
+        RegisterEntityQuery<Guid, Attendance, AttendanceReadModel>(services);
+        RegisterEntityQuery<Guid, Attendance, AttendanceSessionModel>(services);
 
-            RegisterEntityCommand<Guid, Attendance, AttendanceReadModel, AttendanceCreateModel, AttendanceUpdateModel>(services);
-            RegisterEntityCommand<Guid, Attendance, AttendanceSessionModel, AttendanceCreateModel, AttendanceUpdateModel>(services);
+        RegisterEntityCommand<Guid, Attendance, AttendanceReadModel, AttendanceCreateModel, AttendanceUpdateModel>(services);
+        RegisterEntityCommand<Guid, Attendance, AttendanceSessionModel, AttendanceCreateModel, AttendanceUpdateModel>(services);
 
-            services.TryAddTransient<IRequestHandler<AttendanceSessionQuery, IReadOnlyCollection<AttendanceSessionModel>>, AttendanceSessionQueryHandler>();
-        }
+        services.TryAddTransient<IRequestHandler<AttendanceSessionQuery, IReadOnlyCollection<AttendanceSessionModel>>, AttendanceSessionQueryHandler>();
     }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Attendance/Handlers/AttendanceSessionQueryHandler.cs b/service/src/InstructorIQ.Core/Domain/Attendance/Handlers/AttendanceSessionQueryHandler.cs
index 09294211..7994b355 100644
--- a/service/src/InstructorIQ.Core/Domain/Attendance/Handlers/AttendanceSessionQueryHandler.cs
+++ b/service/src/InstructorIQ.Core/Domain/Attendance/Handlers/AttendanceSessionQueryHandler.cs
@@ -1,58 +1,62 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+
 using AutoMapper;
 using AutoMapper.QueryableExtensions;
+
 using EntityChange.Extensions;
+
 using InstructorIQ.Core.Data;
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Domain.Queries;
+
 using MediatR.CommandQuery.EntityFrameworkCore.Handlers;
+
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Handlers
+namespace InstructorIQ.Core.Domain.Handlers;
+
+public class AttendanceSessionQueryHandler
+    : DataContextHandlerBase<InstructorIQContext, AttendanceSessionQuery, IReadOnlyCollection<AttendanceSessionModel>>
 {
-    public class AttendanceSessionQueryHandler
-        : DataContextHandlerBase<InstructorIQContext, AttendanceSessionQuery, IReadOnlyCollection<AttendanceSessionModel>>
+    public AttendanceSessionQueryHandler(ILoggerFactory loggerFactory, InstructorIQContext dataContext, IMapper mapper)
+        : base(loggerFactory, dataContext, mapper)
     {
-        public AttendanceSessionQueryHandler(ILoggerFactory loggerFactory, InstructorIQContext dataContext, IMapper mapper)
-            : base(loggerFactory, dataContext, mapper)
-        {
-        }
+    }
 
-        protected override async Task<IReadOnlyCollection<AttendanceSessionModel>> Process(AttendanceSessionQuery request, CancellationToken cancellationToken)
-        {
-            var query = DataContext.Attendances
-                .AsNoTracking()
-                .Where(q => q.TenantId == request.TenantId);
+    protected override async Task<IReadOnlyCollection<AttendanceSessionModel>> Process(AttendanceSessionQuery request, CancellationToken cancellationToken)
+    {
+        var query = DataContext.Attendances
+            .AsNoTracking()
+            .Where(q => q.TenantId == request.TenantId);
 
-            if (request.TopicId.HasValue)
-                query = query.Where(q => q.Session.TopicId == request.TopicId.Value);
+        if (request.TopicId.HasValue)
+            query = query.Where(q => q.Session.TopicId == request.TopicId.Value);
 
-            if (request.UserName.HasValue())
-                query = query.Where(q => q.AttendeeEmail.Contains(request.UserName));
+        if (request.UserName.HasValue())
+            query = query.Where(q => q.AttendeeEmail.Contains(request.UserName));
 
-            if (request.StartDate.HasValue)
-                query = query.Where(q => q.Session.StartDate >= request.StartDate && q.Session.StartDate < request.EndDate);
+        if (request.StartDate.HasValue)
+            query = query.Where(q => q.Session.StartDate >= request.StartDate && q.Session.StartDate < request.EndDate);
 
-            if (request.SearchText.HasValue())
-                query = query.Where(q => q.Session.Topic.Title.Contains(request.SearchText));
+        if (request.SearchText.HasValue())
+            query = query.Where(q => q.Session.Topic.Title.Contains(request.SearchText));
 
-            query = query
-                .OrderBy(q => q.Session.StartDate)
-                .ThenBy(q => q.Session.StartTime)
-                .ThenBy(q => q.Session.Topic.Title);
+        query = query
+            .OrderBy(q => q.Session.StartDate)
+            .ThenBy(q => q.Session.StartTime)
+            .ThenBy(q => q.Session.Topic.Title);
 
-            var result = await query
-                .ProjectTo<AttendanceSessionModel>(Mapper.ConfigurationProvider)
-                .ToListAsync(cancellationToken);
+        var result = await query
+            .ProjectTo<AttendanceSessionModel>(Mapper.ConfigurationProvider)
+            .ToListAsync(cancellationToken);
 
-            return result;
-        }
+        return result;
     }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Attendance/Mapping/AttendanceProfile.cs b/service/src/InstructorIQ.Core/Domain/Attendance/Mapping/AttendanceProfile.cs
index a8d3c790..0836ec4f 100644
--- a/service/src/InstructorIQ.Core/Domain/Attendance/Mapping/AttendanceProfile.cs
+++ b/service/src/InstructorIQ.Core/Domain/Attendance/Mapping/AttendanceProfile.cs
@@ -1,52 +1,53 @@
 using System;
+
 using AutoMapper;
+
 using InstructorIQ.Core.Data.Entities;
 using InstructorIQ.Core.Domain.Models;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Mapping
+namespace InstructorIQ.Core.Domain.Mapping;
+
+/// <summary>
+/// Mapper class for entity <see cref="Attendance"/> .
+/// </summary>
+public class AttendanceProfile
+    : Profile
 {
     /// <summary>
-    /// Mapper class for entity <see cref="Attendance"/> .
+    /// Initializes a new instance of the <see cref="AttendanceProfile"/> class.
     /// </summary>
-    public class AttendanceProfile
-        : Profile
+    public AttendanceProfile()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AttendanceProfile"/> class.
-        /// </summary>
-        public AttendanceProfile()
-        {
-            CreateMap<AttendanceCreateModel, Attendance>();
-
-            CreateMap<AttendanceUpdateModel, Attendance>()
-                .ForMember(d => d.RowVersion, opt => opt.MapFrom(s => Convert.FromBase64String(s.RowVersion)));
-
-            CreateMap<Attendance, AttendanceReadModel>()
-                .ForMember(d => d.RowVersion, opt => opt.MapFrom(s => Convert.ToBase64String(s.RowVersion)))
-                .ForMember(d => d.TopicId, opt => opt.MapFrom(s => s.Session.TopicId))
-                .ForMember(d => d.TopicTitle, opt => opt.MapFrom(s => s.Session.Topic.Title))
-                .ForMember(d => d.IsRequired, opt => opt.MapFrom(s => s.Session.Topic.IsRequired))
-                .ForMember(d => d.LocationId, opt => opt.MapFrom(s => s.Session.LocationId))
-                .ForMember(d => d.LocationName, opt => opt.MapFrom(s => s.Session.Location.Name));
-
-            CreateMap<Attendance, AttendanceSessionModel>()
-                .ForMember(d => d.RowVersion, opt => opt.MapFrom(s => Convert.ToBase64String(s.RowVersion)))
-                .ForMember(d => d.TopicId, opt => opt.MapFrom(s => s.Session.TopicId))
-                .ForMember(d => d.TopicTitle, opt => opt.MapFrom(s => s.Session.Topic.Title))
-                .ForMember(d => d.IsRequired, opt => opt.MapFrom(s => s.Session.Topic.IsRequired))
-                .ForMember(d => d.LocationId, opt => opt.MapFrom(s => s.Session.LocationId))
-                .ForMember(d => d.LocationName, opt => opt.MapFrom(s => s.Session.Location.Name))
-                .ForMember(d => d.GroupId, opt => opt.MapFrom(s => s.Session.GroupId))
-                .ForMember(d => d.GroupName, opt => opt.MapFrom(s => s.Session.Group.Name))
-                .ForMember(d => d.StartDate, opt => opt.MapFrom(s => s.Session.StartDate))
-                .ForMember(d => d.StartTime, opt => opt.MapFrom(s => s.Session.StartTime))
-                .ForMember(d => d.EndDate, opt => opt.MapFrom(s => s.Session.EndDate))
-                .ForMember(d => d.EndTime, opt => opt.MapFrom(s => s.Session.EndTime));
-
-            CreateMap<Attendance, AttendanceUpdateModel>()
-                .ForMember(d => d.RowVersion, opt => opt.MapFrom(s => Convert.ToBase64String(s.RowVersion)));
-        }
+        CreateMap<AttendanceCreateModel, Attendance>();
+
+        CreateMap<AttendanceUpdateModel, Attendance>()
+            .ForMember(d => d.RowVersion, opt => opt.MapFrom(s => Convert.FromBase64String(s.RowVersion)));
 
+        CreateMap<Attendance, AttendanceReadModel>()
+            .ForMember(d => d.RowVersion, opt => opt.MapFrom(s => Convert.ToBase64String(s.RowVersion)))
+            .ForMember(d => d.TopicId, opt => opt.MapFrom(s => s.Session.TopicId))
+            .ForMember(d => d.TopicTitle, opt => opt.MapFrom(s => s.Session.Topic.Title))
+            .ForMember(d => d.IsRequired, opt => opt.MapFrom(s => s.Session.Topic.IsRequired))
+            .ForMember(d => d.LocationId, opt => opt.MapFrom(s => s.Session.LocationId))
+            .ForMember(d => d.LocationName, opt => opt.MapFrom(s => s.Session.Location.Name));
+
+        CreateMap<Attendance, AttendanceSessionModel>()
+            .ForMember(d => d.RowVersion, opt => opt.MapFrom(s => Convert.ToBase64String(s.RowVersion)))
+            .ForMember(d => d.TopicId, opt => opt.MapFrom(s => s.Session.TopicId))
+            .ForMember(d => d.TopicTitle, opt => opt.MapFrom(s => s.Session.Topic.Title))
+            .ForMember(d => d.IsRequired, opt => opt.MapFrom(s => s.Session.Topic.IsRequired))
+            .ForMember(d => d.LocationId, opt => opt.MapFrom(s => s.Session.LocationId))
+            .ForMember(d => d.LocationName, opt => opt.MapFrom(s => s.Session.Location.Name))
+            .ForMember(d => d.GroupId, opt => opt.MapFrom(s => s.Session.GroupId))
+            .ForMember(d => d.GroupName, opt => opt.MapFrom(s => s.Session.Group.Name))
+            .ForMember(d => d.StartDate, opt => opt.MapFrom(s => s.Session.StartDate))
+            .ForMember(d => d.StartTime, opt => opt.MapFrom(s => s.Session.StartTime))
+            .ForMember(d => d.EndDate, opt => opt.MapFrom(s => s.Session.EndDate))
+            .ForMember(d => d.EndTime, opt => opt.MapFrom(s => s.Session.EndTime));
+
+        CreateMap<Attendance, AttendanceUpdateModel>()
+            .ForMember(d => d.RowVersion, opt => opt.MapFrom(s => Convert.ToBase64String(s.RowVersion)));
     }
+
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Attendance/Models/AttendanceCreateModel.cs b/service/src/InstructorIQ.Core/Domain/Attendance/Models/AttendanceCreateModel.cs
index 3f0adf5e..498e8cf1 100644
--- a/service/src/InstructorIQ.Core/Domain/Attendance/Models/AttendanceCreateModel.cs
+++ b/service/src/InstructorIQ.Core/Domain/Attendance/Models/AttendanceCreateModel.cs
@@ -1,73 +1,73 @@
 using System;
+
 using MediatR.CommandQuery.Models;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Models
+namespace InstructorIQ.Core.Domain.Models;
+
+/// <summary>
+/// View Model class
+/// </summary>
+public class AttendanceCreateModel
+    : EntityCreateModel<Guid>
 {
+    #region Generated Properties
     /// <summary>
-    /// View Model class
+    /// Gets or sets the property value for 'SessionId'.
     /// </summary>
-    public class AttendanceCreateModel
-        : EntityCreateModel<Guid>
-    {
-        #region Generated Properties
-        /// <summary>
-        /// Gets or sets the property value for 'SessionId'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'SessionId'.
-        /// </value>
-        public Guid SessionId { get; set; }
+    /// <value>
+    /// The property value for 'SessionId'.
+    /// </value>
+    public Guid SessionId { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'Attended'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Attended'.
-        /// </value>
-        public DateTimeOffset Attended { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'Attended'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'Attended'.
+    /// </value>
+    public DateTimeOffset Attended { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'AttendeeEmail'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'AttendeeEmail'.
-        /// </value>
-        public string AttendeeEmail { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'AttendeeEmail'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'AttendeeEmail'.
+    /// </value>
+    public string AttendeeEmail { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'AttendeeName'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'AttendeeName'.
-        /// </value>
-        public string AttendeeName { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'AttendeeName'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'AttendeeName'.
+    /// </value>
+    public string AttendeeName { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'Signature'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Signature'.
-        /// </value>
-        public string Signature { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'Signature'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'Signature'.
+    /// </value>
+    public string Signature { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'SignatureType'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'SignatureType'.
-        /// </value>
-        public string SignatureType { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'SignatureType'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'SignatureType'.
+    /// </value>
+    public string SignatureType { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'TenantId'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'TenantId'.
-        /// </value>
-        public Guid TenantId { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'TenantId'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'TenantId'.
+    /// </value>
+    public Guid TenantId { get; set; }
 
-        #endregion
+    #endregion
 
-    }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Attendance/Models/AttendanceReadModel.cs b/service/src/InstructorIQ.Core/Domain/Attendance/Models/AttendanceReadModel.cs
index c587bbcf..6bf482c2 100644
--- a/service/src/InstructorIQ.Core/Domain/Attendance/Models/AttendanceReadModel.cs
+++ b/service/src/InstructorIQ.Core/Domain/Attendance/Models/AttendanceReadModel.cs
@@ -1,83 +1,83 @@
 using System;
+
 using MediatR.CommandQuery.Definitions;
 using MediatR.CommandQuery.Models;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Models
+namespace InstructorIQ.Core.Domain.Models;
+
+/// <summary>
+/// View Model class
+/// </summary>
+public class AttendanceReadModel
+    : EntityReadModel<Guid>, IHaveTenant<Guid>
 {
+    #region Generated Properties
     /// <summary>
-    /// View Model class
+    /// Gets or sets the property value for 'SessionId'.
     /// </summary>
-    public class AttendanceReadModel
-        : EntityReadModel<Guid>, IHaveTenant<Guid>
-    {
-        #region Generated Properties
-        /// <summary>
-        /// Gets or sets the property value for 'SessionId'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'SessionId'.
-        /// </value>
-        public Guid SessionId { get; set; }
+    /// <value>
+    /// The property value for 'SessionId'.
+    /// </value>
+    public Guid SessionId { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'Attended'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Attended'.
-        /// </value>
-        public DateTimeOffset Attended { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'Attended'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'Attended'.
+    /// </value>
+    public DateTimeOffset Attended { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'AttendeeEmail'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'AttendeeEmail'.
-        /// </value>
-        public string AttendeeEmail { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'AttendeeEmail'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'AttendeeEmail'.
+    /// </value>
+    public string AttendeeEmail { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'AttendeeName'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'AttendeeName'.
-        /// </value>
-        public string AttendeeName { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'AttendeeName'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'AttendeeName'.
+    /// </value>
+    public string AttendeeName { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'Signature'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Signature'.
-        /// </value>
-        public string Signature { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'Signature'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'Signature'.
+    /// </value>
+    public string Signature { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'SignatureType'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'SignatureType'.
-        /// </value>
-        public string SignatureType { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'SignatureType'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'SignatureType'.
+    /// </value>
+    public string SignatureType { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'TenantId'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'TenantId'.
-        /// </value>
-        public Guid TenantId { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'TenantId'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'TenantId'.
+    /// </value>
+    public Guid TenantId { get; set; }
 
-        #endregion
+    #endregion
 
-        public Guid TopicId { get; set; }
+    public Guid TopicId { get; set; }
 
-        public string TopicTitle { get; set; }
+    public string TopicTitle { get; set; }
 
-        public Guid? LocationId { get; set; }
+    public Guid? LocationId { get; set; }
 
-        public string LocationName { get; set; }
+    public string LocationName { get; set; }
 
-        public bool IsRequired { get; set; }
-    }
+    public bool IsRequired { get; set; }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Attendance/Models/AttendanceSessionModel.cs b/service/src/InstructorIQ.Core/Domain/Attendance/Models/AttendanceSessionModel.cs
index 39fde898..aa3b9043 100644
--- a/service/src/InstructorIQ.Core/Domain/Attendance/Models/AttendanceSessionModel.cs
+++ b/service/src/InstructorIQ.Core/Domain/Attendance/Models/AttendanceSessionModel.cs
@@ -1,49 +1,49 @@
 using System;
+
 using MediatR.CommandQuery.Definitions;
 using MediatR.CommandQuery.Models;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Models
+namespace InstructorIQ.Core.Domain.Models;
+
+public class AttendanceSessionModel
+    : EntityReadModel<Guid>, IHaveTenant<Guid>
 {
-    public class AttendanceSessionModel
-        : EntityReadModel<Guid>, IHaveTenant<Guid>
-    {
-        public Guid SessionId { get; set; }
+    public Guid SessionId { get; set; }
+
+    public DateTimeOffset Attended { get; set; }
+
+    public string AttendeeEmail { get; set; }
 
-        public DateTimeOffset Attended { get; set; }
+    public string AttendeeName { get; set; }
 
-        public string AttendeeEmail { get; set; }
+    public Guid TenantId { get; set; }
 
-        public string AttendeeName { get; set; }
-        
-        public Guid TenantId { get; set; }
 
+    // session data
+    public DateTime? StartDate { get; set; }
 
-        // session data
-        public DateTime? StartDate { get; set; }
+    public TimeSpan? StartTime { get; set; }
 
-        public TimeSpan? StartTime { get; set; }
+    public DateTime? EndDate { get; set; }
 
-        public DateTime? EndDate { get; set; }
+    public TimeSpan? EndTime { get; set; }
 
-        public TimeSpan? EndTime { get; set; }
 
+    // topic data
+    public Guid TopicId { get; set; }
 
-        // topic data
-        public Guid TopicId { get; set; }
+    public string TopicTitle { get; set; }
 
-        public string TopicTitle { get; set; }
+    // location data
+    public Guid? LocationId { get; set; }
 
-        // location data
-        public Guid? LocationId { get; set; }
+    public string LocationName { get; set; }
 
-        public string LocationName { get; set; }
+    // group data
+    public Guid? GroupId { get; set; }
 
-        // group data
-        public Guid? GroupId { get; set; }
-        
-        public string GroupName { get; set; }
+    public string GroupName { get; set; }
 
-        public bool IsRequired { get; set; }
-    }
-}
\ No newline at end of file
+    public bool IsRequired { get; set; }
+}
diff --git a/service/src/InstructorIQ.Core/Domain/Attendance/Models/AttendanceUpdateModel.cs b/service/src/InstructorIQ.Core/Domain/Attendance/Models/AttendanceUpdateModel.cs
index c76a371a..e07245d1 100644
--- a/service/src/InstructorIQ.Core/Domain/Attendance/Models/AttendanceUpdateModel.cs
+++ b/service/src/InstructorIQ.Core/Domain/Attendance/Models/AttendanceUpdateModel.cs
@@ -1,74 +1,74 @@
 using System;
+
 using MediatR.CommandQuery.Definitions;
 using MediatR.CommandQuery.Models;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Models
+namespace InstructorIQ.Core.Domain.Models;
+
+/// <summary>
+/// View Model class
+/// </summary>
+public class AttendanceUpdateModel
+    : EntityUpdateModel, IHaveTenant<Guid>
 {
+    #region Generated Properties
     /// <summary>
-    /// View Model class
+    /// Gets or sets the property value for 'SessionId'.
     /// </summary>
-    public class AttendanceUpdateModel
-        : EntityUpdateModel, IHaveTenant<Guid>
-    {
-        #region Generated Properties
-        /// <summary>
-        /// Gets or sets the property value for 'SessionId'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'SessionId'.
-        /// </value>
-        public Guid SessionId { get; set; }
+    /// <value>
+    /// The property value for 'SessionId'.
+    /// </value>
+    public Guid SessionId { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'Attended'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Attended'.
-        /// </value>
-        public DateTimeOffset Attended { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'Attended'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'Attended'.
+    /// </value>
+    public DateTimeOffset Attended { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'AttendeeEmail'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'AttendeeEmail'.
-        /// </value>
-        public string AttendeeEmail { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'AttendeeEmail'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'AttendeeEmail'.
+    /// </value>
+    public string AttendeeEmail { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'AttendeeName'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'AttendeeName'.
-        /// </value>
-        public string AttendeeName { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'AttendeeName'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'AttendeeName'.
+    /// </value>
+    public string AttendeeName { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'Signature'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Signature'.
-        /// </value>
-        public string Signature { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'Signature'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'Signature'.
+    /// </value>
+    public string Signature { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'SignatureType'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'SignatureType'.
-        /// </value>
-        public string SignatureType { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'SignatureType'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'SignatureType'.
+    /// </value>
+    public string SignatureType { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'TenantId'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'TenantId'.
-        /// </value>
-        public Guid TenantId { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'TenantId'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'TenantId'.
+    /// </value>
+    public Guid TenantId { get; set; }
 
-        #endregion
+    #endregion
 
-    }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Attendance/Queries/AttendanceSessionQuery.cs b/service/src/InstructorIQ.Core/Domain/Attendance/Queries/AttendanceSessionQuery.cs
index a8471332..64c77bc8 100644
--- a/service/src/InstructorIQ.Core/Domain/Attendance/Queries/AttendanceSessionQuery.cs
+++ b/service/src/InstructorIQ.Core/Domain/Attendance/Queries/AttendanceSessionQuery.cs
@@ -1,55 +1,56 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Security.Principal;
 using System.Text;
+
 using InstructorIQ.Core.Domain.Models;
+
 using MediatR.CommandQuery.Queries;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Queries
+namespace InstructorIQ.Core.Domain.Queries;
+
+public class AttendanceSessionQuery : PrincipalQueryBase<IReadOnlyCollection<AttendanceSessionModel>>
 {
-    public class AttendanceSessionQuery : PrincipalQueryBase<IReadOnlyCollection<AttendanceSessionModel>>
+    public AttendanceSessionQuery(IPrincipal principal, Guid tenantId) : base(principal)
     {
-        public AttendanceSessionQuery(IPrincipal principal, Guid tenantId) : base(principal)
-        {
-            TenantId = tenantId;
-        }
+        TenantId = tenantId;
+    }
 
-        public AttendanceSessionQuery(IPrincipal principal, Guid tenantId, int year)
-            : base(principal)
-        {
-            TenantId = tenantId;
+    public AttendanceSessionQuery(IPrincipal principal, Guid tenantId, int year)
+        : base(principal)
+    {
+        TenantId = tenantId;
 
-            StartDate = new DateTime(year, 1, 1);
-            EndDate = StartDate.Value.AddYears(1);
-        }
+        StartDate = new DateTime(year, 1, 1);
+        EndDate = StartDate.Value.AddYears(1);
+    }
 
-        public AttendanceSessionQuery(IPrincipal principal, Guid tenantId, int year, int month)
-            : base(principal)
-        {
-            TenantId = tenantId;
+    public AttendanceSessionQuery(IPrincipal principal, Guid tenantId, int year, int month)
+        : base(principal)
+    {
+        TenantId = tenantId;
 
-            StartDate = new DateTime(year, month, 1);
-            EndDate = StartDate.Value.AddMonths(1);
-        }
+        StartDate = new DateTime(year, month, 1);
+        EndDate = StartDate.Value.AddMonths(1);
+    }
 
-        public AttendanceSessionQuery(IPrincipal principal, Guid tenantId, Guid topicId) : base(principal)
-        {
-            TenantId = tenantId;
-            TopicId = topicId;
-        }
+    public AttendanceSessionQuery(IPrincipal principal, Guid tenantId, Guid topicId) : base(principal)
+    {
+        TenantId = tenantId;
+        TopicId = topicId;
+    }
 
 
-        public Guid TenantId { get; }
+    public Guid TenantId { get; }
 
-        public DateTime? StartDate { get; set; }
+    public DateTime? StartDate { get; set; }
 
-        public DateTime? EndDate { get; set; }
+    public DateTime? EndDate { get; set; }
 
-        public Guid? TopicId { get; set; }
+    public Guid? TopicId { get; set; }
 
-        public string UserName { get; set; }
+    public string UserName { get; set; }
 
-        public string SearchText { get; set; }
-    }
+    public string SearchText { get; set; }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Attendance/Validation/AttendanceCreateModelValidator.cs b/service/src/InstructorIQ.Core/Domain/Attendance/Validation/AttendanceCreateModelValidator.cs
index bfe79f09..d8f21c98 100644
--- a/service/src/InstructorIQ.Core/Domain/Attendance/Validation/AttendanceCreateModelValidator.cs
+++ b/service/src/InstructorIQ.Core/Domain/Attendance/Validation/AttendanceCreateModelValidator.cs
@@ -1,28 +1,29 @@
 using System;
+
 using FluentValidation;
+
 using InstructorIQ.Core.Domain.Models;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Validation
+namespace InstructorIQ.Core.Domain.Validation;
+
+/// <summary>
+/// Validator class for <see cref="AttendanceCreateModel"/> .
+/// </summary>
+public partial class AttendanceCreateModelValidator
+    : AbstractValidator<AttendanceCreateModel>
 {
     /// <summary>
-    /// Validator class for <see cref="AttendanceCreateModel"/> .
+    /// Initializes a new instance of the <see cref="AttendanceCreateModelValidator"/> class.
     /// </summary>
-    public partial class AttendanceCreateModelValidator
-        : AbstractValidator<AttendanceCreateModel>
+    public AttendanceCreateModelValidator()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AttendanceCreateModelValidator"/> class.
-        /// </summary>
-        public AttendanceCreateModelValidator()
-        {
-            #region Generated Constructor
-            RuleFor(p => p.AttendeeEmail).NotEmpty();
-            RuleFor(p => p.AttendeeEmail).MaximumLength(256);
-            RuleFor(p => p.AttendeeName).MaximumLength(256);
-            RuleFor(p => p.SignatureType).MaximumLength(256);
-            #endregion
-        }
-
+        #region Generated Constructor
+        RuleFor(p => p.AttendeeEmail).NotEmpty();
+        RuleFor(p => p.AttendeeEmail).MaximumLength(256);
+        RuleFor(p => p.AttendeeName).MaximumLength(256);
+        RuleFor(p => p.SignatureType).MaximumLength(256);
+        #endregion
     }
+
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Attendance/Validation/AttendanceUpdateModelValidator.cs b/service/src/InstructorIQ.Core/Domain/Attendance/Validation/AttendanceUpdateModelValidator.cs
index a75ec921..8b237252 100644
--- a/service/src/InstructorIQ.Core/Domain/Attendance/Validation/AttendanceUpdateModelValidator.cs
+++ b/service/src/InstructorIQ.Core/Domain/Attendance/Validation/AttendanceUpdateModelValidator.cs
@@ -1,28 +1,29 @@
 using System;
+
 using FluentValidation;
+
 using InstructorIQ.Core.Domain.Models;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Validation
+namespace InstructorIQ.Core.Domain.Validation;
+
+/// <summary>
+/// Validator class for <see cref="AttendanceUpdateModel"/> .
+/// </summary>
+public partial class AttendanceUpdateModelValidator
+    : AbstractValidator<AttendanceUpdateModel>
 {
     /// <summary>
-    /// Validator class for <see cref="AttendanceUpdateModel"/> .
+    /// Initializes a new instance of the <see cref="AttendanceUpdateModelValidator"/> class.
     /// </summary>
-    public partial class AttendanceUpdateModelValidator
-        : AbstractValidator<AttendanceUpdateModel>
+    public AttendanceUpdateModelValidator()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AttendanceUpdateModelValidator"/> class.
-        /// </summary>
-        public AttendanceUpdateModelValidator()
-        {
-            #region Generated Constructor
-            RuleFor(p => p.AttendeeEmail).NotEmpty();
-            RuleFor(p => p.AttendeeEmail).MaximumLength(256);
-            RuleFor(p => p.AttendeeName).MaximumLength(256);
-            RuleFor(p => p.SignatureType).MaximumLength(256);
-            #endregion
-        }
-
+        #region Generated Constructor
+        RuleFor(p => p.AttendeeEmail).NotEmpty();
+        RuleFor(p => p.AttendeeEmail).MaximumLength(256);
+        RuleFor(p => p.AttendeeName).MaximumLength(256);
+        RuleFor(p => p.SignatureType).MaximumLength(256);
+        #endregion
     }
+
 }
diff --git a/service/src/InstructorIQ.Core/Domain/AuthenticationEvent/AuthenticationEventServiceRegistration.cs b/service/src/InstructorIQ.Core/Domain/AuthenticationEvent/AuthenticationEventServiceRegistration.cs
index fb9663a5..c9e60c06 100644
--- a/service/src/InstructorIQ.Core/Domain/AuthenticationEvent/AuthenticationEventServiceRegistration.cs
+++ b/service/src/InstructorIQ.Core/Domain/AuthenticationEvent/AuthenticationEventServiceRegistration.cs
@@ -7,19 +7,18 @@
 using Microsoft.Extensions.DependencyInjection;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain
-{
-    public class AuthenticationEventServiceRegistration : DomainServiceRegistrationBase
-    {
+namespace InstructorIQ.Core.Domain;
 
-        [RegisterServices]
-        public override void Register(IServiceCollection services)
-        {
-            RegisterEntityQuery<Guid, InstructorIQ.Core.Data.Entities.AuthenticationEvent, AuthenticationEventReadModel>(services);
+public class AuthenticationEventServiceRegistration : DomainServiceRegistrationBase
+{
 
-            RegisterEntityCommand<Guid, InstructorIQ.Core.Data.Entities.AuthenticationEvent, AuthenticationEventReadModel, AuthenticationEventCreateModel, AuthenticationEventUpdateModel>(services);
+    [RegisterServices]
+    public override void Register(IServiceCollection services)
+    {
+        RegisterEntityQuery<Guid, InstructorIQ.Core.Data.Entities.AuthenticationEvent, AuthenticationEventReadModel>(services);
 
-        }
+        RegisterEntityCommand<Guid, InstructorIQ.Core.Data.Entities.AuthenticationEvent, AuthenticationEventReadModel, AuthenticationEventCreateModel, AuthenticationEventUpdateModel>(services);
 
     }
+
 }
diff --git a/service/src/InstructorIQ.Core/Domain/AuthenticationEvent/Mapping/AuthenticationEventProfile.cs b/service/src/InstructorIQ.Core/Domain/AuthenticationEvent/Mapping/AuthenticationEventProfile.cs
index 26d276fa..49b7c9f2 100644
--- a/service/src/InstructorIQ.Core/Domain/AuthenticationEvent/Mapping/AuthenticationEventProfile.cs
+++ b/service/src/InstructorIQ.Core/Domain/AuthenticationEvent/Mapping/AuthenticationEventProfile.cs
@@ -1,25 +1,26 @@
 using System;
+
 using AutoMapper;
+
 using InstructorIQ.Core.Data.Entities;
 using InstructorIQ.Core.Domain.Models;
 
-namespace InstructorIQ.Core.Domain.Mapping
+namespace InstructorIQ.Core.Domain.Mapping;
+
+/// <summary>
+/// Mapper class for entity <see cref="AuthenticationEvent"/> .
+/// </summary>
+public partial class AuthenticationEventProfile
+    : Profile
 {
     /// <summary>
-    /// Mapper class for entity <see cref="AuthenticationEvent"/> .
+    /// Initializes a new instance of the <see cref="AuthenticationEventProfile"/> class.
     /// </summary>
-    public partial class AuthenticationEventProfile
-        : Profile
+    public AuthenticationEventProfile()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AuthenticationEventProfile"/> class.
-        /// </summary>
-        public AuthenticationEventProfile()
-        {
-            CreateMap<InstructorIQ.Core.Data.Entities.AuthenticationEvent, InstructorIQ.Core.Domain.Models.AuthenticationEventReadModel>();
-            CreateMap<InstructorIQ.Core.Domain.Models.AuthenticationEventCreateModel, InstructorIQ.Core.Data.Entities.AuthenticationEvent>();
-            CreateMap<InstructorIQ.Core.Domain.Models.AuthenticationEventUpdateModel, InstructorIQ.Core.Data.Entities.AuthenticationEvent>();
-        }
-
+        CreateMap<InstructorIQ.Core.Data.Entities.AuthenticationEvent, InstructorIQ.Core.Domain.Models.AuthenticationEventReadModel>();
+        CreateMap<InstructorIQ.Core.Domain.Models.AuthenticationEventCreateModel, InstructorIQ.Core.Data.Entities.AuthenticationEvent>();
+        CreateMap<InstructorIQ.Core.Domain.Models.AuthenticationEventUpdateModel, InstructorIQ.Core.Data.Entities.AuthenticationEvent>();
     }
+
 }
diff --git a/service/src/InstructorIQ.Core/Domain/AuthenticationEvent/Models/AuthenticationEventCreateModel.cs b/service/src/InstructorIQ.Core/Domain/AuthenticationEvent/Models/AuthenticationEventCreateModel.cs
index f3b13ca3..1f36bf37 100644
--- a/service/src/InstructorIQ.Core/Domain/AuthenticationEvent/Models/AuthenticationEventCreateModel.cs
+++ b/service/src/InstructorIQ.Core/Domain/AuthenticationEvent/Models/AuthenticationEventCreateModel.cs
@@ -1,106 +1,106 @@
 using System;
 using System.Collections.Generic;
+
 using MediatR.CommandQuery.Models;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Models
+namespace InstructorIQ.Core.Domain.Models;
+
+/// <summary>
+/// View Model class
+/// </summary>
+public partial class AuthenticationEventCreateModel
+    : EntityCreateModel<Guid>
 {
+    #region Generated Properties
     /// <summary>
-    /// View Model class
+    /// Gets or sets the property value for 'EmailAddress'.
     /// </summary>
-    public partial class AuthenticationEventCreateModel
-        : EntityCreateModel<Guid>
-    {
-        #region Generated Properties
-        /// <summary>
-        /// Gets or sets the property value for 'EmailAddress'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'EmailAddress'.
-        /// </value>
-        public string EmailAddress { get; set; }
+    /// <value>
+    /// The property value for 'EmailAddress'.
+    /// </value>
+    public string EmailAddress { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'UserName'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'UserName'.
-        /// </value>
-        public string UserName { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'UserName'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'UserName'.
+    /// </value>
+    public string UserName { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'UserAgent'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'UserAgent'.
-        /// </value>
-        public string UserAgent { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'UserAgent'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'UserAgent'.
+    /// </value>
+    public string UserAgent { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'Browser'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Browser'.
-        /// </value>
-        public string Browser { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'Browser'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'Browser'.
+    /// </value>
+    public string Browser { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'OperatingSystem'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'OperatingSystem'.
-        /// </value>
-        public string OperatingSystem { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'OperatingSystem'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'OperatingSystem'.
+    /// </value>
+    public string OperatingSystem { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'DeviceFamily'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'DeviceFamily'.
-        /// </value>
-        public string DeviceFamily { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'DeviceFamily'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'DeviceFamily'.
+    /// </value>
+    public string DeviceFamily { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'DeviceBrand'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'DeviceBrand'.
-        /// </value>
-        public string DeviceBrand { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'DeviceBrand'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'DeviceBrand'.
+    /// </value>
+    public string DeviceBrand { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'DeviceModel'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'DeviceModel'.
-        /// </value>
-        public string DeviceModel { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'DeviceModel'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'DeviceModel'.
+    /// </value>
+    public string DeviceModel { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'IpAddress'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'IpAddress'.
-        /// </value>
-        public string IpAddress { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'IpAddress'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'IpAddress'.
+    /// </value>
+    public string IpAddress { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'IsSuccessful'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'IsSuccessful'.
-        /// </value>
-        public bool IsSuccessful { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'IsSuccessful'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'IsSuccessful'.
+    /// </value>
+    public bool IsSuccessful { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'FailureMessage'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'FailureMessage'.
-        /// </value>
-        public string FailureMessage { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'FailureMessage'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'FailureMessage'.
+    /// </value>
+    public string FailureMessage { get; set; }
 
-        #endregion
+    #endregion
 
-    }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/AuthenticationEvent/Models/AuthenticationEventReadModel.cs b/service/src/InstructorIQ.Core/Domain/AuthenticationEvent/Models/AuthenticationEventReadModel.cs
index b9d11e67..dfb0fb44 100644
--- a/service/src/InstructorIQ.Core/Domain/AuthenticationEvent/Models/AuthenticationEventReadModel.cs
+++ b/service/src/InstructorIQ.Core/Domain/AuthenticationEvent/Models/AuthenticationEventReadModel.cs
@@ -1,106 +1,106 @@
 using System;
 using System.Collections.Generic;
+
 using MediatR.CommandQuery.Models;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Models
+namespace InstructorIQ.Core.Domain.Models;
+
+/// <summary>
+/// View Model class
+/// </summary>
+public partial class AuthenticationEventReadModel
+    : EntityReadModel<Guid>
 {
+    #region Generated Properties
     /// <summary>
-    /// View Model class
+    /// Gets or sets the property value for 'EmailAddress'.
     /// </summary>
-    public partial class AuthenticationEventReadModel
-        : EntityReadModel<Guid>
-    {
-        #region Generated Properties
-        /// <summary>
-        /// Gets or sets the property value for 'EmailAddress'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'EmailAddress'.
-        /// </value>
-        public string EmailAddress { get; set; }
+    /// <value>
+    /// The property value for 'EmailAddress'.
+    /// </value>
+    public string EmailAddress { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'UserName'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'UserName'.
-        /// </value>
-        public string UserName { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'UserName'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'UserName'.
+    /// </value>
+    public string UserName { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'UserAgent'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'UserAgent'.
-        /// </value>
-        public string UserAgent { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'UserAgent'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'UserAgent'.
+    /// </value>
+    public string UserAgent { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'Browser'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Browser'.
-        /// </value>
-        public string Browser { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'Browser'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'Browser'.
+    /// </value>
+    public string Browser { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'OperatingSystem'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'OperatingSystem'.
-        /// </value>
-        public string OperatingSystem { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'OperatingSystem'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'OperatingSystem'.
+    /// </value>
+    public string OperatingSystem { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'DeviceFamily'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'DeviceFamily'.
-        /// </value>
-        public string DeviceFamily { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'DeviceFamily'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'DeviceFamily'.
+    /// </value>
+    public string DeviceFamily { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'DeviceBrand'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'DeviceBrand'.
-        /// </value>
-        public string DeviceBrand { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'DeviceBrand'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'DeviceBrand'.
+    /// </value>
+    public string DeviceBrand { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'DeviceModel'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'DeviceModel'.
-        /// </value>
-        public string DeviceModel { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'DeviceModel'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'DeviceModel'.
+    /// </value>
+    public string DeviceModel { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'IpAddress'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'IpAddress'.
-        /// </value>
-        public string IpAddress { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'IpAddress'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'IpAddress'.
+    /// </value>
+    public string IpAddress { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'IsSuccessful'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'IsSuccessful'.
-        /// </value>
-        public bool IsSuccessful { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'IsSuccessful'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'IsSuccessful'.
+    /// </value>
+    public bool IsSuccessful { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'FailureMessage'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'FailureMessage'.
-        /// </value>
-        public string FailureMessage { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'FailureMessage'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'FailureMessage'.
+    /// </value>
+    public string FailureMessage { get; set; }
 
-        #endregion
+    #endregion
 
-    }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/AuthenticationEvent/Models/AuthenticationEventUpdateModel.cs b/service/src/InstructorIQ.Core/Domain/AuthenticationEvent/Models/AuthenticationEventUpdateModel.cs
index a4d1c8fd..cf575306 100644
--- a/service/src/InstructorIQ.Core/Domain/AuthenticationEvent/Models/AuthenticationEventUpdateModel.cs
+++ b/service/src/InstructorIQ.Core/Domain/AuthenticationEvent/Models/AuthenticationEventUpdateModel.cs
@@ -1,106 +1,106 @@
 using System;
 using System.Collections.Generic;
+
 using MediatR.CommandQuery.Models;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Models
+namespace InstructorIQ.Core.Domain.Models;
+
+/// <summary>
+/// View Model class
+/// </summary>
+public partial class AuthenticationEventUpdateModel
+    : EntityUpdateModel
 {
+    #region Generated Properties
     /// <summary>
-    /// View Model class
+    /// Gets or sets the property value for 'EmailAddress'.
     /// </summary>
-    public partial class AuthenticationEventUpdateModel
-        : EntityUpdateModel
-    {
-        #region Generated Properties
-        /// <summary>
-        /// Gets or sets the property value for 'EmailAddress'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'EmailAddress'.
-        /// </value>
-        public string EmailAddress { get; set; }
+    /// <value>
+    /// The property value for 'EmailAddress'.
+    /// </value>
+    public string EmailAddress { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'UserName'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'UserName'.
-        /// </value>
-        public string UserName { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'UserName'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'UserName'.
+    /// </value>
+    public string UserName { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'UserAgent'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'UserAgent'.
-        /// </value>
-        public string UserAgent { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'UserAgent'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'UserAgent'.
+    /// </value>
+    public string UserAgent { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'Browser'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Browser'.
-        /// </value>
-        public string Browser { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'Browser'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'Browser'.
+    /// </value>
+    public string Browser { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'OperatingSystem'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'OperatingSystem'.
-        /// </value>
-        public string OperatingSystem { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'OperatingSystem'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'OperatingSystem'.
+    /// </value>
+    public string OperatingSystem { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'DeviceFamily'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'DeviceFamily'.
-        /// </value>
-        public string DeviceFamily { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'DeviceFamily'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'DeviceFamily'.
+    /// </value>
+    public string DeviceFamily { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'DeviceBrand'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'DeviceBrand'.
-        /// </value>
-        public string DeviceBrand { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'DeviceBrand'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'DeviceBrand'.
+    /// </value>
+    public string DeviceBrand { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'DeviceModel'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'DeviceModel'.
-        /// </value>
-        public string DeviceModel { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'DeviceModel'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'DeviceModel'.
+    /// </value>
+    public string DeviceModel { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'IpAddress'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'IpAddress'.
-        /// </value>
-        public string IpAddress { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'IpAddress'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'IpAddress'.
+    /// </value>
+    public string IpAddress { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'IsSuccessful'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'IsSuccessful'.
-        /// </value>
-        public bool IsSuccessful { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'IsSuccessful'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'IsSuccessful'.
+    /// </value>
+    public bool IsSuccessful { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'FailureMessage'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'FailureMessage'.
-        /// </value>
-        public string FailureMessage { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'FailureMessage'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'FailureMessage'.
+    /// </value>
+    public string FailureMessage { get; set; }
 
-        #endregion
+    #endregion
 
-    }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/AuthenticationEvent/Validation/AuthenticationEventCreateModelValidator.cs b/service/src/InstructorIQ.Core/Domain/AuthenticationEvent/Validation/AuthenticationEventCreateModelValidator.cs
index 1fff09c1..05873de9 100644
--- a/service/src/InstructorIQ.Core/Domain/AuthenticationEvent/Validation/AuthenticationEventCreateModelValidator.cs
+++ b/service/src/InstructorIQ.Core/Domain/AuthenticationEvent/Validation/AuthenticationEventCreateModelValidator.cs
@@ -1,34 +1,35 @@
 using System;
+
 using FluentValidation;
+
 using InstructorIQ.Core.Domain.Models;
 
-namespace InstructorIQ.Core.Domain.Validation
+namespace InstructorIQ.Core.Domain.Validation;
+
+/// <summary>
+/// Validator class for <see cref="AuthenticationEventCreateModel"/> .
+/// </summary>
+public partial class AuthenticationEventCreateModelValidator
+    : AbstractValidator<AuthenticationEventCreateModel>
 {
     /// <summary>
-    /// Validator class for <see cref="AuthenticationEventCreateModel"/> .
+    /// Initializes a new instance of the <see cref="AuthenticationEventCreateModelValidator"/> class.
     /// </summary>
-    public partial class AuthenticationEventCreateModelValidator
-        : AbstractValidator<AuthenticationEventCreateModel>
+    public AuthenticationEventCreateModelValidator()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AuthenticationEventCreateModelValidator"/> class.
-        /// </summary>
-        public AuthenticationEventCreateModelValidator()
-        {
-            #region Generated Constructor
-            RuleFor(p => p.EmailAddress).NotEmpty();
-            RuleFor(p => p.EmailAddress).MaximumLength(256);
-            RuleFor(p => p.UserName).NotEmpty();
-            RuleFor(p => p.UserName).MaximumLength(256);
-            RuleFor(p => p.Browser).MaximumLength(256);
-            RuleFor(p => p.OperatingSystem).MaximumLength(256);
-            RuleFor(p => p.DeviceFamily).MaximumLength(256);
-            RuleFor(p => p.DeviceBrand).MaximumLength(256);
-            RuleFor(p => p.DeviceModel).MaximumLength(256);
-            RuleFor(p => p.IpAddress).MaximumLength(50);
-            RuleFor(p => p.FailureMessage).MaximumLength(256);
-            #endregion
-        }
-
+        #region Generated Constructor
+        RuleFor(p => p.EmailAddress).NotEmpty();
+        RuleFor(p => p.EmailAddress).MaximumLength(256);
+        RuleFor(p => p.UserName).NotEmpty();
+        RuleFor(p => p.UserName).MaximumLength(256);
+        RuleFor(p => p.Browser).MaximumLength(256);
+        RuleFor(p => p.OperatingSystem).MaximumLength(256);
+        RuleFor(p => p.DeviceFamily).MaximumLength(256);
+        RuleFor(p => p.DeviceBrand).MaximumLength(256);
+        RuleFor(p => p.DeviceModel).MaximumLength(256);
+        RuleFor(p => p.IpAddress).MaximumLength(50);
+        RuleFor(p => p.FailureMessage).MaximumLength(256);
+        #endregion
     }
+
 }
diff --git a/service/src/InstructorIQ.Core/Domain/AuthenticationEvent/Validation/AuthenticationEventUpdateModelValidator.cs b/service/src/InstructorIQ.Core/Domain/AuthenticationEvent/Validation/AuthenticationEventUpdateModelValidator.cs
index 47af2267..e9890d6d 100644
--- a/service/src/InstructorIQ.Core/Domain/AuthenticationEvent/Validation/AuthenticationEventUpdateModelValidator.cs
+++ b/service/src/InstructorIQ.Core/Domain/AuthenticationEvent/Validation/AuthenticationEventUpdateModelValidator.cs
@@ -1,34 +1,35 @@
 using System;
+
 using FluentValidation;
+
 using InstructorIQ.Core.Domain.Models;
 
-namespace InstructorIQ.Core.Domain.Validation
+namespace InstructorIQ.Core.Domain.Validation;
+
+/// <summary>
+/// Validator class for <see cref="AuthenticationEventUpdateModel"/> .
+/// </summary>
+public partial class AuthenticationEventUpdateModelValidator
+    : AbstractValidator<AuthenticationEventUpdateModel>
 {
     /// <summary>
-    /// Validator class for <see cref="AuthenticationEventUpdateModel"/> .
+    /// Initializes a new instance of the <see cref="AuthenticationEventUpdateModelValidator"/> class.
     /// </summary>
-    public partial class AuthenticationEventUpdateModelValidator
-        : AbstractValidator<AuthenticationEventUpdateModel>
+    public AuthenticationEventUpdateModelValidator()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AuthenticationEventUpdateModelValidator"/> class.
-        /// </summary>
-        public AuthenticationEventUpdateModelValidator()
-        {
-            #region Generated Constructor
-            RuleFor(p => p.EmailAddress).NotEmpty();
-            RuleFor(p => p.EmailAddress).MaximumLength(256);
-            RuleFor(p => p.UserName).NotEmpty();
-            RuleFor(p => p.UserName).MaximumLength(256);
-            RuleFor(p => p.Browser).MaximumLength(256);
-            RuleFor(p => p.OperatingSystem).MaximumLength(256);
-            RuleFor(p => p.DeviceFamily).MaximumLength(256);
-            RuleFor(p => p.DeviceBrand).MaximumLength(256);
-            RuleFor(p => p.DeviceModel).MaximumLength(256);
-            RuleFor(p => p.IpAddress).MaximumLength(50);
-            RuleFor(p => p.FailureMessage).MaximumLength(256);
-            #endregion
-        }
-
+        #region Generated Constructor
+        RuleFor(p => p.EmailAddress).NotEmpty();
+        RuleFor(p => p.EmailAddress).MaximumLength(256);
+        RuleFor(p => p.UserName).NotEmpty();
+        RuleFor(p => p.UserName).MaximumLength(256);
+        RuleFor(p => p.Browser).MaximumLength(256);
+        RuleFor(p => p.OperatingSystem).MaximumLength(256);
+        RuleFor(p => p.DeviceFamily).MaximumLength(256);
+        RuleFor(p => p.DeviceBrand).MaximumLength(256);
+        RuleFor(p => p.DeviceModel).MaximumLength(256);
+        RuleFor(p => p.IpAddress).MaximumLength(50);
+        RuleFor(p => p.FailureMessage).MaximumLength(256);
+        #endregion
     }
+
 }
diff --git a/service/src/InstructorIQ.Core/Domain/CommandQueryServiceModule.cs b/service/src/InstructorIQ.Core/Domain/CommandQueryServiceModule.cs
index 194869ad..e206d614 100644
--- a/service/src/InstructorIQ.Core/Domain/CommandQueryServiceModule.cs
+++ b/service/src/InstructorIQ.Core/Domain/CommandQueryServiceModule.cs
@@ -7,19 +7,18 @@
 
 using Microsoft.Extensions.DependencyInjection;
 
-namespace InstructorIQ.Core.Domain
+namespace InstructorIQ.Core.Domain;
+
+
+public class CommandQueryServiceModule
 {
 
-    public class CommandQueryServiceModule
+    [RegisterServices]
+    public void Register(IServiceCollection services)
     {
-
-        [RegisterServices]
-        public void Register(IServiceCollection services)
-        {
-            services.AddMediator();
-            services.AddAutoMapper(typeof(InstructorIQContext).Assembly);
-            services.AddValidatorsFromAssembly<InstructorIQContext>();
-            services.AddEntityAudit();
-        }
+        services.AddMediator();
+        services.AddAutoMapper(typeof(InstructorIQContext).Assembly);
+        services.AddValidatorsFromAssembly<InstructorIQContext>();
+        services.AddEntityAudit();
     }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Discussion/DiscussionServiceRegistration.cs b/service/src/InstructorIQ.Core/Domain/Discussion/DiscussionServiceRegistration.cs
index 29ae9d35..cf9b678b 100644
--- a/service/src/InstructorIQ.Core/Domain/Discussion/DiscussionServiceRegistration.cs
+++ b/service/src/InstructorIQ.Core/Domain/Discussion/DiscussionServiceRegistration.cs
@@ -15,20 +15,19 @@
 using Microsoft.Extensions.DependencyInjection.Extensions;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain
+namespace InstructorIQ.Core.Domain;
+
+public class DiscussionServiceRegistration : DomainServiceRegistrationBase
 {
-    public class DiscussionServiceRegistration : DomainServiceRegistrationBase
-    {
 
-        [RegisterServices]
-        public override void Register(IServiceCollection services)
-        {
-            RegisterEntityQuery<Guid, Discussion, DiscussionReadModel>(services);
-            RegisterEntityCommand<Guid, Discussion, DiscussionReadModel, DiscussionCreateModel, DiscussionUpdateModel>(services);
+    [RegisterServices]
+    public override void Register(IServiceCollection services)
+    {
+        RegisterEntityQuery<Guid, Discussion, DiscussionReadModel>(services);
+        RegisterEntityCommand<Guid, Discussion, DiscussionReadModel, DiscussionCreateModel, DiscussionUpdateModel>(services);
 
-            services.TryAddTransient<IRequestHandler<DiscussionTopicQuery, IReadOnlyCollection<DiscussionReadModel>>, DiscussionTopicQueryHandler>();
-            services.TryAddTransient<IRequestHandler<DiscussionHistoryQuery, IReadOnlyCollection<AuditRecord<Guid>>>, DiscussionHistoryQueryHandler>();
+        services.TryAddTransient<IRequestHandler<DiscussionTopicQuery, IReadOnlyCollection<DiscussionReadModel>>, DiscussionTopicQueryHandler>();
+        services.TryAddTransient<IRequestHandler<DiscussionHistoryQuery, IReadOnlyCollection<AuditRecord<Guid>>>, DiscussionHistoryQueryHandler>();
 
-        }
     }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Discussion/Handlers/DiscussionTopicQueryHandler.cs b/service/src/InstructorIQ.Core/Domain/Discussion/Handlers/DiscussionTopicQueryHandler.cs
index e5d587a1..0e5bee55 100644
--- a/service/src/InstructorIQ.Core/Domain/Discussion/Handlers/DiscussionTopicQueryHandler.cs
+++ b/service/src/InstructorIQ.Core/Domain/Discussion/Handlers/DiscussionTopicQueryHandler.cs
@@ -1,37 +1,40 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+
 using AutoMapper;
 using AutoMapper.QueryableExtensions;
+
 using InstructorIQ.Core.Data;
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Domain.Queries;
+
 using MediatR.CommandQuery.EntityFrameworkCore.Handlers;
+
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Handlers
+namespace InstructorIQ.Core.Domain.Handlers;
+
+public class DiscussionTopicQueryHandler : DataContextHandlerBase<InstructorIQContext, DiscussionTopicQuery, IReadOnlyCollection<DiscussionReadModel>>
 {
-    public class DiscussionTopicQueryHandler : DataContextHandlerBase<InstructorIQContext, DiscussionTopicQuery, IReadOnlyCollection<DiscussionReadModel>>
+    public DiscussionTopicQueryHandler(ILoggerFactory loggerFactory, InstructorIQContext dataContext, IMapper mapper)
+        : base(loggerFactory, dataContext, mapper)
     {
-        public DiscussionTopicQueryHandler(ILoggerFactory loggerFactory, InstructorIQContext dataContext, IMapper mapper)
-            : base(loggerFactory, dataContext, mapper)
-        {
-        }
-
-        protected override async Task<IReadOnlyCollection<DiscussionReadModel>> Process(DiscussionTopicQuery request, CancellationToken cancellationToken)
-        {
-            var query = DataContext.Discussions
-                .AsNoTracking()
-                .Where(s => s.TopicId == request.TopicId);
-
-            var result = await query
-                .ProjectTo<DiscussionReadModel>(Mapper.ConfigurationProvider)
-                .ToListAsync(cancellationToken);
-
-            return result;
-        }
     }
-}
\ No newline at end of file
+
+    protected override async Task<IReadOnlyCollection<DiscussionReadModel>> Process(DiscussionTopicQuery request, CancellationToken cancellationToken)
+    {
+        var query = DataContext.Discussions
+            .AsNoTracking()
+            .Where(s => s.TopicId == request.TopicId);
+
+        var result = await query
+            .ProjectTo<DiscussionReadModel>(Mapper.ConfigurationProvider)
+            .ToListAsync(cancellationToken);
+
+        return result;
+    }
+}
diff --git a/service/src/InstructorIQ.Core/Domain/Discussion/Mapping/DiscussionProfile.cs b/service/src/InstructorIQ.Core/Domain/Discussion/Mapping/DiscussionProfile.cs
index bca9c3da..a038a34c 100644
--- a/service/src/InstructorIQ.Core/Domain/Discussion/Mapping/DiscussionProfile.cs
+++ b/service/src/InstructorIQ.Core/Domain/Discussion/Mapping/DiscussionProfile.cs
@@ -1,38 +1,39 @@
 using System;
+
 using AutoMapper;
+
 using InstructorIQ.Core.Data.Entities;
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Models;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Mapping
+namespace InstructorIQ.Core.Domain.Mapping;
+
+/// <summary>
+/// Mapper class for entity <see cref="Discussion"/> .
+/// </summary>
+public class DiscussionProfile
+    : Profile
 {
     /// <summary>
-    /// Mapper class for entity <see cref="Discussion"/> .
+    /// Initializes a new instance of the <see cref="DiscussionProfile"/> class.
     /// </summary>
-    public class DiscussionProfile
-        : Profile
+    public DiscussionProfile()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DiscussionProfile"/> class.
-        /// </summary>
-        public DiscussionProfile()
-        {
-            CreateMap<DiscussionCreateModel, Discussion>();
+        CreateMap<DiscussionCreateModel, Discussion>();
 
-            CreateMap<DiscussionUpdateModel, Discussion>()
-                .ForMember(d => d.RowVersion, opt => opt.MapFrom(s => Convert.FromBase64String(s.RowVersion)));
+        CreateMap<DiscussionUpdateModel, Discussion>()
+            .ForMember(d => d.RowVersion, opt => opt.MapFrom(s => Convert.FromBase64String(s.RowVersion)));
 
-            CreateMap<Discussion, DiscussionReadModel>()
-                .ForMember(d => d.RowVersion, opt => opt.MapFrom(s => Convert.ToBase64String(s.RowVersion)))
-                .ForMember(d => d.TopicTitle, opt => opt.MapFrom(s => s.Topic.Title))
-                .ForMember(d => d.TenantName, opt => opt.MapFrom(s => s.Tenant.Name));
+        CreateMap<Discussion, DiscussionReadModel>()
+            .ForMember(d => d.RowVersion, opt => opt.MapFrom(s => Convert.ToBase64String(s.RowVersion)))
+            .ForMember(d => d.TopicTitle, opt => opt.MapFrom(s => s.Topic.Title))
+            .ForMember(d => d.TenantName, opt => opt.MapFrom(s => s.Tenant.Name));
 
-            CreateMap<Discussion, DiscussionUpdateModel>()
-                .ForMember(d => d.RowVersion, opt => opt.MapFrom(s => Convert.ToBase64String(s.RowVersion)));
-
-            CreateMap<UserAgentModel, DiscussionCreateModel>();
-        }
+        CreateMap<Discussion, DiscussionUpdateModel>()
+            .ForMember(d => d.RowVersion, opt => opt.MapFrom(s => Convert.ToBase64String(s.RowVersion)));
 
+        CreateMap<UserAgentModel, DiscussionCreateModel>();
     }
+
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Discussion/Mapping/DiscussionReadModelProfile.cs b/service/src/InstructorIQ.Core/Domain/Discussion/Mapping/DiscussionReadModelProfile.cs
index 3bbbf81b..87ff552f 100644
--- a/service/src/InstructorIQ.Core/Domain/Discussion/Mapping/DiscussionReadModelProfile.cs
+++ b/service/src/InstructorIQ.Core/Domain/Discussion/Mapping/DiscussionReadModelProfile.cs
@@ -1,34 +1,34 @@
 using EntityChange;
+
 using InstructorIQ.Core.Domain.Models;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Mapping
+namespace InstructorIQ.Core.Domain.Mapping;
+
+public class DiscussionReadModelProfile : EntityProfile<DiscussionReadModel>
 {
-    public class DiscussionReadModelProfile : EntityProfile<DiscussionReadModel>
+    public override void Configure()
     {
-        public override void Configure()
-        {
-            AutoMap();
+        AutoMap();
 
-            Property(p => p.TenantId).Ignore();
-            Property(p => p.TopicId).Ignore();
+        Property(p => p.TenantId).Ignore();
+        Property(p => p.TopicId).Ignore();
 
-            Property(p => p.UserAgent).Ignore();
-            Property(p => p.Browser).Ignore();
-            Property(p => p.OperatingSystem).Ignore();
-            Property(p => p.DeviceFamily).Ignore();
-            Property(p => p.DeviceBrand).Ignore();
-            Property(p => p.DeviceModel).Ignore();
-            Property(p => p.IpAddress).Ignore();
+        Property(p => p.UserAgent).Ignore();
+        Property(p => p.Browser).Ignore();
+        Property(p => p.OperatingSystem).Ignore();
+        Property(p => p.DeviceFamily).Ignore();
+        Property(p => p.DeviceBrand).Ignore();
+        Property(p => p.DeviceModel).Ignore();
+        Property(p => p.IpAddress).Ignore();
 
-            Property(p => p.Created).Ignore();
-            Property(p => p.CreatedBy).Ignore();
-            Property(p => p.Updated).Ignore();
-            Property(p => p.UpdatedBy).Ignore();
-            Property(p => p.RowVersion).Ignore();
+        Property(p => p.Created).Ignore();
+        Property(p => p.CreatedBy).Ignore();
+        Property(p => p.Updated).Ignore();
+        Property(p => p.UpdatedBy).Ignore();
+        Property(p => p.RowVersion).Ignore();
 
-            Property(p => p.PeriodStart).Ignore();
-            Property(p => p.PeriodEnd).Ignore();
-        }
+        Property(p => p.PeriodStart).Ignore();
+        Property(p => p.PeriodEnd).Ignore();
     }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.Core/Domain/Discussion/Models/DiscussionCreateModel.cs b/service/src/InstructorIQ.Core/Domain/Discussion/Models/DiscussionCreateModel.cs
index e663d9c3..3af49e3f 100644
--- a/service/src/InstructorIQ.Core/Domain/Discussion/Models/DiscussionCreateModel.cs
+++ b/service/src/InstructorIQ.Core/Domain/Discussion/Models/DiscussionCreateModel.cs
@@ -1,136 +1,136 @@
 using System;
+
 using MediatR.CommandQuery.Models;
 
-namespace InstructorIQ.Core.Domain.Models
+namespace InstructorIQ.Core.Domain.Models;
+
+/// <summary>
+/// View Model class
+/// </summary>
+public partial class DiscussionCreateModel
+    : EntityCreateModel<Guid>
 {
+    #region Generated Properties
+    /// <summary>
+    /// Gets or sets the property value for 'TopicId'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'TopicId'.
+    /// </value>
+    public Guid TopicId { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'TenantId'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'TenantId'.
+    /// </value>
+    public Guid TenantId { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'Message'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'Message'.
+    /// </value>
+    public string Message { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'MessageDate'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'MessageDate'.
+    /// </value>
+    public DateTimeOffset MessageDate { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'EmailAddress'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'EmailAddress'.
+    /// </value>
+    public string EmailAddress { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'DisplayName'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'DisplayName'.
+    /// </value>
+    public string DisplayName { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'UserAgent'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'UserAgent'.
+    /// </value>
+    public string UserAgent { get; set; }
+
     /// <summary>
-    /// View Model class
+    /// Gets or sets the property value for 'Browser'.
     /// </summary>
-    public partial class DiscussionCreateModel
-        : EntityCreateModel<Guid>
-    {
-        #region Generated Properties
-        /// <summary>
-        /// Gets or sets the property value for 'TopicId'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'TopicId'.
-        /// </value>
-        public Guid TopicId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'TenantId'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'TenantId'.
-        /// </value>
-        public Guid TenantId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'Message'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Message'.
-        /// </value>
-        public string Message { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'MessageDate'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'MessageDate'.
-        /// </value>
-        public DateTimeOffset MessageDate { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'EmailAddress'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'EmailAddress'.
-        /// </value>
-        public string EmailAddress { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'DisplayName'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'DisplayName'.
-        /// </value>
-        public string DisplayName { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'UserAgent'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'UserAgent'.
-        /// </value>
-        public string UserAgent { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'Browser'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Browser'.
-        /// </value>
-        public string Browser { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'OperatingSystem'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'OperatingSystem'.
-        /// </value>
-        public string OperatingSystem { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'DeviceFamily'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'DeviceFamily'.
-        /// </value>
-        public string DeviceFamily { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'DeviceBrand'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'DeviceBrand'.
-        /// </value>
-        public string DeviceBrand { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'DeviceModel'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'DeviceModel'.
-        /// </value>
-        public string DeviceModel { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'IpAddress'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'IpAddress'.
-        /// </value>
-        public string IpAddress { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'PeriodStart'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'PeriodStart'.
-        /// </value>
-        public DateTime PeriodStart { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'PeriodEnd'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'PeriodEnd'.
-        /// </value>
-        public DateTime PeriodEnd { get; set; }
-
-        #endregion
-
-    }
+    /// <value>
+    /// The property value for 'Browser'.
+    /// </value>
+    public string Browser { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'OperatingSystem'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'OperatingSystem'.
+    /// </value>
+    public string OperatingSystem { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'DeviceFamily'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'DeviceFamily'.
+    /// </value>
+    public string DeviceFamily { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'DeviceBrand'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'DeviceBrand'.
+    /// </value>
+    public string DeviceBrand { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'DeviceModel'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'DeviceModel'.
+    /// </value>
+    public string DeviceModel { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'IpAddress'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'IpAddress'.
+    /// </value>
+    public string IpAddress { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'PeriodStart'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'PeriodStart'.
+    /// </value>
+    public DateTime PeriodStart { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'PeriodEnd'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'PeriodEnd'.
+    /// </value>
+    public DateTime PeriodEnd { get; set; }
+
+    #endregion
+
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Discussion/Models/DiscussionHistoryQuery.cs b/service/src/InstructorIQ.Core/Domain/Discussion/Models/DiscussionHistoryQuery.cs
index ddcf994d..cc5f28b5 100644
--- a/service/src/InstructorIQ.Core/Domain/Discussion/Models/DiscussionHistoryQuery.cs
+++ b/service/src/InstructorIQ.Core/Domain/Discussion/Models/DiscussionHistoryQuery.cs
@@ -1,27 +1,25 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Security.Principal;
+
 using MediatR.CommandQuery.Audit;
 using MediatR.CommandQuery.Queries;
 
-namespace InstructorIQ.Core.Domain.Models
+namespace InstructorIQ.Core.Domain.Models;
+
+public class DiscussionHistoryQuery : CacheableQueryBase<IReadOnlyCollection<AuditRecord<Guid>>>
 {
-    public class DiscussionHistoryQuery : CacheableQueryBase<IReadOnlyCollection<AuditRecord<Guid>>>
+    public DiscussionHistoryQuery(IPrincipal principal) : base(principal)
     {
-        public DiscussionHistoryQuery(IPrincipal principal) : base(principal)
-        {
-        }
+    }
 
-        public Guid? Id { get; set; }
+    public Guid? Id { get; set; }
 
-        public Guid? TopicId { get; set; }
+    public Guid? TopicId { get; set; }
 
-        public override string GetCacheKey()
-        {
-            var hash = HashCode.Combine(Id, TopicId);
-            return $"{nameof(DiscussionHistoryQuery)}-{hash}";
-        }
+    public override string GetCacheKey()
+    {
+        var hash = HashCode.Combine(Id, TopicId);
+        return $"{nameof(DiscussionHistoryQuery)}-{hash}";
     }
-
-
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Discussion/Models/DiscussionReadModel.cs b/service/src/InstructorIQ.Core/Domain/Discussion/Models/DiscussionReadModel.cs
index 82566bd1..726a4618 100644
--- a/service/src/InstructorIQ.Core/Domain/Discussion/Models/DiscussionReadModel.cs
+++ b/service/src/InstructorIQ.Core/Domain/Discussion/Models/DiscussionReadModel.cs
@@ -1,140 +1,140 @@
 using System;
+
 using MediatR.CommandQuery.Definitions;
 using MediatR.CommandQuery.Models;
 
-namespace InstructorIQ.Core.Domain.Models
+namespace InstructorIQ.Core.Domain.Models;
+
+/// <summary>
+/// View Model class
+/// </summary>
+public partial class DiscussionReadModel
+    : EntityReadModel<Guid>, ITrackHistory
 {
+    #region Generated Properties
+    /// <summary>
+    /// Gets or sets the property value for 'TopicId'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'TopicId'.
+    /// </value>
+    public Guid TopicId { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'TenantId'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'TenantId'.
+    /// </value>
+    public Guid TenantId { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'Message'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'Message'.
+    /// </value>
+    public string Message { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'MessageDate'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'MessageDate'.
+    /// </value>
+    public DateTimeOffset MessageDate { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'EmailAddress'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'EmailAddress'.
+    /// </value>
+    public string EmailAddress { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'DisplayName'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'DisplayName'.
+    /// </value>
+    public string DisplayName { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'UserAgent'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'UserAgent'.
+    /// </value>
+    public string UserAgent { get; set; }
+
     /// <summary>
-    /// View Model class
+    /// Gets or sets the property value for 'Browser'.
     /// </summary>
-    public partial class DiscussionReadModel
-        : EntityReadModel<Guid>, ITrackHistory
-    {
-        #region Generated Properties
-        /// <summary>
-        /// Gets or sets the property value for 'TopicId'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'TopicId'.
-        /// </value>
-        public Guid TopicId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'TenantId'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'TenantId'.
-        /// </value>
-        public Guid TenantId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'Message'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Message'.
-        /// </value>
-        public string Message { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'MessageDate'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'MessageDate'.
-        /// </value>
-        public DateTimeOffset MessageDate { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'EmailAddress'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'EmailAddress'.
-        /// </value>
-        public string EmailAddress { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'DisplayName'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'DisplayName'.
-        /// </value>
-        public string DisplayName { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'UserAgent'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'UserAgent'.
-        /// </value>
-        public string UserAgent { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'Browser'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Browser'.
-        /// </value>
-        public string Browser { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'OperatingSystem'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'OperatingSystem'.
-        /// </value>
-        public string OperatingSystem { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'DeviceFamily'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'DeviceFamily'.
-        /// </value>
-        public string DeviceFamily { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'DeviceBrand'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'DeviceBrand'.
-        /// </value>
-        public string DeviceBrand { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'DeviceModel'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'DeviceModel'.
-        /// </value>
-        public string DeviceModel { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'IpAddress'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'IpAddress'.
-        /// </value>
-        public string IpAddress { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'PeriodStart'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'PeriodStart'.
-        /// </value>
-        public DateTime PeriodStart { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'PeriodEnd'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'PeriodEnd'.
-        /// </value>
-        public DateTime PeriodEnd { get; set; }
-
-        #endregion
-
-        public string TenantName { get; set; }
-
-        public string TopicTitle { get; }
-    }
+    /// <value>
+    /// The property value for 'Browser'.
+    /// </value>
+    public string Browser { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'OperatingSystem'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'OperatingSystem'.
+    /// </value>
+    public string OperatingSystem { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'DeviceFamily'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'DeviceFamily'.
+    /// </value>
+    public string DeviceFamily { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'DeviceBrand'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'DeviceBrand'.
+    /// </value>
+    public string DeviceBrand { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'DeviceModel'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'DeviceModel'.
+    /// </value>
+    public string DeviceModel { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'IpAddress'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'IpAddress'.
+    /// </value>
+    public string IpAddress { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'PeriodStart'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'PeriodStart'.
+    /// </value>
+    public DateTime PeriodStart { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'PeriodEnd'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'PeriodEnd'.
+    /// </value>
+    public DateTime PeriodEnd { get; set; }
+
+    #endregion
+
+    public string TenantName { get; set; }
+
+    public string TopicTitle { get; }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Discussion/Models/DiscussionUpdateModel.cs b/service/src/InstructorIQ.Core/Domain/Discussion/Models/DiscussionUpdateModel.cs
index b0ebc0b1..14ada692 100644
--- a/service/src/InstructorIQ.Core/Domain/Discussion/Models/DiscussionUpdateModel.cs
+++ b/service/src/InstructorIQ.Core/Domain/Discussion/Models/DiscussionUpdateModel.cs
@@ -1,136 +1,136 @@
 using System;
+
 using MediatR.CommandQuery.Models;
 
-namespace InstructorIQ.Core.Domain.Models
+namespace InstructorIQ.Core.Domain.Models;
+
+/// <summary>
+/// View Model class
+/// </summary>
+public partial class DiscussionUpdateModel
+    : EntityUpdateModel
 {
+    #region Generated Properties
+    /// <summary>
+    /// Gets or sets the property value for 'TopicId'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'TopicId'.
+    /// </value>
+    public Guid TopicId { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'TenantId'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'TenantId'.
+    /// </value>
+    public Guid TenantId { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'Message'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'Message'.
+    /// </value>
+    public string Message { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'MessageDate'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'MessageDate'.
+    /// </value>
+    public DateTimeOffset MessageDate { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'EmailAddress'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'EmailAddress'.
+    /// </value>
+    public string EmailAddress { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'DisplayName'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'DisplayName'.
+    /// </value>
+    public string DisplayName { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'UserAgent'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'UserAgent'.
+    /// </value>
+    public string UserAgent { get; set; }
+
     /// <summary>
-    /// View Model class
+    /// Gets or sets the property value for 'Browser'.
     /// </summary>
-    public partial class DiscussionUpdateModel
-        : EntityUpdateModel
-    {
-        #region Generated Properties
-        /// <summary>
-        /// Gets or sets the property value for 'TopicId'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'TopicId'.
-        /// </value>
-        public Guid TopicId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'TenantId'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'TenantId'.
-        /// </value>
-        public Guid TenantId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'Message'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Message'.
-        /// </value>
-        public string Message { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'MessageDate'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'MessageDate'.
-        /// </value>
-        public DateTimeOffset MessageDate { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'EmailAddress'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'EmailAddress'.
-        /// </value>
-        public string EmailAddress { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'DisplayName'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'DisplayName'.
-        /// </value>
-        public string DisplayName { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'UserAgent'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'UserAgent'.
-        /// </value>
-        public string UserAgent { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'Browser'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Browser'.
-        /// </value>
-        public string Browser { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'OperatingSystem'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'OperatingSystem'.
-        /// </value>
-        public string OperatingSystem { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'DeviceFamily'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'DeviceFamily'.
-        /// </value>
-        public string DeviceFamily { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'DeviceBrand'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'DeviceBrand'.
-        /// </value>
-        public string DeviceBrand { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'DeviceModel'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'DeviceModel'.
-        /// </value>
-        public string DeviceModel { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'IpAddress'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'IpAddress'.
-        /// </value>
-        public string IpAddress { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'PeriodStart'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'PeriodStart'.
-        /// </value>
-        public DateTime PeriodStart { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'PeriodEnd'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'PeriodEnd'.
-        /// </value>
-        public DateTime PeriodEnd { get; set; }
-
-        #endregion
-
-    }
+    /// <value>
+    /// The property value for 'Browser'.
+    /// </value>
+    public string Browser { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'OperatingSystem'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'OperatingSystem'.
+    /// </value>
+    public string OperatingSystem { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'DeviceFamily'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'DeviceFamily'.
+    /// </value>
+    public string DeviceFamily { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'DeviceBrand'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'DeviceBrand'.
+    /// </value>
+    public string DeviceBrand { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'DeviceModel'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'DeviceModel'.
+    /// </value>
+    public string DeviceModel { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'IpAddress'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'IpAddress'.
+    /// </value>
+    public string IpAddress { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'PeriodStart'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'PeriodStart'.
+    /// </value>
+    public DateTime PeriodStart { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'PeriodEnd'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'PeriodEnd'.
+    /// </value>
+    public DateTime PeriodEnd { get; set; }
+
+    #endregion
+
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Discussion/Queries/DiscussionHistoryQueryHandler.cs b/service/src/InstructorIQ.Core/Domain/Discussion/Queries/DiscussionHistoryQueryHandler.cs
index db027c73..c1fb1a5b 100644
--- a/service/src/InstructorIQ.Core/Domain/Discussion/Queries/DiscussionHistoryQueryHandler.cs
+++ b/service/src/InstructorIQ.Core/Domain/Discussion/Queries/DiscussionHistoryQueryHandler.cs
@@ -1,73 +1,76 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+
 using AutoMapper;
 using AutoMapper.QueryableExtensions;
+
 using InstructorIQ.Core.Data;
 using InstructorIQ.Core.Data.Entities;
 using InstructorIQ.Core.Domain.Models;
+
 using MediatR.CommandQuery.Audit;
 using MediatR.CommandQuery.EntityFrameworkCore.Handlers;
+
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Queries
+namespace InstructorIQ.Core.Domain.Queries;
+
+public class DiscussionHistoryQueryHandler : DataContextHandlerBase<InstructorIQContext, DiscussionHistoryQuery, IReadOnlyCollection<AuditRecord<Guid>>>
 {
-    public class DiscussionHistoryQueryHandler : DataContextHandlerBase<InstructorIQContext, DiscussionHistoryQuery, IReadOnlyCollection<AuditRecord<Guid>>>
+    private readonly IChangeCollector<Guid, DiscussionReadModel> _changeCollector;
+
+    public DiscussionHistoryQueryHandler(ILoggerFactory loggerFactory, InstructorIQContext dataContext, IMapper mapper, IChangeCollector<Guid, DiscussionReadModel> changeCollector) : base(loggerFactory, dataContext, mapper)
+    {
+        _changeCollector = changeCollector;
+    }
+
+    protected override async Task<IReadOnlyCollection<AuditRecord<Guid>>> Process(DiscussionHistoryQuery request, CancellationToken cancellationToken)
     {
-        private readonly IChangeCollector<Guid, DiscussionReadModel> _changeCollector;
+        var parameters = new List<object>();
 
-        public DiscussionHistoryQueryHandler(ILoggerFactory loggerFactory, InstructorIQContext dataContext, IMapper mapper, IChangeCollector<Guid, DiscussionReadModel> changeCollector) : base(loggerFactory, dataContext, mapper)
+        var sql = new StringBuilder();
+        sql.AppendLine("SELECT *");
+        sql.AppendLine("FROM [IQ].[Discussion]");
+        sql.AppendLine("FOR SYSTEM_TIME ALL");
+
+        if (request.Id.HasValue)
         {
-            _changeCollector = changeCollector;
+            sql.AppendLine("WHERE [Id] = {0}");
+            parameters.Add(request.Id.Value);
         }
-
-        protected override async Task<IReadOnlyCollection<AuditRecord<Guid>>> Process(DiscussionHistoryQuery request, CancellationToken cancellationToken)
+        else if (request.TopicId.HasValue)
         {
-            var parameters = new List<object>();
-
-            var sql = new StringBuilder();
-            sql.AppendLine("SELECT *");
-            sql.AppendLine("FROM [IQ].[Discussion]");
-            sql.AppendLine("FOR SYSTEM_TIME ALL");
-
-            if (request.Id.HasValue)
-            {
-                sql.AppendLine("WHERE [Id] = {0}");
-                parameters.Add(request.Id.Value);
-            }
-            else if (request.TopicId.HasValue)
-            {
-                sql.AppendLine("WHERE [TopicId] = {0}");
-                parameters.Add(request.TopicId.Value);
-            }
-
-            var entities = await DataContext.Discussions
-                .FromSqlRaw(sql.ToString(), parameters.ToArray())
-                .AsNoTracking()
-                .OrderBy(p => p.PeriodEnd)
-                .ProjectTo<DiscussionReadModel>(Mapper.ConfigurationProvider)
-                .ToListAsync(cancellationToken);
-
-            var historyList = new List<AuditRecord<Guid>>();
+            sql.AppendLine("WHERE [TopicId] = {0}");
+            parameters.Add(request.TopicId.Value);
+        }
 
-            // group changes by id
-            foreach (var group in entities.GroupBy(p => p.Id))
-            {
-                var groupList = group
-                    .OrderBy(p => p.PeriodEnd)
-                    .ToList();
+        var entities = await DataContext.Discussions
+            .FromSqlRaw(sql.ToString(), parameters.ToArray())
+            .AsNoTracking()
+            .OrderBy(p => p.PeriodEnd)
+            .ProjectTo<DiscussionReadModel>(Mapper.ConfigurationProvider)
+            .ToListAsync(cancellationToken);
 
-                var changeList = _changeCollector.CollectChanges(groupList, nameof(Discussion), d => d.DisplayName);
-                historyList.AddRange(changeList);
-            }
+        var historyList = new List<AuditRecord<Guid>>();
 
-            return historyList.ToList();
+        // group changes by id
+        foreach (var group in entities.GroupBy(p => p.Id))
+        {
+            var groupList = group
+                .OrderBy(p => p.PeriodEnd)
+                .ToList();
 
+            var changeList = _changeCollector.CollectChanges(groupList, nameof(Discussion), d => d.DisplayName);
+            historyList.AddRange(changeList);
         }
+
+        return historyList.ToList();
+
     }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Discussion/Queries/DiscussionTopicQuery.cs b/service/src/InstructorIQ.Core/Domain/Discussion/Queries/DiscussionTopicQuery.cs
index 38e4d62a..6214736c 100644
--- a/service/src/InstructorIQ.Core/Domain/Discussion/Queries/DiscussionTopicQuery.cs
+++ b/service/src/InstructorIQ.Core/Domain/Discussion/Queries/DiscussionTopicQuery.cs
@@ -1,19 +1,20 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Security.Principal;
+
 using InstructorIQ.Core.Domain.Models;
+
 using MediatR.CommandQuery.Queries;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Queries
+namespace InstructorIQ.Core.Domain.Queries;
+
+public class DiscussionTopicQuery : PrincipalQueryBase<IReadOnlyCollection<DiscussionReadModel>>
 {
-    public class DiscussionTopicQuery : PrincipalQueryBase<IReadOnlyCollection<DiscussionReadModel>>
+    public DiscussionTopicQuery(IPrincipal principal, Guid topicId) : base(principal)
     {
-        public DiscussionTopicQuery(IPrincipal principal, Guid topicId) : base(principal)
-        {
-            TopicId = topicId;
-        }
-
-        public Guid TopicId { get; }
+        TopicId = topicId;
     }
+
+    public Guid TopicId { get; }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Discussion/Validation/DiscussionCreateModelValidator.cs b/service/src/InstructorIQ.Core/Domain/Discussion/Validation/DiscussionCreateModelValidator.cs
index 70e2569d..d9b4d617 100644
--- a/service/src/InstructorIQ.Core/Domain/Discussion/Validation/DiscussionCreateModelValidator.cs
+++ b/service/src/InstructorIQ.Core/Domain/Discussion/Validation/DiscussionCreateModelValidator.cs
@@ -1,34 +1,35 @@
 using System;
+
 using FluentValidation;
+
 using InstructorIQ.Core.Domain.Models;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Validation
+namespace InstructorIQ.Core.Domain.Validation;
+
+/// <summary>
+/// Validator class for <see cref="DiscussionCreateModel"/> .
+/// </summary>
+public partial class DiscussionCreateModelValidator
+    : AbstractValidator<DiscussionCreateModel>
 {
     /// <summary>
-    /// Validator class for <see cref="DiscussionCreateModel"/> .
+    /// Initializes a new instance of the <see cref="DiscussionCreateModelValidator"/> class.
     /// </summary>
-    public partial class DiscussionCreateModelValidator
-        : AbstractValidator<DiscussionCreateModel>
+    public DiscussionCreateModelValidator()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DiscussionCreateModelValidator"/> class.
-        /// </summary>
-        public DiscussionCreateModelValidator()
-        {
-            #region Generated Constructor
-            RuleFor(p => p.EmailAddress).NotEmpty();
-            RuleFor(p => p.EmailAddress).MaximumLength(256);
-            RuleFor(p => p.DisplayName).NotEmpty();
-            RuleFor(p => p.DisplayName).MaximumLength(256);
-            RuleFor(p => p.Browser).MaximumLength(256);
-            RuleFor(p => p.OperatingSystem).MaximumLength(256);
-            RuleFor(p => p.DeviceFamily).MaximumLength(256);
-            RuleFor(p => p.DeviceBrand).MaximumLength(256);
-            RuleFor(p => p.DeviceModel).MaximumLength(256);
-            RuleFor(p => p.IpAddress).MaximumLength(50);
-            #endregion
-        }
-
+        #region Generated Constructor
+        RuleFor(p => p.EmailAddress).NotEmpty();
+        RuleFor(p => p.EmailAddress).MaximumLength(256);
+        RuleFor(p => p.DisplayName).NotEmpty();
+        RuleFor(p => p.DisplayName).MaximumLength(256);
+        RuleFor(p => p.Browser).MaximumLength(256);
+        RuleFor(p => p.OperatingSystem).MaximumLength(256);
+        RuleFor(p => p.DeviceFamily).MaximumLength(256);
+        RuleFor(p => p.DeviceBrand).MaximumLength(256);
+        RuleFor(p => p.DeviceModel).MaximumLength(256);
+        RuleFor(p => p.IpAddress).MaximumLength(50);
+        #endregion
     }
+
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Discussion/Validation/DiscussionUpdateModelValidator.cs b/service/src/InstructorIQ.Core/Domain/Discussion/Validation/DiscussionUpdateModelValidator.cs
index ad55b4ce..6b50f275 100644
--- a/service/src/InstructorIQ.Core/Domain/Discussion/Validation/DiscussionUpdateModelValidator.cs
+++ b/service/src/InstructorIQ.Core/Domain/Discussion/Validation/DiscussionUpdateModelValidator.cs
@@ -1,33 +1,34 @@
 using System;
+
 using FluentValidation;
+
 using InstructorIQ.Core.Domain.Models;
 
-namespace InstructorIQ.Core.Domain.Validation
+namespace InstructorIQ.Core.Domain.Validation;
+
+/// <summary>
+/// Validator class for <see cref="DiscussionUpdateModel"/> .
+/// </summary>
+public partial class DiscussionUpdateModelValidator
+    : AbstractValidator<DiscussionUpdateModel>
 {
     /// <summary>
-    /// Validator class for <see cref="DiscussionUpdateModel"/> .
+    /// Initializes a new instance of the <see cref="DiscussionUpdateModelValidator"/> class.
     /// </summary>
-    public partial class DiscussionUpdateModelValidator
-        : AbstractValidator<DiscussionUpdateModel>
+    public DiscussionUpdateModelValidator()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DiscussionUpdateModelValidator"/> class.
-        /// </summary>
-        public DiscussionUpdateModelValidator()
-        {
-            #region Generated Constructor
-            RuleFor(p => p.EmailAddress).NotEmpty();
-            RuleFor(p => p.EmailAddress).MaximumLength(256);
-            RuleFor(p => p.DisplayName).NotEmpty();
-            RuleFor(p => p.DisplayName).MaximumLength(256);
-            RuleFor(p => p.Browser).MaximumLength(256);
-            RuleFor(p => p.OperatingSystem).MaximumLength(256);
-            RuleFor(p => p.DeviceFamily).MaximumLength(256);
-            RuleFor(p => p.DeviceBrand).MaximumLength(256);
-            RuleFor(p => p.DeviceModel).MaximumLength(256);
-            RuleFor(p => p.IpAddress).MaximumLength(50);
-            #endregion
-        }
-
+        #region Generated Constructor
+        RuleFor(p => p.EmailAddress).NotEmpty();
+        RuleFor(p => p.EmailAddress).MaximumLength(256);
+        RuleFor(p => p.DisplayName).NotEmpty();
+        RuleFor(p => p.DisplayName).MaximumLength(256);
+        RuleFor(p => p.Browser).MaximumLength(256);
+        RuleFor(p => p.OperatingSystem).MaximumLength(256);
+        RuleFor(p => p.DeviceFamily).MaximumLength(256);
+        RuleFor(p => p.DeviceBrand).MaximumLength(256);
+        RuleFor(p => p.DeviceModel).MaximumLength(256);
+        RuleFor(p => p.IpAddress).MaximumLength(50);
+        #endregion
     }
+
 }
diff --git a/service/src/InstructorIQ.Core/Domain/DomainServiceRegistrationBase.cs b/service/src/InstructorIQ.Core/Domain/DomainServiceRegistrationBase.cs
index 41a88d04..27e79f7f 100644
--- a/service/src/InstructorIQ.Core/Domain/DomainServiceRegistrationBase.cs
+++ b/service/src/InstructorIQ.Core/Domain/DomainServiceRegistrationBase.cs
@@ -8,33 +8,32 @@
 
 using Microsoft.Extensions.DependencyInjection;
 
-namespace InstructorIQ.Core.Domain
-{
-    public abstract class DomainServiceRegistrationBase
-    {
+namespace InstructorIQ.Core.Domain;
 
-        public abstract void Register(IServiceCollection services);
+public abstract class DomainServiceRegistrationBase
+{
 
-        protected virtual void RegisterEntityCommand<TKey, TEntity, TReadModel, TCreateModel, TUpdateModel>(IServiceCollection services)
-            where TEntity : class, IHaveIdentifier<TKey>, new()
-            where TCreateModel : class
-            where TUpdateModel : class
-        {
-            services.AddEntityCommands<InstructorIQContext, TEntity, TKey, TReadModel, TCreateModel, TUpdateModel>();
+    public abstract void Register(IServiceCollection services);
 
-            services.AddTransient<IPipelineBehavior<EntityPatchCommand<TKey, TReadModel>, TReadModel>, AuthenticateEntityIdentifierCommandBehavior<TKey, TReadModel>>();
-            services.AddTransient<IPipelineBehavior<EntityDeleteCommand<TKey, TReadModel>, TReadModel>, AuthenticateEntityIdentifierCommandBehavior<TKey, TReadModel>>();
+    protected virtual void RegisterEntityCommand<TKey, TEntity, TReadModel, TCreateModel, TUpdateModel>(IServiceCollection services)
+        where TEntity : class, IHaveIdentifier<TKey>, new()
+        where TCreateModel : class
+        where TUpdateModel : class
+    {
+        services.AddEntityCommands<InstructorIQContext, TEntity, TKey, TReadModel, TCreateModel, TUpdateModel>();
 
-            services.AddTransient<IPipelineBehavior<EntityUpdateCommand<TKey, TUpdateModel, TReadModel>, TReadModel>, TrackChangeEntityUpdateCommandBehavior<TKey, TUpdateModel, TReadModel>>();
-            services.AddTransient<IPipelineBehavior<EntityPatchCommand<TKey, TReadModel>, TReadModel>, TrackChangeEntityPatchCommandBehavior<TKey, TReadModel>>();
-        }
+        services.AddTransient<IPipelineBehavior<EntityPatchCommand<TKey, TReadModel>, TReadModel>, AuthenticateEntityIdentifierCommandBehavior<TKey, TReadModel>>();
+        services.AddTransient<IPipelineBehavior<EntityDeleteCommand<TKey, TReadModel>, TReadModel>, AuthenticateEntityIdentifierCommandBehavior<TKey, TReadModel>>();
 
-        protected virtual void RegisterEntityQuery<TKey, TEntity, TReadModel>(IServiceCollection services)
-           where TEntity : class, IHaveIdentifier<TKey>, new()
-           where TReadModel : class
-        {
-            services.AddEntityQueries<InstructorIQContext, TEntity, TKey, TReadModel>();
-        }
+        services.AddTransient<IPipelineBehavior<EntityUpdateCommand<TKey, TUpdateModel, TReadModel>, TReadModel>, TrackChangeEntityUpdateCommandBehavior<TKey, TUpdateModel, TReadModel>>();
+        services.AddTransient<IPipelineBehavior<EntityPatchCommand<TKey, TReadModel>, TReadModel>, TrackChangeEntityPatchCommandBehavior<TKey, TReadModel>>();
+    }
 
+    protected virtual void RegisterEntityQuery<TKey, TEntity, TReadModel>(IServiceCollection services)
+       where TEntity : class, IHaveIdentifier<TKey>, new()
+       where TReadModel : class
+    {
+        services.AddEntityQueries<InstructorIQContext, TEntity, TKey, TReadModel>();
     }
+
 }
diff --git a/service/src/InstructorIQ.Core/Domain/EmailDelivery/Commands/SendSummaryEmailCommand.cs b/service/src/InstructorIQ.Core/Domain/EmailDelivery/Commands/SendSummaryEmailCommand.cs
index 9e738685..a4796174 100644
--- a/service/src/InstructorIQ.Core/Domain/EmailDelivery/Commands/SendSummaryEmailCommand.cs
+++ b/service/src/InstructorIQ.Core/Domain/EmailDelivery/Commands/SendSummaryEmailCommand.cs
@@ -1,17 +1,18 @@
-using System.Security.Principal;
+using System.Security.Principal;
+
 using InstructorIQ.Core.Models;
+
 using MediatR.CommandQuery.Commands;
 using MediatR.CommandQuery.Models;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Commands
+namespace InstructorIQ.Core.Domain.Commands;
+
+public class SendSummaryEmailCommand : EntityModelCommand<SummaryReportModel, CompleteModel>
 {
-    public class SendSummaryEmailCommand : EntityModelCommand<SummaryReportModel, CompleteModel>
+    public SendSummaryEmailCommand(IPrincipal principal, SummaryReportModel model)
+        : base(principal, model)
     {
-        public SendSummaryEmailCommand(IPrincipal principal, SummaryReportModel model)
-            : base(principal, model)
-        {
 
-        }
     }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.Core/Domain/EmailDelivery/Commands/SendUserInviteEmailCommand.cs b/service/src/InstructorIQ.Core/Domain/EmailDelivery/Commands/SendUserInviteEmailCommand.cs
index f0319664..5c9d1eda 100644
--- a/service/src/InstructorIQ.Core/Domain/EmailDelivery/Commands/SendUserInviteEmailCommand.cs
+++ b/service/src/InstructorIQ.Core/Domain/EmailDelivery/Commands/SendUserInviteEmailCommand.cs
@@ -1,16 +1,17 @@
-using System.Security.Principal;
+using System.Security.Principal;
+
 using InstructorIQ.Core.Models;
+
 using MediatR.CommandQuery.Commands;
 using MediatR.CommandQuery.Models;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Commands
+namespace InstructorIQ.Core.Domain.Commands;
+
+public class SendUserInviteEmailCommand : EntityModelCommand<UserInviteModel, CompleteModel>
 {
-    public class SendUserInviteEmailCommand : EntityModelCommand<UserInviteModel, CompleteModel>
+    public SendUserInviteEmailCommand(IPrincipal principal, UserInviteModel model)
+        : base(principal, model)
     {
-        public SendUserInviteEmailCommand(IPrincipal principal, UserInviteModel model)
-            : base(principal, model)
-        {
-        }
     }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/EmailDelivery/Commands/SendUserLinkEmailCommand.cs b/service/src/InstructorIQ.Core/Domain/EmailDelivery/Commands/SendUserLinkEmailCommand.cs
index a6e052df..75e3af97 100644
--- a/service/src/InstructorIQ.Core/Domain/EmailDelivery/Commands/SendUserLinkEmailCommand.cs
+++ b/service/src/InstructorIQ.Core/Domain/EmailDelivery/Commands/SendUserLinkEmailCommand.cs
@@ -1,17 +1,18 @@
-using System.Security.Principal;
+using System.Security.Principal;
+
 using InstructorIQ.Core.Models;
+
 using MediatR.CommandQuery.Commands;
 using MediatR.CommandQuery.Models;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Commands
+namespace InstructorIQ.Core.Domain.Commands;
+
+public class SendUserLinkEmailCommand : EntityModelCommand<UserLinkModel, CompleteModel>
 {
-    public class SendUserLinkEmailCommand : EntityModelCommand<UserLinkModel, CompleteModel>
+    public SendUserLinkEmailCommand(IPrincipal principal, UserLinkModel model)
+        : base(principal, model)
     {
-        public SendUserLinkEmailCommand(IPrincipal principal, UserLinkModel model)
-            : base(principal, model)
-        {
 
-        }
     }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/EmailDelivery/EmailDeliveryServiceRegistration.cs b/service/src/InstructorIQ.Core/Domain/EmailDelivery/EmailDeliveryServiceRegistration.cs
index 2b8f1be7..92faac6b 100644
--- a/service/src/InstructorIQ.Core/Domain/EmailDelivery/EmailDeliveryServiceRegistration.cs
+++ b/service/src/InstructorIQ.Core/Domain/EmailDelivery/EmailDeliveryServiceRegistration.cs
@@ -14,19 +14,18 @@
 using Microsoft.Extensions.DependencyInjection.Extensions;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain
+namespace InstructorIQ.Core.Domain;
+
+public class EmailDeliveryServiceRegistration : DomainServiceRegistrationBase
 {
-    public class EmailDeliveryServiceRegistration : DomainServiceRegistrationBase
-    {
 
-        [RegisterServices]
-        public override void Register(IServiceCollection services)
-        {
-            RegisterEntityQuery<Guid, EmailDelivery, EmailDeliveryReadModel>(services);
+    [RegisterServices]
+    public override void Register(IServiceCollection services)
+    {
+        RegisterEntityQuery<Guid, EmailDelivery, EmailDeliveryReadModel>(services);
 
-            services.TryAddTransient<IRequestHandler<SendUserInviteEmailCommand, CompleteModel>, SendUserInviteEmailCommandHandler>();
-            services.TryAddTransient<IRequestHandler<SendUserLinkEmailCommand, CompleteModel>, SendUserLinkEmailCommandHandler>();
-            services.TryAddTransient<IRequestHandler<SendSummaryEmailCommand, CompleteModel>, SendSummaryEmailCommandHandler>();
-        }
+        services.TryAddTransient<IRequestHandler<SendUserInviteEmailCommand, CompleteModel>, SendUserInviteEmailCommandHandler>();
+        services.TryAddTransient<IRequestHandler<SendUserLinkEmailCommand, CompleteModel>, SendUserLinkEmailCommandHandler>();
+        services.TryAddTransient<IRequestHandler<SendSummaryEmailCommand, CompleteModel>, SendSummaryEmailCommandHandler>();
     }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/EmailDelivery/Handlers/EmailTemplateCommandHandlerBase.cs b/service/src/InstructorIQ.Core/Domain/EmailDelivery/Handlers/EmailTemplateCommandHandlerBase.cs
index e0838d3a..0a8ac66b 100644
--- a/service/src/InstructorIQ.Core/Domain/EmailDelivery/Handlers/EmailTemplateCommandHandlerBase.cs
+++ b/service/src/InstructorIQ.Core/Domain/EmailDelivery/Handlers/EmailTemplateCommandHandlerBase.cs
@@ -1,23 +1,24 @@
-using InstructorIQ.Core.Services;
+using InstructorIQ.Core.Services;
+
 using MediatR;
 using MediatR.CommandQuery.Handlers;
+
 using Microsoft.Extensions.Logging;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Handlers
+namespace InstructorIQ.Core.Domain.Handlers;
+
+public abstract class EmailTemplateCommandHandlerBase<TRequest, TResponse> : RequestHandlerBase<TRequest, TResponse>
+    where TRequest : IRequest<TResponse>
 {
-    public abstract class EmailTemplateCommandHandlerBase<TRequest, TResponse> : RequestHandlerBase<TRequest, TResponse>
-        where TRequest : IRequest<TResponse>
+    protected EmailTemplateCommandHandlerBase(ILoggerFactory loggerFactory, IMediator mediator, IEmailTemplateService emailTemplate)
+        : base(loggerFactory)
     {
-        protected EmailTemplateCommandHandlerBase(ILoggerFactory loggerFactory, IMediator mediator, IEmailTemplateService emailTemplate)
-            : base(loggerFactory)
-        {
-            Mediator = mediator;
-            EmailTemplate = emailTemplate;
-        }
+        Mediator = mediator;
+        EmailTemplate = emailTemplate;
+    }
 
-        protected IMediator Mediator { get; }
+    protected IMediator Mediator { get; }
 
-        protected IEmailTemplateService EmailTemplate { get; }
-    }
-}
\ No newline at end of file
+    protected IEmailTemplateService EmailTemplate { get; }
+}
diff --git a/service/src/InstructorIQ.Core/Domain/EmailDelivery/Handlers/SendSummaryEmailCommandHandler.cs b/service/src/InstructorIQ.Core/Domain/EmailDelivery/Handlers/SendSummaryEmailCommandHandler.cs
index dd796c7d..8c87b072 100644
--- a/service/src/InstructorIQ.Core/Domain/EmailDelivery/Handlers/SendSummaryEmailCommandHandler.cs
+++ b/service/src/InstructorIQ.Core/Domain/EmailDelivery/Handlers/SendSummaryEmailCommandHandler.cs
@@ -1,61 +1,63 @@
-using System.Threading;
+using System.Threading;
 using System.Threading.Tasks;
+
 using InstructorIQ.Core.Data.Entities;
 using InstructorIQ.Core.Domain.Commands;
 using InstructorIQ.Core.Models;
 using InstructorIQ.Core.Services;
+
 using MediatR;
 using MediatR.CommandQuery.Models;
+
 using Microsoft.AspNetCore.Identity;
 using Microsoft.Extensions.Logging;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Handlers
+namespace InstructorIQ.Core.Domain.Handlers;
+
+public class SendSummaryEmailCommandHandler : EmailTemplateCommandHandlerBase<SendSummaryEmailCommand, CompleteModel>
 {
-    public class SendSummaryEmailCommandHandler : EmailTemplateCommandHandlerBase<SendSummaryEmailCommand, CompleteModel>
+    private readonly UserManager<Core.Data.Entities.User> _userManager;
+
+    public SendSummaryEmailCommandHandler(ILoggerFactory loggerFactory, IMediator mediator, IEmailTemplateService emailTemplate, UserManager<User> userManager)
+        : base(loggerFactory, mediator, emailTemplate)
     {
-        private readonly UserManager<Core.Data.Entities.User> _userManager;
+        _userManager = userManager;
+    }
 
-        public SendSummaryEmailCommandHandler(ILoggerFactory loggerFactory, IMediator mediator, IEmailTemplateService emailTemplate, UserManager<User> userManager)
-            : base(loggerFactory, mediator, emailTemplate)
-        {
-            _userManager = userManager;
-        }
+    protected override async Task<CompleteModel> Process(SendSummaryEmailCommand request, CancellationToken cancellationToken)
+    {
+        foreach (var recipient in request.Model.Recipients)
+            await SendSummaryEmail(request.Model, recipient);
 
-        protected override async Task<CompleteModel> Process(SendSummaryEmailCommand request, CancellationToken cancellationToken)
-        {
-            foreach (var recipient in request.Model.Recipients)
-                await SendSummaryEmail(request.Model, recipient);
+        var completeModel = new CompleteModel();
+        return completeModel;
+    }
 
-            var completeModel = new CompleteModel();
-            return completeModel;
+    private async Task SendSummaryEmail(SummaryReportModel userLinkModel, string recipient)
+    {
+        // lookup user
+        var recipientUser = await _userManager.FindByEmailAsync(recipient);
+        if (recipientUser == null)
+        {
+            Logger.LogError("Recipient '{recipient}' not found, can't send email", recipient);
+            return;
         }
 
-        private async Task SendSummaryEmail(SummaryReportModel userLinkModel, string recipient)
+        // create email model
+        var email = new SummaryReportEmail()
         {
-            // lookup user
-            var recipientUser = await _userManager.FindByEmailAsync(recipient);
-            if (recipientUser == null)
-            {
-                Logger.LogError("Recipient '{recipient}' not found, can't send email", recipient);
-                return;
-            }
-
-            // create email model
-            var email = new SummaryReportEmail()
-            {
-                RecipientName = recipientUser.DisplayName,
-                RecipientAddress = recipientUser.Email,
-                ReplyToName = userLinkModel.ReplyToName,
-                ReplyToAddress = userLinkModel.ReplyToAddress,
-                Subject = userLinkModel.Subject,
-                TextBody = userLinkModel.TextBody,
-                HtmlBody = userLinkModel.HtmlBody
-            };
-
-            Logger.LogInformation("Sending user link email to '{recipient}'", recipient);
-
-            await EmailTemplate.SendSummaryEmail(email).ConfigureAwait(false);
-        }
+            RecipientName = recipientUser.DisplayName,
+            RecipientAddress = recipientUser.Email,
+            ReplyToName = userLinkModel.ReplyToName,
+            ReplyToAddress = userLinkModel.ReplyToAddress,
+            Subject = userLinkModel.Subject,
+            TextBody = userLinkModel.TextBody,
+            HtmlBody = userLinkModel.HtmlBody
+        };
+
+        Logger.LogInformation("Sending user link email to '{recipient}'", recipient);
+
+        await EmailTemplate.SendSummaryEmail(email).ConfigureAwait(false);
     }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.Core/Domain/EmailDelivery/Handlers/SendUserInviteEmailCommandHandler.cs b/service/src/InstructorIQ.Core/Domain/EmailDelivery/Handlers/SendUserInviteEmailCommandHandler.cs
index 6900eaac..27a62217 100644
--- a/service/src/InstructorIQ.Core/Domain/EmailDelivery/Handlers/SendUserInviteEmailCommandHandler.cs
+++ b/service/src/InstructorIQ.Core/Domain/EmailDelivery/Handlers/SendUserInviteEmailCommandHandler.cs
@@ -1,118 +1,120 @@
-using System;
+using System;
 using System.Security.Principal;
 using System.Threading;
 using System.Threading.Tasks;
+
 using InstructorIQ.Core.Data.Entities;
 using InstructorIQ.Core.Domain.Commands;
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Models;
 using InstructorIQ.Core.Security;
 using InstructorIQ.Core.Services;
+
 using MediatR;
 using MediatR.CommandQuery.Models;
+
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Handlers
+namespace InstructorIQ.Core.Domain.Handlers;
+
+public class SendUserInviteEmailCommandHandler : EmailTemplateCommandHandlerBase<SendUserInviteEmailCommand, CompleteModel>
 {
-    public class SendUserInviteEmailCommandHandler : EmailTemplateCommandHandlerBase<SendUserInviteEmailCommand, CompleteModel>
+    private readonly UserManager<User> _userManager;
+    private readonly UserClaimManager _userClaimManager;
+    private readonly IUrlHelper _urlHelper;
+
+    public SendUserInviteEmailCommandHandler(ILoggerFactory loggerFactory, IMediator mediator, IEmailTemplateService emailTemplate, UserManager<User> userManager, UserClaimManager userClaimManager, IUrlHelper urlHelper)
+        : base(loggerFactory, mediator, emailTemplate)
     {
-        private readonly UserManager<User> _userManager;
-        private readonly UserClaimManager _userClaimManager;
-        private readonly IUrlHelper _urlHelper;
+        _userManager = userManager;
+        _userClaimManager = userClaimManager;
+        _urlHelper = urlHelper;
+    }
 
-        public SendUserInviteEmailCommandHandler(ILoggerFactory loggerFactory, IMediator mediator, IEmailTemplateService emailTemplate, UserManager<User> userManager, UserClaimManager userClaimManager, IUrlHelper urlHelper)
-            : base(loggerFactory, mediator, emailTemplate)
-        {
-            _userManager = userManager;
-            _userClaimManager = userClaimManager;
-            _urlHelper = urlHelper;
-        }
+    protected override async Task<CompleteModel> Process(SendUserInviteEmailCommand request, CancellationToken cancellationToken)
+    {
+        var completeModel = new CompleteModel();
+        var inviteModel = request.Model;
+        var principal = request.Principal;
+        var returnUrl = inviteModel.ReturnUrl;
 
-        protected override async Task<CompleteModel> Process(SendUserInviteEmailCommand request, CancellationToken cancellationToken)
-        {
-            var completeModel = new CompleteModel();
-            var inviteModel = request.Model;
-            var principal = request.Principal;
-            var returnUrl = inviteModel.ReturnUrl;
+        // lookup user
+        var recipientUser = inviteModel.User;
+        if (recipientUser == null)
+            throw new InvalidOperationException("Recipient not found, can't send email");
 
-            // lookup user
-            var recipientUser = inviteModel.User;
-            if (recipientUser == null)
-                throw new InvalidOperationException("Recipient not found, can't send email");
+        // create user token
+        var token = _userManager.GenerateNewAuthenticatorKey();
+        await CreateLinkToken(recipientUser, token, returnUrl, principal);
+        var link = CreateLink(token);
 
-            // create user token
-            var token = _userManager.GenerateNewAuthenticatorKey();
-            await CreateLinkToken(recipientUser, token, returnUrl, principal);
-            var link = CreateLink(token);
+        await SendInvite(inviteModel, recipientUser, principal, link);
 
-            await SendInvite(inviteModel, recipientUser, principal, link);
+        return completeModel;
+    }
 
-            return completeModel;
-        }
+    private async Task SendInvite(UserInviteModel inviteModel, User recipientUser, IPrincipal principal, string link)
+    {
+        var name = _userClaimManager.GetDisplayName(principal);
+        var email = _userClaimManager.GetEmail(principal);
 
-        private async Task SendInvite(UserInviteModel inviteModel, User recipientUser, IPrincipal principal, string link)
+        var inviteEmail = new UserInviteEmail
         {
-            var name = _userClaimManager.GetDisplayName(principal);
-            var email = _userClaimManager.GetEmail(principal);
+            TenantName = _userClaimManager.GetTenantName(principal),
 
-            var inviteEmail = new UserInviteEmail
-            {
-                TenantName = _userClaimManager.GetTenantName(principal),
+            SenderName = name,
+            SenderEmail = email,
 
-                SenderName = name,
-                SenderEmail = email,
+            ReplyToName = name,
+            ReplyToAddress = email,
 
-                ReplyToName = name,
-                ReplyToAddress = email,
+            RecipientName = recipientUser.DisplayName,
+            RecipientAddress = recipientUser.Email,
 
-                RecipientName = recipientUser.DisplayName,
-                RecipientAddress = recipientUser.Email,
+            Link = link,
 
-                Link = link,
+            UserAgent = inviteModel.UserAgent,
+            Browser = inviteModel.Browser,
+            OperatingSystem = inviteModel.OperatingSystem,
+            DeviceFamily = inviteModel.DeviceFamily,
+            DeviceBrand = inviteModel.DeviceBrand,
+            DeviceModel = inviteModel.DeviceModel,
+            IpAddress = inviteModel.IpAddress
+        };
 
-                UserAgent = inviteModel.UserAgent,
-                Browser = inviteModel.Browser,
-                OperatingSystem = inviteModel.OperatingSystem,
-                DeviceFamily = inviteModel.DeviceFamily,
-                DeviceBrand = inviteModel.DeviceBrand,
-                DeviceModel = inviteModel.DeviceModel,
-                IpAddress = inviteModel.IpAddress
-            };
+        Logger.LogInformation("Sending user invite email to '{recipient}'", recipientUser.Email);
 
-            Logger.LogInformation("Sending user invite email to '{recipient}'", recipientUser.Email);
-
-            await EmailTemplate.SendUserInviteEmail(inviteEmail);
-        }
+        await EmailTemplate.SendUserInviteEmail(inviteEmail);
+    }
 
-        private string CreateLink(string token)
-        {
-            var scheme = _urlHelper.ActionContext?.HttpContext?.Request?.Scheme ?? "http";
+    private string CreateLink(string token)
+    {
+        var scheme = _urlHelper.ActionContext?.HttpContext?.Request?.Scheme ?? "http";
 
-            // create link to send in email
-            var emailLink = _urlHelper.Page(
-                "/Account/Link",
-                pageHandler: null,
-                values: new { token },
-                protocol: scheme);
+        // create link to send in email
+        var emailLink = _urlHelper.Page(
+            "/Account/Link",
+            pageHandler: null,
+            values: new { token },
+            protocol: scheme);
 
-            return emailLink;
-        }
+        return emailLink;
+    }
 
-        private async Task CreateLinkToken(User user, string token, string returnUrl, IPrincipal principal)
+    private async Task CreateLinkToken(User user, string token, string returnUrl, IPrincipal principal)
+    {
+        var createModel = new LinkTokenCreateModel
         {
-            var createModel = new LinkTokenCreateModel
-            {
-                Expires = DateTimeOffset.UtcNow.Add(TimeSpan.FromDays(30)),
-                Url = returnUrl,
-                UserName = user.UserName,
-                TenantId = _userClaimManager.GetTenantId(principal),
-            };
-
-            var createCommand = new LinkTokenCreateCommand(principal, createModel, token);
-            var linkToken = await Mediator.Send(createCommand);
-        }
+            Expires = DateTimeOffset.UtcNow.Add(TimeSpan.FromDays(30)),
+            Url = returnUrl,
+            UserName = user.UserName,
+            TenantId = _userClaimManager.GetTenantId(principal),
+        };
+
+        var createCommand = new LinkTokenCreateCommand(principal, createModel, token);
+        var linkToken = await Mediator.Send(createCommand);
     }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/EmailDelivery/Handlers/SendUserLinkEmailCommandHandler.cs b/service/src/InstructorIQ.Core/Domain/EmailDelivery/Handlers/SendUserLinkEmailCommandHandler.cs
index 609e6703..cebfbb4f 100644
--- a/service/src/InstructorIQ.Core/Domain/EmailDelivery/Handlers/SendUserLinkEmailCommandHandler.cs
+++ b/service/src/InstructorIQ.Core/Domain/EmailDelivery/Handlers/SendUserLinkEmailCommandHandler.cs
@@ -1,98 +1,100 @@
-using System;
+using System;
 using System.Security.Principal;
 using System.Threading;
 using System.Threading.Tasks;
+
 using InstructorIQ.Core.Data.Entities;
 using InstructorIQ.Core.Domain.Commands;
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Models;
 using InstructorIQ.Core.Security;
 using InstructorIQ.Core.Services;
+
 using MediatR;
 using MediatR.CommandQuery.Models;
+
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Handlers
+namespace InstructorIQ.Core.Domain.Handlers;
+
+public class SendUserLinkEmailCommandHandler : EmailTemplateCommandHandlerBase<SendUserLinkEmailCommand, CompleteModel>
 {
-    public class SendUserLinkEmailCommandHandler : EmailTemplateCommandHandlerBase<SendUserLinkEmailCommand, CompleteModel>
+    private readonly UserManager<Core.Data.Entities.User> _userManager;
+    private readonly UserClaimManager _userClaimManager;
+    private readonly IUrlHelper _urlHelper;
+
+    public SendUserLinkEmailCommandHandler(ILoggerFactory loggerFactory, IMediator mediator, IEmailTemplateService emailTemplate, UserManager<User> userManager, IUrlHelper urlHelper, UserClaimManager userClaimManager)
+        : base(loggerFactory, mediator, emailTemplate)
     {
-        private readonly UserManager<Core.Data.Entities.User> _userManager;
-        private readonly UserClaimManager _userClaimManager;
-        private readonly IUrlHelper _urlHelper;
+        _userManager = userManager;
+        _urlHelper = urlHelper;
+        _userClaimManager = userClaimManager;
+    }
 
-        public SendUserLinkEmailCommandHandler(ILoggerFactory loggerFactory, IMediator mediator, IEmailTemplateService emailTemplate, UserManager<User> userManager, IUrlHelper urlHelper, UserClaimManager userClaimManager)
-            : base(loggerFactory, mediator, emailTemplate)
+    protected override async Task<CompleteModel> Process(SendUserLinkEmailCommand request, CancellationToken cancellationToken)
+    {
+        foreach (var recipient in request.Model.Recipients)
         {
-            _userManager = userManager;
-            _urlHelper = urlHelper;
-            _userClaimManager = userClaimManager;
+            // create passwordless link for each recipient
+            await SendRecipientLinkEmail(request.Model, request.Principal, recipient, cancellationToken);
         }
 
-        protected override async Task<CompleteModel> Process(SendUserLinkEmailCommand request, CancellationToken cancellationToken)
+        var completeModel = new CompleteModel();
+        return completeModel;
+    }
+
+    private async Task SendRecipientLinkEmail(UserLinkModel userLinkModel, IPrincipal principal, string recipient, CancellationToken cancellationToken)
+    {
+        // lookup user
+        var recipientUser = await _userManager.FindByEmailAsync(recipient);
+        if (recipientUser == null)
         {
-            foreach (var recipient in request.Model.Recipients)
-            {
-                // create passwordless link for each recipient
-                await SendRecipientLinkEmail(request.Model, request.Principal, recipient, cancellationToken);
-            }
-
-            var completeModel = new CompleteModel();
-            return completeModel;
+            Logger.LogError("Recipient '{recipient}' not found, can't send email", recipient);
+            return;
         }
 
-        private async Task SendRecipientLinkEmail(UserLinkModel userLinkModel, IPrincipal principal, string recipient, CancellationToken cancellationToken)
+        // create user link
+        var createModel = new LinkTokenCreateModel
         {
-            // lookup user
-            var recipientUser = await _userManager.FindByEmailAsync(recipient);
-            if (recipientUser == null)
-            {
-                Logger.LogError("Recipient '{recipient}' not found, can't send email", recipient);
-                return;
-            }
-
-            // create user link
-            var createModel = new LinkTokenCreateModel
-            {
-                Expires = DateTimeOffset.UtcNow.AddMonths(1),
-                Url = userLinkModel.LinkUrl,
-                UserName = recipientUser.UserName,
-                TenantId = _userClaimManager.GetTenantId(principal)
-            };
-
-            // create user token
-            var token = _userManager.GenerateNewAuthenticatorKey();
-            var createCommand = new LinkTokenCreateCommand(principal, createModel, token);
-            var linkToken = await Mediator.Send(createCommand, cancellationToken).ConfigureAwait(false);
-
-            var scheme = _urlHelper.ActionContext?.HttpContext?.Request?.Scheme ?? "http";
-
-            // create link to send in email
-            var emailLink = _urlHelper.Page(
-                "/Account/Link",
-                pageHandler: null,
-                values: new { token },
-                protocol: scheme);
-
-            // create email model
-            var email = new UserLinkEmail
-            {
-                RecipientName = recipientUser.DisplayName,
-                RecipientAddress = recipientUser.Email,
-                ReplyToName = userLinkModel.ReplyToName,
-                ReplyToAddress = userLinkModel.ReplyToAddress,
-                Subject = userLinkModel.Subject,
-                TextBody = userLinkModel.TextBody,
-                HtmlBody = userLinkModel.HtmlBody,
-                LinkUrl = emailLink,
-                LinkText = userLinkModel.LinkText
-            };
-
-            Logger.LogInformation("Sending user link email to '{recipient}'", recipient);
-
-            await EmailTemplate.SendUserLinkEmail(email).ConfigureAwait(false);
-        }
+            Expires = DateTimeOffset.UtcNow.AddMonths(1),
+            Url = userLinkModel.LinkUrl,
+            UserName = recipientUser.UserName,
+            TenantId = _userClaimManager.GetTenantId(principal)
+        };
+
+        // create user token
+        var token = _userManager.GenerateNewAuthenticatorKey();
+        var createCommand = new LinkTokenCreateCommand(principal, createModel, token);
+        var linkToken = await Mediator.Send(createCommand, cancellationToken).ConfigureAwait(false);
+
+        var scheme = _urlHelper.ActionContext?.HttpContext?.Request?.Scheme ?? "http";
+
+        // create link to send in email
+        var emailLink = _urlHelper.Page(
+            "/Account/Link",
+            pageHandler: null,
+            values: new { token },
+            protocol: scheme);
+
+        // create email model
+        var email = new UserLinkEmail
+        {
+            RecipientName = recipientUser.DisplayName,
+            RecipientAddress = recipientUser.Email,
+            ReplyToName = userLinkModel.ReplyToName,
+            ReplyToAddress = userLinkModel.ReplyToAddress,
+            Subject = userLinkModel.Subject,
+            TextBody = userLinkModel.TextBody,
+            HtmlBody = userLinkModel.HtmlBody,
+            LinkUrl = emailLink,
+            LinkText = userLinkModel.LinkText
+        };
+
+        Logger.LogInformation("Sending user link email to '{recipient}'", recipient);
+
+        await EmailTemplate.SendUserLinkEmail(email).ConfigureAwait(false);
     }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/EmailDelivery/Mapping/EmailDeliveryProfile.cs b/service/src/InstructorIQ.Core/Domain/EmailDelivery/Mapping/EmailDeliveryProfile.cs
index 4b7ff932..26acaab4 100644
--- a/service/src/InstructorIQ.Core/Domain/EmailDelivery/Mapping/EmailDeliveryProfile.cs
+++ b/service/src/InstructorIQ.Core/Domain/EmailDelivery/Mapping/EmailDeliveryProfile.cs
@@ -1,25 +1,26 @@
 using System;
+
 using AutoMapper;
+
 using InstructorIQ.Core.Data.Entities;
 using InstructorIQ.Core.Domain.Models;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Mapping
+namespace InstructorIQ.Core.Domain.Mapping;
+
+/// <summary>
+/// Mapper class for entity <see cref="EmailDelivery"/> .
+/// </summary>
+public class EmailDeliveryProfile
+    : Profile
 {
     /// <summary>
-    /// Mapper class for entity <see cref="EmailDelivery"/> .
+    /// Initializes a new instance of the <see cref="EmailDeliveryProfile"/> class.
     /// </summary>
-    public class EmailDeliveryProfile
-        : Profile
+    public EmailDeliveryProfile()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EmailDeliveryProfile"/> class.
-        /// </summary>
-        public EmailDeliveryProfile()
-        {
-            CreateMap<EmailDelivery, EmailDeliveryReadModel>()
-                .ForMember(d => d.RowVersion, opt => opt.MapFrom(s => Convert.ToBase64String(s.RowVersion)));
-        }
-
+        CreateMap<EmailDelivery, EmailDeliveryReadModel>()
+            .ForMember(d => d.RowVersion, opt => opt.MapFrom(s => Convert.ToBase64String(s.RowVersion)));
     }
+
 }
diff --git a/service/src/InstructorIQ.Core/Domain/EmailDelivery/Models/EmailDeliveryReadModel.cs b/service/src/InstructorIQ.Core/Domain/EmailDelivery/Models/EmailDeliveryReadModel.cs
index 1d951d88..64ea7cd4 100644
--- a/service/src/InstructorIQ.Core/Domain/EmailDelivery/Models/EmailDeliveryReadModel.cs
+++ b/service/src/InstructorIQ.Core/Domain/EmailDelivery/Models/EmailDeliveryReadModel.cs
@@ -1,121 +1,121 @@
 using System;
+
 using MediatR.CommandQuery.Models;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Models
+namespace InstructorIQ.Core.Domain.Models;
+
+/// <summary>
+/// View Model class
+/// </summary>
+public class EmailDeliveryReadModel
+    : EntityReadModel<Guid>
 {
+    #region Generated Properties
+    /// <summary>
+    /// Gets or sets the property value for 'IsProcessing'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'IsProcessing'.
+    /// </value>
+    public bool IsProcessing { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'IsDelivered'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'IsDelivered'.
+    /// </value>
+    public bool IsDelivered { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'Delivered'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'Delivered'.
+    /// </value>
+    public DateTimeOffset? Delivered { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'Attempts'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'Attempts'.
+    /// </value>
+    public int Attempts { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'LastAttempt'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'LastAttempt'.
+    /// </value>
+    public DateTimeOffset? LastAttempt { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'NextAttempt'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'NextAttempt'.
+    /// </value>
+    public DateTimeOffset? NextAttempt { get; set; }
+
     /// <summary>
-    /// View Model class
+    /// Gets or sets the property value for 'SmtpLog'.
     /// </summary>
-    public class EmailDeliveryReadModel
-        : EntityReadModel<Guid>
-    {
-        #region Generated Properties
-        /// <summary>
-        /// Gets or sets the property value for 'IsProcessing'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'IsProcessing'.
-        /// </value>
-        public bool IsProcessing { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'IsDelivered'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'IsDelivered'.
-        /// </value>
-        public bool IsDelivered { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'Delivered'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Delivered'.
-        /// </value>
-        public DateTimeOffset? Delivered { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'Attempts'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Attempts'.
-        /// </value>
-        public int Attempts { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'LastAttempt'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'LastAttempt'.
-        /// </value>
-        public DateTimeOffset? LastAttempt { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'NextAttempt'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'NextAttempt'.
-        /// </value>
-        public DateTimeOffset? NextAttempt { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'SmtpLog'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'SmtpLog'.
-        /// </value>
-        public string SmtpLog { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'Error'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Error'.
-        /// </value>
-        public string Error { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'From'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'From'.
-        /// </value>
-        public string From { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'To'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'To'.
-        /// </value>
-        public string To { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'Subject'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Subject'.
-        /// </value>
-        public string Subject { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'MimeMessage'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'MimeMessage'.
-        /// </value>
-        public Byte[] MimeMessage { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'TenantId'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'TenantId'.
-        /// </value>
-        public Guid? TenantId { get; set; }
-
-        #endregion
-
-    }
+    /// <value>
+    /// The property value for 'SmtpLog'.
+    /// </value>
+    public string SmtpLog { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'Error'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'Error'.
+    /// </value>
+    public string Error { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'From'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'From'.
+    /// </value>
+    public string From { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'To'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'To'.
+    /// </value>
+    public string To { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'Subject'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'Subject'.
+    /// </value>
+    public string Subject { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'MimeMessage'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'MimeMessage'.
+    /// </value>
+    public Byte[] MimeMessage { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'TenantId'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'TenantId'.
+    /// </value>
+    public Guid? TenantId { get; set; }
+
+    #endregion
+
 }
diff --git a/service/src/InstructorIQ.Core/Domain/EmailTemplate/EmailTemplateServiceRegistration.cs b/service/src/InstructorIQ.Core/Domain/EmailTemplate/EmailTemplateServiceRegistration.cs
index e6122a5c..2d075790 100644
--- a/service/src/InstructorIQ.Core/Domain/EmailTemplate/EmailTemplateServiceRegistration.cs
+++ b/service/src/InstructorIQ.Core/Domain/EmailTemplate/EmailTemplateServiceRegistration.cs
@@ -8,16 +8,15 @@
 using Microsoft.Extensions.DependencyInjection;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain
+namespace InstructorIQ.Core.Domain;
+
+public class EmailTemplateServiceRegistration : DomainServiceRegistrationBase
 {
-    public class EmailTemplateServiceRegistration : DomainServiceRegistrationBase
-    {
 
-        [RegisterServices]
-        public override void Register(IServiceCollection services)
-        {
-            RegisterEntityQuery<Guid, EmailTemplate, EmailTemplateReadModel>(services);
-            RegisterEntityCommand<Guid, EmailTemplate, EmailTemplateReadModel, EmailTemplateCreateModel, EmailTemplateUpdateModel>(services);
-        }
+    [RegisterServices]
+    public override void Register(IServiceCollection services)
+    {
+        RegisterEntityQuery<Guid, EmailTemplate, EmailTemplateReadModel>(services);
+        RegisterEntityCommand<Guid, EmailTemplate, EmailTemplateReadModel, EmailTemplateCreateModel, EmailTemplateUpdateModel>(services);
     }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/EmailTemplate/Mapping/EmailTemplateProfile.cs b/service/src/InstructorIQ.Core/Domain/EmailTemplate/Mapping/EmailTemplateProfile.cs
index 0763ec0d..7268079f 100644
--- a/service/src/InstructorIQ.Core/Domain/EmailTemplate/Mapping/EmailTemplateProfile.cs
+++ b/service/src/InstructorIQ.Core/Domain/EmailTemplate/Mapping/EmailTemplateProfile.cs
@@ -1,32 +1,33 @@
 using System;
+
 using AutoMapper;
+
 using InstructorIQ.Core.Data.Entities;
 using InstructorIQ.Core.Domain.Models;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Mapping
+namespace InstructorIQ.Core.Domain.Mapping;
+
+/// <summary>
+/// Mapper class for entity <see cref="EmailTemplate"/> .
+/// </summary>
+public class EmailTemplateProfile
+    : Profile
 {
     /// <summary>
-    /// Mapper class for entity <see cref="EmailTemplate"/> .
+    /// Initializes a new instance of the <see cref="EmailTemplateProfile"/> class.
     /// </summary>
-    public class EmailTemplateProfile
-        : Profile
+    public EmailTemplateProfile()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EmailTemplateProfile"/> class.
-        /// </summary>
-        public EmailTemplateProfile()
-        {
-            CreateMap<EmailTemplateCreateModel, EmailTemplate>();
+        CreateMap<EmailTemplateCreateModel, EmailTemplate>();
 
-            CreateMap<EmailTemplateUpdateModel, EmailTemplate>()
-                .ForMember(d => d.RowVersion, opt => opt.MapFrom(s => Convert.FromBase64String(s.RowVersion)));
+        CreateMap<EmailTemplateUpdateModel, EmailTemplate>()
+            .ForMember(d => d.RowVersion, opt => opt.MapFrom(s => Convert.FromBase64String(s.RowVersion)));
 
-            CreateMap<EmailTemplate, EmailTemplateReadModel>()
-                .ForMember(d => d.RowVersion, opt => opt.MapFrom(s => Convert.ToBase64String(s.RowVersion)));
-
-            CreateMap<EmailTemplateReadModel, EmailTemplateUpdateModel>();
-        }
+        CreateMap<EmailTemplate, EmailTemplateReadModel>()
+            .ForMember(d => d.RowVersion, opt => opt.MapFrom(s => Convert.ToBase64String(s.RowVersion)));
 
+        CreateMap<EmailTemplateReadModel, EmailTemplateUpdateModel>();
     }
+
 }
diff --git a/service/src/InstructorIQ.Core/Domain/EmailTemplate/Models/EmailTemplateCreateModel.cs b/service/src/InstructorIQ.Core/Domain/EmailTemplate/Models/EmailTemplateCreateModel.cs
index c4f6a7ad..3f938be2 100644
--- a/service/src/InstructorIQ.Core/Domain/EmailTemplate/Models/EmailTemplateCreateModel.cs
+++ b/service/src/InstructorIQ.Core/Domain/EmailTemplate/Models/EmailTemplateCreateModel.cs
@@ -1,86 +1,86 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+
 using MediatR.CommandQuery.Models;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Models
+namespace InstructorIQ.Core.Domain.Models;
+
+public class EmailTemplateCreateModel : EntityCreateModel<Guid>
 {
-    public class EmailTemplateCreateModel : EntityCreateModel<Guid>
-    {
-        #region Generated Properties
-        /// <summary>
-        /// Gets or sets the property value for 'Key'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Key'.
-        /// </value>
-        public string Key { get; set; }
+    #region Generated Properties
+    /// <summary>
+    /// Gets or sets the property value for 'Key'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'Key'.
+    /// </value>
+    public string Key { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'FromAddress'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'FromAddress'.
-        /// </value>
-        public string FromAddress { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'FromAddress'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'FromAddress'.
+    /// </value>
+    public string FromAddress { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'FromName'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'FromName'.
-        /// </value>
-        public string FromName { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'FromName'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'FromName'.
+    /// </value>
+    public string FromName { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'ReplyToAddress'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'ReplyToAddress'.
-        /// </value>
-        public string ReplyToAddress { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'ReplyToAddress'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'ReplyToAddress'.
+    /// </value>
+    public string ReplyToAddress { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'ReplyToName'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'ReplyToName'.
-        /// </value>
-        public string ReplyToName { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'ReplyToName'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'ReplyToName'.
+    /// </value>
+    public string ReplyToName { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'Subject'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Subject'.
-        /// </value>
-        public string Subject { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'Subject'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'Subject'.
+    /// </value>
+    public string Subject { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'TextBody'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'TextBody'.
-        /// </value>
-        public string TextBody { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'TextBody'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'TextBody'.
+    /// </value>
+    public string TextBody { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'HtmlBody'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'HtmlBody'.
-        /// </value>
-        public string HtmlBody { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'HtmlBody'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'HtmlBody'.
+    /// </value>
+    public string HtmlBody { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'TenantId'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'TenantId'.
-        /// </value>
-        public Guid? TenantId { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'TenantId'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'TenantId'.
+    /// </value>
+    public Guid? TenantId { get; set; }
 
-        #endregion
-    }
-}
\ No newline at end of file
+    #endregion
+}
diff --git a/service/src/InstructorIQ.Core/Domain/EmailTemplate/Models/EmailTemplateReadModel.cs b/service/src/InstructorIQ.Core/Domain/EmailTemplate/Models/EmailTemplateReadModel.cs
index 0c2c9146..9929aef1 100644
--- a/service/src/InstructorIQ.Core/Domain/EmailTemplate/Models/EmailTemplateReadModel.cs
+++ b/service/src/InstructorIQ.Core/Domain/EmailTemplate/Models/EmailTemplateReadModel.cs
@@ -1,89 +1,89 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+
 using MediatR.CommandQuery.Models;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Models
+namespace InstructorIQ.Core.Domain.Models;
+
+public class EmailTemplateReadModel : EntityReadModel<Guid>
 {
-    public class EmailTemplateReadModel : EntityReadModel<Guid>
-    {
-        #region Generated Properties
-        /// <summary>
-        /// Gets or sets the property value for 'Key'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Key'.
-        /// </value>
-        public string Key { get; set; }
+    #region Generated Properties
+    /// <summary>
+    /// Gets or sets the property value for 'Key'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'Key'.
+    /// </value>
+    public string Key { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'FromAddress'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'FromAddress'.
-        /// </value>
-        public string FromAddress { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'FromAddress'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'FromAddress'.
+    /// </value>
+    public string FromAddress { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'FromName'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'FromName'.
-        /// </value>
-        public string FromName { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'FromName'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'FromName'.
+    /// </value>
+    public string FromName { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'ReplyToAddress'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'ReplyToAddress'.
-        /// </value>
-        public string ReplyToAddress { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'ReplyToAddress'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'ReplyToAddress'.
+    /// </value>
+    public string ReplyToAddress { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'ReplyToName'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'ReplyToName'.
-        /// </value>
-        public string ReplyToName { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'ReplyToName'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'ReplyToName'.
+    /// </value>
+    public string ReplyToName { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'Subject'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Subject'.
-        /// </value>
-        public string Subject { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'Subject'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'Subject'.
+    /// </value>
+    public string Subject { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'TextBody'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'TextBody'.
-        /// </value>
-        public string TextBody { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'TextBody'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'TextBody'.
+    /// </value>
+    public string TextBody { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'HtmlBody'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'HtmlBody'.
-        /// </value>
-        public string HtmlBody { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'HtmlBody'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'HtmlBody'.
+    /// </value>
+    public string HtmlBody { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'TenantId'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'TenantId'.
-        /// </value>
-        public Guid? TenantId { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'TenantId'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'TenantId'.
+    /// </value>
+    public Guid? TenantId { get; set; }
 
-        #endregion
+    #endregion
 
-        public string OrganizationName { get; set; }
+    public string OrganizationName { get; set; }
 
-    }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.Core/Domain/EmailTemplate/Models/EmailTemplateUpdateModel.cs b/service/src/InstructorIQ.Core/Domain/EmailTemplate/Models/EmailTemplateUpdateModel.cs
index 21a0b368..d595ebc9 100644
--- a/service/src/InstructorIQ.Core/Domain/EmailTemplate/Models/EmailTemplateUpdateModel.cs
+++ b/service/src/InstructorIQ.Core/Domain/EmailTemplate/Models/EmailTemplateUpdateModel.cs
@@ -1,86 +1,86 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+
 using MediatR.CommandQuery.Models;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Models
+namespace InstructorIQ.Core.Domain.Models;
+
+public class EmailTemplateUpdateModel : EntityUpdateModel
 {
-    public class EmailTemplateUpdateModel : EntityUpdateModel
-    {
-        #region Generated Properties
-        /// <summary>
-        /// Gets or sets the property value for 'Key'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Key'.
-        /// </value>
-        public string Key { get; set; }
+    #region Generated Properties
+    /// <summary>
+    /// Gets or sets the property value for 'Key'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'Key'.
+    /// </value>
+    public string Key { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'FromAddress'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'FromAddress'.
-        /// </value>
-        public string FromAddress { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'FromAddress'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'FromAddress'.
+    /// </value>
+    public string FromAddress { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'FromName'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'FromName'.
-        /// </value>
-        public string FromName { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'FromName'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'FromName'.
+    /// </value>
+    public string FromName { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'ReplyToAddress'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'ReplyToAddress'.
-        /// </value>
-        public string ReplyToAddress { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'ReplyToAddress'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'ReplyToAddress'.
+    /// </value>
+    public string ReplyToAddress { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'ReplyToName'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'ReplyToName'.
-        /// </value>
-        public string ReplyToName { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'ReplyToName'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'ReplyToName'.
+    /// </value>
+    public string ReplyToName { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'Subject'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Subject'.
-        /// </value>
-        public string Subject { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'Subject'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'Subject'.
+    /// </value>
+    public string Subject { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'TextBody'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'TextBody'.
-        /// </value>
-        public string TextBody { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'TextBody'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'TextBody'.
+    /// </value>
+    public string TextBody { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'HtmlBody'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'HtmlBody'.
-        /// </value>
-        public string HtmlBody { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'HtmlBody'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'HtmlBody'.
+    /// </value>
+    public string HtmlBody { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'TenantId'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'TenantId'.
-        /// </value>
-        public Guid? TenantId { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'TenantId'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'TenantId'.
+    /// </value>
+    public Guid? TenantId { get; set; }
 
-        #endregion
-    }
-}
\ No newline at end of file
+    #endregion
+}
diff --git a/service/src/InstructorIQ.Core/Domain/EmailTemplate/Validation/EmailTemplateCreateModelValidator.cs b/service/src/InstructorIQ.Core/Domain/EmailTemplate/Validation/EmailTemplateCreateModelValidator.cs
index a065a513..46ef7b56 100644
--- a/service/src/InstructorIQ.Core/Domain/EmailTemplate/Validation/EmailTemplateCreateModelValidator.cs
+++ b/service/src/InstructorIQ.Core/Domain/EmailTemplate/Validation/EmailTemplateCreateModelValidator.cs
@@ -1,17 +1,18 @@
-using System;
+using System;
+
 using FluentValidation;
+
 using InstructorIQ.Core.Domain.Models;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Validation
+namespace InstructorIQ.Core.Domain.Validation;
+
+public class EmailTemplateCreateModelValidator : AbstractValidator<EmailTemplateCreateModel>
 {
-    public class EmailTemplateCreateModelValidator : AbstractValidator<EmailTemplateCreateModel>
+    public EmailTemplateCreateModelValidator()
     {
-        public EmailTemplateCreateModelValidator()
-        {
-            RuleFor(p => p.Key).NotEmpty();
-            RuleFor(p => p.FromAddress).NotEmpty();
-            RuleFor(p => p.FromName).NotEmpty();
-        }
+        RuleFor(p => p.Key).NotEmpty();
+        RuleFor(p => p.FromAddress).NotEmpty();
+        RuleFor(p => p.FromName).NotEmpty();
     }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.Core/Domain/EmailTemplate/Validation/EmailTemplateUpdateModelValidator.cs b/service/src/InstructorIQ.Core/Domain/EmailTemplate/Validation/EmailTemplateUpdateModelValidator.cs
index cc1098d0..29ee06ee 100644
--- a/service/src/InstructorIQ.Core/Domain/EmailTemplate/Validation/EmailTemplateUpdateModelValidator.cs
+++ b/service/src/InstructorIQ.Core/Domain/EmailTemplate/Validation/EmailTemplateUpdateModelValidator.cs
@@ -1,17 +1,18 @@
-using System;
+using System;
+
 using FluentValidation;
+
 using InstructorIQ.Core.Domain.Models;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Validation
+namespace InstructorIQ.Core.Domain.Validation;
+
+public class EmailTemplateUpdateModelValidator : AbstractValidator<EmailTemplateUpdateModel>
 {
-    public class EmailTemplateUpdateModelValidator : AbstractValidator<EmailTemplateUpdateModel>
+    public EmailTemplateUpdateModelValidator()
     {
-        public EmailTemplateUpdateModelValidator()
-        {
-            RuleFor(p => p.Key).NotEmpty();
-            RuleFor(p => p.FromAddress).NotEmpty();
-            RuleFor(p => p.FromName).NotEmpty();
-        }
+        RuleFor(p => p.Key).NotEmpty();
+        RuleFor(p => p.FromAddress).NotEmpty();
+        RuleFor(p => p.FromName).NotEmpty();
     }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.Core/Domain/Event/EventServiceModule.cs b/service/src/InstructorIQ.Core/Domain/Event/EventServiceModule.cs
index 914f885d..5cdf84bb 100644
--- a/service/src/InstructorIQ.Core/Domain/Event/EventServiceModule.cs
+++ b/service/src/InstructorIQ.Core/Domain/Event/EventServiceModule.cs
@@ -11,15 +11,14 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 
-namespace InstructorIQ.Core.Domain
+namespace InstructorIQ.Core.Domain;
+
+public class EventServiceModule : DomainServiceRegistrationBase
 {
-    public class EventServiceModule : DomainServiceRegistrationBase
-    {
 
-        [RegisterServices]
-        public override void Register(IServiceCollection services)
-        {
-            services.TryAddTransient<IRequestHandler<EventRangeQuery, IReadOnlyCollection<EventReadModel>>, EventRangeQueryHandler>();
-        }
+    [RegisterServices]
+    public override void Register(IServiceCollection services)
+    {
+        services.TryAddTransient<IRequestHandler<EventRangeQuery, IReadOnlyCollection<EventReadModel>>, EventRangeQueryHandler>();
     }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Event/Handlers/EventRangeQueryHandler.cs b/service/src/InstructorIQ.Core/Domain/Event/Handlers/EventRangeQueryHandler.cs
index b2754fc3..5073b974 100644
--- a/service/src/InstructorIQ.Core/Domain/Event/Handlers/EventRangeQueryHandler.cs
+++ b/service/src/InstructorIQ.Core/Domain/Event/Handlers/EventRangeQueryHandler.cs
@@ -1,96 +1,99 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+
 using AutoMapper;
 using AutoMapper.QueryableExtensions;
+
 using InstructorIQ.Core.Data;
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Domain.Queries;
 using InstructorIQ.Core.Multitenancy;
 using InstructorIQ.Core.Utility;
+
 using MediatR.CommandQuery.EntityFrameworkCore.Handlers;
+
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Handlers
+namespace InstructorIQ.Core.Domain.Handlers;
+
+public class EventRangeQueryHandler : DataContextHandlerBase<InstructorIQContext, EventRangeQuery, IReadOnlyCollection<EventReadModel>>
 {
-    public class EventRangeQueryHandler : DataContextHandlerBase<InstructorIQContext, EventRangeQuery, IReadOnlyCollection<EventReadModel>>
+    private readonly IUrlHelper _urlHelper;
+
+    public EventRangeQueryHandler(ILoggerFactory loggerFactory, InstructorIQContext dataContext, IMapper mapper, IUrlHelper urlHelper)
+        : base(loggerFactory, dataContext, mapper)
     {
-        private readonly IUrlHelper _urlHelper;
+        _urlHelper = urlHelper;
+    }
 
-        public EventRangeQueryHandler(ILoggerFactory loggerFactory, InstructorIQContext dataContext, IMapper mapper, IUrlHelper urlHelper)
-            : base(loggerFactory, dataContext, mapper)
-        {
-            _urlHelper = urlHelper;
-        }
+    protected override async Task<IReadOnlyCollection<EventReadModel>> Process(EventRangeQuery request, CancellationToken cancellationToken)
+    {
+        var tenant = await DataContext.Tenants
+            .FindAsync(request.TenantId)
+            .ConfigureAwait(false);
+
+        var query = DataContext.Sessions
+            .AsNoTracking()
+            .Where(q => q.TenantId == request.TenantId)
+            .Where(q => q.StartDate >= request.Start && q.StartDate < request.End)
+            .OrderBy(q => q.StartDate)
+            .ThenBy(q => q.StartTime);
 
-        protected override async Task<IReadOnlyCollection<EventReadModel>> Process(EventRangeQuery request, CancellationToken cancellationToken)
+        var sessions = await query
+            .ProjectTo<SessionReadModel>(Mapper.ConfigurationProvider)
+            .ToListAsync(cancellationToken)
+            .ConfigureAwait(false);
+
+        // convert to event
+        var events = new List<EventReadModel>();
+
+        foreach (var session in sessions)
         {
-            var tenant = await DataContext.Tenants
-                .FindAsync(request.TenantId)
-                .ConfigureAwait(false);
-
-            var query = DataContext.Sessions
-                .AsNoTracking()
-                .Where(q => q.TenantId == request.TenantId)
-                .Where(q => q.StartDate >= request.Start && q.StartDate < request.End)
-                .OrderBy(q => q.StartDate)
-                .ThenBy(q => q.StartTime);
-
-            var sessions = await query
-                .ProjectTo<SessionReadModel>(Mapper.ConfigurationProvider)
-                .ToListAsync(cancellationToken)
-                .ConfigureAwait(false);
-
-            // convert to event
-            var events = new List<EventReadModel>();
-
-            foreach (var session in sessions)
-            {
-                var eventModel = new EventReadModel();
-                eventModel.Id = session.Id.ToString();
-                eventModel.AllDay = false;
-                eventModel.Editable = false;
-                eventModel.Required = session.IsRequired;
+            var eventModel = new EventReadModel();
+            eventModel.Id = session.Id.ToString();
+            eventModel.AllDay = false;
+            eventModel.Editable = false;
+            eventModel.Required = session.IsRequired;
 
-                eventModel.Title = $"{session.TopicTitle} - {session.GroupName}";
-                eventModel.Description = session.TopicSummary;
-                eventModel.Location = session.LocationName;
+            eventModel.Title = $"{session.TopicTitle} - {session.GroupName}";
+            eventModel.Description = session.TopicSummary;
+            eventModel.Location = session.LocationName;
 
-                if (session.IsRequired)
-                {
-                    if (eventModel.ClassNames == null)
-                        eventModel.ClassNames = new List<string>();
+            if (session.IsRequired)
+            {
+                if (eventModel.ClassNames == null)
+                    eventModel.ClassNames = new List<string>();
 
-                    eventModel.ClassNames.Add("event-required");
-                }
+                eventModel.ClassNames.Add("event-required");
+            }
 
-                var startDate = DateTimeFactory.Create(session.StartDate, session.StartTime, session.TenantTimeZone);
-                eventModel.Start = startDate?.ToUniversalTime();
+            var startDate = DateTimeFactory.Create(session.StartDate, session.StartTime, session.TenantTimeZone);
+            eventModel.Start = startDate?.ToUniversalTime();
 
-                var endDate = DateTimeFactory.Create(session.EndDate, session.EndTime, session.TenantTimeZone);
-                eventModel.End = endDate?.ToUniversalTime();
+            var endDate = DateTimeFactory.Create(session.EndDate, session.EndTime, session.TenantTimeZone);
+            eventModel.End = endDate?.ToUniversalTime();
 
-                eventModel.Modified = session.Updated;
-                
-                var url = _urlHelper.Page(
-                    "/topic/view",
-                    values: new
-                    {
-                        tenant = tenant.Slug,
-                        id = session.TopicId
-                    }
-                );
+            eventModel.Modified = session.Updated;
 
-                eventModel.Url = url;
+            var url = _urlHelper.Page(
+                "/topic/view",
+                values: new
+                {
+                    tenant = tenant.Slug,
+                    id = session.TopicId
+                }
+            );
 
-                events.Add(eventModel);
-            }
-            return events;
+            eventModel.Url = url;
+
+            events.Add(eventModel);
         }
+        return events;
     }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Event/Models/EventReadModel.cs b/service/src/InstructorIQ.Core/Domain/Event/Models/EventReadModel.cs
index 91dc335d..d60c92df 100644
--- a/service/src/InstructorIQ.Core/Domain/Event/Models/EventReadModel.cs
+++ b/service/src/InstructorIQ.Core/Domain/Event/Models/EventReadModel.cs
@@ -1,42 +1,41 @@
-using System;
+using System;
 using System.Collections.Generic;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Models
+namespace InstructorIQ.Core.Domain.Models;
+
+public class EventReadModel
 {
-    public class EventReadModel
-    {
-        public string Id { get; set; }
+    public string Id { get; set; }
+
+    public string GroupId { get; set; }
 
-        public string GroupId { get; set; }
+    public bool AllDay { get; set; }
 
-        public bool AllDay { get; set; }
+    public DateTimeOffset? Start { get; set; }
 
-        public DateTimeOffset? Start { get; set; }
+    public DateTimeOffset? End { get; set; }
 
-        public DateTimeOffset? End { get; set; }
+    public string Title { get; set; }
 
-        public string Title { get; set; }
+    public string Description { get; set; }
 
-        public string Description { get; set; }
+    public string Location { get; set; }
 
-        public string Location { get; set; }
-        
-        public string Url { get; set; }
+    public string Url { get; set; }
 
-        public bool? Editable { get; set; }
+    public bool? Editable { get; set; }
 
-        public bool? Required { get; set; }
+    public bool? Required { get; set; }
 
-        public DateTimeOffset Modified { get; set; }
+    public DateTimeOffset Modified { get; set; }
 
-        public List<string> ClassNames { get; set; }
+    public List<string> ClassNames { get; set; }
 
-        public string BackgroundColor { get; set; }
+    public string BackgroundColor { get; set; }
 
-        public string BorderColor { get; set; }
+    public string BorderColor { get; set; }
 
-        public string TextColor { get; set; }
+    public string TextColor { get; set; }
 
-    }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Event/Queries/EventRangeQuery.cs b/service/src/InstructorIQ.Core/Domain/Event/Queries/EventRangeQuery.cs
index c8a538a4..ce46f43f 100644
--- a/service/src/InstructorIQ.Core/Domain/Event/Queries/EventRangeQuery.cs
+++ b/service/src/InstructorIQ.Core/Domain/Event/Queries/EventRangeQuery.cs
@@ -1,24 +1,25 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Security.Principal;
+
 using InstructorIQ.Core.Domain.Models;
+
 using MediatR.CommandQuery.Queries;
 
-namespace InstructorIQ.Core.Domain.Queries
+namespace InstructorIQ.Core.Domain.Queries;
+
+public class EventRangeQuery : PrincipalQueryBase<IReadOnlyCollection<EventReadModel>>
 {
-    public class EventRangeQuery : PrincipalQueryBase<IReadOnlyCollection<EventReadModel>>
+    public EventRangeQuery(IPrincipal principal, Guid tenantId, DateTimeOffset start, DateTimeOffset end) : base(principal)
     {
-        public EventRangeQuery(IPrincipal principal, Guid tenantId, DateTimeOffset start, DateTimeOffset end) : base(principal)
-        {
-            TenantId = tenantId;
-            Start = start;
-            End = end;
-        }
+        TenantId = tenantId;
+        Start = start;
+        End = end;
+    }
 
-        public Guid TenantId { get; set; }
+    public Guid TenantId { get; set; }
 
-        public DateTimeOffset Start { get; set; }
+    public DateTimeOffset Start { get; set; }
 
-        public DateTimeOffset End { get; set; }
-    }
+    public DateTimeOffset End { get; set; }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Group/GroupServiceRegistration.cs b/service/src/InstructorIQ.Core/Domain/Group/GroupServiceRegistration.cs
index 517088a9..9dd75159 100644
--- a/service/src/InstructorIQ.Core/Domain/Group/GroupServiceRegistration.cs
+++ b/service/src/InstructorIQ.Core/Domain/Group/GroupServiceRegistration.cs
@@ -14,19 +14,18 @@
 using Microsoft.Extensions.DependencyInjection.Extensions;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain
+namespace InstructorIQ.Core.Domain;
+
+public class GroupServiceRegistration : DomainServiceRegistrationBase
 {
-    public class GroupServiceRegistration : DomainServiceRegistrationBase
-    {
 
-        [RegisterServices]
-        public override void Register(IServiceCollection services)
-        {
-            RegisterEntityQuery<Guid, Group, GroupReadModel>(services);
-            RegisterEntityCommand<Guid, Group, GroupReadModel, GroupCreateModel, GroupUpdateModel>(services);
+    [RegisterServices]
+    public override void Register(IServiceCollection services)
+    {
+        RegisterEntityQuery<Guid, Group, GroupReadModel>(services);
+        RegisterEntityCommand<Guid, Group, GroupReadModel, GroupCreateModel, GroupUpdateModel>(services);
 
-            services.TryAddTransient<IRequestHandler<GroupDropdownQuery, IReadOnlyCollection<GroupDropdownModel>>, GroupDropdownQueryHandler>();
-            services.TryAddTransient<IRequestHandler<GroupSequenceQuery, IReadOnlyCollection<GroupSequenceModel>>, GroupSequenceQueryHandler>();
-        }
+        services.TryAddTransient<IRequestHandler<GroupDropdownQuery, IReadOnlyCollection<GroupDropdownModel>>, GroupDropdownQueryHandler>();
+        services.TryAddTransient<IRequestHandler<GroupSequenceQuery, IReadOnlyCollection<GroupSequenceModel>>, GroupSequenceQueryHandler>();
     }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Group/Handlers/GroupDropdownQueryHandler.cs b/service/src/InstructorIQ.Core/Domain/Group/Handlers/GroupDropdownQueryHandler.cs
index 83e41847..ba89ded2 100644
--- a/service/src/InstructorIQ.Core/Domain/Group/Handlers/GroupDropdownQueryHandler.cs
+++ b/service/src/InstructorIQ.Core/Domain/Group/Handlers/GroupDropdownQueryHandler.cs
@@ -1,43 +1,46 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+
 using AutoMapper;
 using AutoMapper.QueryableExtensions;
+
 using InstructorIQ.Core.Data;
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Domain.Queries;
 using InstructorIQ.Core.Security;
+
 using MediatR.CommandQuery.EntityFrameworkCore.Handlers;
+
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Handlers
+namespace InstructorIQ.Core.Domain.Handlers;
+
+public class GroupDropdownQueryHandler : DataContextHandlerBase<InstructorIQContext, GroupDropdownQuery, IReadOnlyCollection<GroupDropdownModel>>
 {
-    public class GroupDropdownQueryHandler : DataContextHandlerBase<InstructorIQContext, GroupDropdownQuery, IReadOnlyCollection<GroupDropdownModel>>
+    private readonly UserClaimManager _userClaimManager;
+
+    public GroupDropdownQueryHandler(ILoggerFactory loggerFactory, InstructorIQContext dataContext, IMapper mapper, UserClaimManager userClaimManager)
+        : base(loggerFactory, dataContext, mapper)
     {
-        private readonly UserClaimManager _userClaimManager;
-
-        public GroupDropdownQueryHandler(ILoggerFactory loggerFactory, InstructorIQContext dataContext, IMapper mapper, UserClaimManager userClaimManager)
-            : base(loggerFactory, dataContext, mapper)
-        {
-            _userClaimManager = userClaimManager;
-        }
-
-        protected override async Task<IReadOnlyCollection<GroupDropdownModel>> Process(GroupDropdownQuery request, CancellationToken cancellationToken)
-        {
-            var tenantId = _userClaimManager.GetRequiredTenantId(request.Principal);
-
-            var result = await DataContext.Groups
-                .AsNoTracking()
-                .Where(q => q.TenantId == tenantId)
-                .OrderBy(q => q.Sequence)
-                .ThenBy(q => q.Name)
-                .ProjectTo<GroupDropdownModel>(Mapper.ConfigurationProvider)
-                .ToListAsync(cancellationToken);
-
-            return result;
-        }
+        _userClaimManager = userClaimManager;
+    }
+
+    protected override async Task<IReadOnlyCollection<GroupDropdownModel>> Process(GroupDropdownQuery request, CancellationToken cancellationToken)
+    {
+        var tenantId = _userClaimManager.GetRequiredTenantId(request.Principal);
+
+        var result = await DataContext.Groups
+            .AsNoTracking()
+            .Where(q => q.TenantId == tenantId)
+            .OrderBy(q => q.Sequence)
+            .ThenBy(q => q.Name)
+            .ProjectTo<GroupDropdownModel>(Mapper.ConfigurationProvider)
+            .ToListAsync(cancellationToken);
+
+        return result;
     }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Group/Handlers/GroupSequenceQueryHandler.cs b/service/src/InstructorIQ.Core/Domain/Group/Handlers/GroupSequenceQueryHandler.cs
index 07b0e70a..6cad5c57 100644
--- a/service/src/InstructorIQ.Core/Domain/Group/Handlers/GroupSequenceQueryHandler.cs
+++ b/service/src/InstructorIQ.Core/Domain/Group/Handlers/GroupSequenceQueryHandler.cs
@@ -1,62 +1,66 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+
 using AutoMapper;
+
 using InstructorIQ.Core.Data;
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Domain.Queries;
 using InstructorIQ.Core.Extensions;
 using InstructorIQ.Core.Security;
+
 using MediatR.CommandQuery.EntityFrameworkCore.Handlers;
+
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
+
 using NaturalSort.Extension;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Handlers
-{
-    public class GroupSequenceQueryHandler : DataContextHandlerBase<InstructorIQContext, GroupSequenceQuery, IReadOnlyCollection<GroupSequenceModel>>
-    {
-        private readonly UserClaimManager _userClaimManager;
+namespace InstructorIQ.Core.Domain.Handlers;
 
+public class GroupSequenceQueryHandler : DataContextHandlerBase<InstructorIQContext, GroupSequenceQuery, IReadOnlyCollection<GroupSequenceModel>>
+{
+    private readonly UserClaimManager _userClaimManager;
 
-        public GroupSequenceQueryHandler(ILoggerFactory loggerFactory, InstructorIQContext dataContext, IMapper mapper, UserClaimManager userClaimManager)
-            : base(loggerFactory, dataContext, mapper)
-        {
-            _userClaimManager = userClaimManager;
-        }
 
-        protected override async Task<IReadOnlyCollection<GroupSequenceModel>> Process(GroupSequenceQuery request, CancellationToken cancellationToken)
-        {
-            var tenantId = _userClaimManager.GetRequiredTenantId(request.Principal);
+    public GroupSequenceQueryHandler(ILoggerFactory loggerFactory, InstructorIQContext dataContext, IMapper mapper, UserClaimManager userClaimManager)
+        : base(loggerFactory, dataContext, mapper)
+    {
+        _userClaimManager = userClaimManager;
+    }
 
-            var groups = await DataContext.Groups
-                .AsNoTracking()
-                .Where(q => q.TenantId == tenantId)
-                .ToListAsync(cancellationToken);
+    protected override async Task<IReadOnlyCollection<GroupSequenceModel>> Process(GroupSequenceQuery request, CancellationToken cancellationToken)
+    {
+        var tenantId = _userClaimManager.GetRequiredTenantId(request.Principal);
 
-            var grouping = groups.GroupBy(g => g.Sequence);
+        var groups = await DataContext.Groups
+            .AsNoTracking()
+            .Where(q => q.TenantId == tenantId)
+            .ToListAsync(cancellationToken);
 
-            var result = new List<GroupSequenceModel>();
-            foreach (var group in grouping)
-            {
-                var sequenceModel = new GroupSequenceModel();
-                sequenceModel.TenantId = tenantId;
-                sequenceModel.Sequence = group.Key;
+        var grouping = groups.GroupBy(g => g.Sequence);
 
-                sequenceModel.Name = group
-                    .Select(g => g.Name)
-                    .OrderBy(g => g, StringComparer.OrdinalIgnoreCase.WithNaturalSort())
-                    .ToDelimitedString("; ");
+        var result = new List<GroupSequenceModel>();
+        foreach (var group in grouping)
+        {
+            var sequenceModel = new GroupSequenceModel();
+            sequenceModel.TenantId = tenantId;
+            sequenceModel.Sequence = group.Key;
 
-                result.Add(sequenceModel);
-            }
+            sequenceModel.Name = group
+                .Select(g => g.Name)
+                .OrderBy(g => g, StringComparer.OrdinalIgnoreCase.WithNaturalSort())
+                .ToDelimitedString("; ");
 
-            return result
-                .OrderBy(g => g.Sequence)
-                .ToList();
+            result.Add(sequenceModel);
         }
+
+        return result
+            .OrderBy(g => g.Sequence)
+            .ToList();
     }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.Core/Domain/Group/Mapping/GroupProfile.cs b/service/src/InstructorIQ.Core/Domain/Group/Mapping/GroupProfile.cs
index fd8543b4..e9b5f99c 100644
--- a/service/src/InstructorIQ.Core/Domain/Group/Mapping/GroupProfile.cs
+++ b/service/src/InstructorIQ.Core/Domain/Group/Mapping/GroupProfile.cs
@@ -1,38 +1,39 @@
 using System;
+
 using AutoMapper;
+
 using InstructorIQ.Core.Data.Entities;
 using InstructorIQ.Core.Domain.Models;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Mapping
+namespace InstructorIQ.Core.Domain.Mapping;
+
+/// <summary>
+/// Mapper class for entity <see cref="Group"/> .
+/// </summary>
+public class GroupProfile
+    : Profile
 {
     /// <summary>
-    /// Mapper class for entity <see cref="Group"/> .
+    /// Initializes a new instance of the <see cref="GroupProfile"/> class.
     /// </summary>
-    public class GroupProfile
-        : Profile
+    public GroupProfile()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="GroupProfile"/> class.
-        /// </summary>
-        public GroupProfile()
-        {
-            CreateMap<GroupCreateModel, Group>();
+        CreateMap<GroupCreateModel, Group>();
 
-            CreateMap<GroupUpdateModel, Group>()
-                .ForMember(d => d.RowVersion, opt => opt.MapFrom(s => Convert.FromBase64String(s.RowVersion)));
+        CreateMap<GroupUpdateModel, Group>()
+            .ForMember(d => d.RowVersion, opt => opt.MapFrom(s => Convert.FromBase64String(s.RowVersion)));
 
-            CreateMap<Group, GroupReadModel>()
-                .ForMember(d => d.RowVersion, opt => opt.MapFrom(s => Convert.ToBase64String(s.RowVersion)))
-                .ForMember(d => d.TenantName, opt => opt.MapFrom(s => s.Tenant.Name));
+        CreateMap<Group, GroupReadModel>()
+            .ForMember(d => d.RowVersion, opt => opt.MapFrom(s => Convert.ToBase64String(s.RowVersion)))
+            .ForMember(d => d.TenantName, opt => opt.MapFrom(s => s.Tenant.Name));
 
-            CreateMap<Group, GroupUpdateModel>()
-                .ForMember(d => d.RowVersion, opt => opt.MapFrom(s => Convert.ToBase64String(s.RowVersion)));
-
-            CreateMap<Group, GroupDropdownModel>()
-                .ForMember(d => d.Value, opt => opt.MapFrom(s => s.Id.ToString().ToLowerInvariant()))
-                .ForMember(d => d.Text, opt => opt.MapFrom(s => s.Name));
-        }
+        CreateMap<Group, GroupUpdateModel>()
+            .ForMember(d => d.RowVersion, opt => opt.MapFrom(s => Convert.ToBase64String(s.RowVersion)));
 
+        CreateMap<Group, GroupDropdownModel>()
+            .ForMember(d => d.Value, opt => opt.MapFrom(s => s.Id.ToString().ToLowerInvariant()))
+            .ForMember(d => d.Text, opt => opt.MapFrom(s => s.Name));
     }
+
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Group/Models/GroupCreateModel.cs b/service/src/InstructorIQ.Core/Domain/Group/Models/GroupCreateModel.cs
index f6ac3cd0..4b2dfe72 100644
--- a/service/src/InstructorIQ.Core/Domain/Group/Models/GroupCreateModel.cs
+++ b/service/src/InstructorIQ.Core/Domain/Group/Models/GroupCreateModel.cs
@@ -1,74 +1,74 @@
 using System;
+
 using MediatR.CommandQuery.Definitions;
 using MediatR.CommandQuery.Models;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Models
+namespace InstructorIQ.Core.Domain.Models;
+
+/// <summary>
+/// View Model class
+/// </summary>
+public class GroupCreateModel
+    : EntityCreateModel<Guid>, IHaveTenant<Guid>
 {
+    #region Generated Properties
     /// <summary>
-    /// View Model class
+    /// Gets or sets the property value for 'Name'.
     /// </summary>
-    public class GroupCreateModel
-        : EntityCreateModel<Guid>, IHaveTenant<Guid>
-    {
-        #region Generated Properties
-        /// <summary>
-        /// Gets or sets the property value for 'Name'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Name'.
-        /// </value>
-        public string Name { get; set; }
+    /// <value>
+    /// The property value for 'Name'.
+    /// </value>
+    public string Name { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'Description'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Description'.
-        /// </value>
-        public string Description { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'Description'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'Description'.
+    /// </value>
+    public string Description { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'Sequence'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Sequence'.
-        /// </value>
-        public int Sequence { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'Sequence'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'Sequence'.
+    /// </value>
+    public int Sequence { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'DisplayOrder'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'DisplayOrder'.
-        /// </value>
-        public int DisplayOrder { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'DisplayOrder'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'DisplayOrder'.
+    /// </value>
+    public int DisplayOrder { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'TenantId'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'TenantId'.
-        /// </value>
-        public Guid TenantId { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'TenantId'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'TenantId'.
+    /// </value>
+    public Guid TenantId { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'PeriodStart'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'PeriodStart'.
-        /// </value>
-        public DateTime PeriodStart { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'PeriodStart'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'PeriodStart'.
+    /// </value>
+    public DateTime PeriodStart { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'PeriodEnd'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'PeriodEnd'.
-        /// </value>
-        public DateTime PeriodEnd { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'PeriodEnd'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'PeriodEnd'.
+    /// </value>
+    public DateTime PeriodEnd { get; set; }
 
-        #endregion
+    #endregion
 
-    }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Group/Models/GroupDropdownModel.cs b/service/src/InstructorIQ.Core/Domain/Group/Models/GroupDropdownModel.cs
index 3ca29027..adf86010 100644
--- a/service/src/InstructorIQ.Core/Domain/Group/Models/GroupDropdownModel.cs
+++ b/service/src/InstructorIQ.Core/Domain/Group/Models/GroupDropdownModel.cs
@@ -1,10 +1,10 @@
 using System;
+
 using Microsoft.AspNetCore.Mvc.Rendering;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Models
+namespace InstructorIQ.Core.Domain.Models;
+
+public class GroupDropdownModel : SelectListItem
 {
-    public class GroupDropdownModel : SelectListItem
-    {
-    }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.Core/Domain/Group/Models/GroupReadModel.cs b/service/src/InstructorIQ.Core/Domain/Group/Models/GroupReadModel.cs
index 26962f01..e035bba0 100644
--- a/service/src/InstructorIQ.Core/Domain/Group/Models/GroupReadModel.cs
+++ b/service/src/InstructorIQ.Core/Domain/Group/Models/GroupReadModel.cs
@@ -1,75 +1,75 @@
 using System;
+
 using MediatR.CommandQuery.Definitions;
 using MediatR.CommandQuery.Models;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Models
+namespace InstructorIQ.Core.Domain.Models;
+
+/// <summary>
+/// View Model class
+/// </summary>
+public class GroupReadModel
+    : EntityReadModel<Guid>, IHaveTenant<Guid>, ITrackHistory
 {
+    #region Generated Properties
     /// <summary>
-    /// View Model class
+    /// Gets or sets the property value for 'Name'.
     /// </summary>
-    public class GroupReadModel
-        : EntityReadModel<Guid>, IHaveTenant<Guid>, ITrackHistory
-    {
-        #region Generated Properties
-        /// <summary>
-        /// Gets or sets the property value for 'Name'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Name'.
-        /// </value>
-        public string Name { get; set; }
+    /// <value>
+    /// The property value for 'Name'.
+    /// </value>
+    public string Name { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'Description'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Description'.
-        /// </value>
-        public string Description { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'Description'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'Description'.
+    /// </value>
+    public string Description { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'Sequence'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Sequence'.
-        /// </value>
-        public int Sequence { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'Sequence'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'Sequence'.
+    /// </value>
+    public int Sequence { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'DisplayOrder'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'DisplayOrder'.
-        /// </value>
-        public int DisplayOrder { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'DisplayOrder'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'DisplayOrder'.
+    /// </value>
+    public int DisplayOrder { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'TenantId'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'TenantId'.
-        /// </value>
-        public Guid TenantId { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'TenantId'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'TenantId'.
+    /// </value>
+    public Guid TenantId { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'PeriodStart'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'PeriodStart'.
-        /// </value>
-        public DateTime PeriodStart { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'PeriodStart'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'PeriodStart'.
+    /// </value>
+    public DateTime PeriodStart { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'PeriodEnd'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'PeriodEnd'.
-        /// </value>
-        public DateTime PeriodEnd { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'PeriodEnd'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'PeriodEnd'.
+    /// </value>
+    public DateTime PeriodEnd { get; set; }
 
-        #endregion
+    #endregion
 
-        public string TenantName { get; set; }
-    }
+    public string TenantName { get; set; }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Group/Models/GroupSequenceModel.cs b/service/src/InstructorIQ.Core/Domain/Group/Models/GroupSequenceModel.cs
index fbd835fb..91d7ea08 100644
--- a/service/src/InstructorIQ.Core/Domain/Group/Models/GroupSequenceModel.cs
+++ b/service/src/InstructorIQ.Core/Domain/Group/Models/GroupSequenceModel.cs
@@ -1,13 +1,13 @@
 using System;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Models
+namespace InstructorIQ.Core.Domain.Models;
+
+public class GroupSequenceModel
 {
-    public class GroupSequenceModel
-    {
-        public int Sequence { get; set; }
+    public int Sequence { get; set; }
 
-        public string Name { get; set; }
+    public string Name { get; set; }
 
-        public Guid TenantId { get; set; }    }
-}
\ No newline at end of file
+    public Guid TenantId { get; set; }
+}
diff --git a/service/src/InstructorIQ.Core/Domain/Group/Models/GroupUpdateModel.cs b/service/src/InstructorIQ.Core/Domain/Group/Models/GroupUpdateModel.cs
index 76ecce11..d7e64ef4 100644
--- a/service/src/InstructorIQ.Core/Domain/Group/Models/GroupUpdateModel.cs
+++ b/service/src/InstructorIQ.Core/Domain/Group/Models/GroupUpdateModel.cs
@@ -1,74 +1,74 @@
 using System;
+
 using MediatR.CommandQuery.Definitions;
 using MediatR.CommandQuery.Models;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Models
+namespace InstructorIQ.Core.Domain.Models;
+
+/// <summary>
+/// View Model class
+/// </summary>
+public class GroupUpdateModel
+    : EntityUpdateModel, IHaveTenant<Guid>
 {
+    #region Generated Properties
     /// <summary>
-    /// View Model class
+    /// Gets or sets the property value for 'Name'.
     /// </summary>
-    public class GroupUpdateModel
-        : EntityUpdateModel, IHaveTenant<Guid>
-    {
-        #region Generated Properties
-        /// <summary>
-        /// Gets or sets the property value for 'Name'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Name'.
-        /// </value>
-        public string Name { get; set; }
+    /// <value>
+    /// The property value for 'Name'.
+    /// </value>
+    public string Name { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'Description'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Description'.
-        /// </value>
-        public string Description { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'Description'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'Description'.
+    /// </value>
+    public string Description { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'Sequence'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Sequence'.
-        /// </value>
-        public int Sequence { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'Sequence'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'Sequence'.
+    /// </value>
+    public int Sequence { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'DisplayOrder'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'DisplayOrder'.
-        /// </value>
-        public int DisplayOrder { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'DisplayOrder'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'DisplayOrder'.
+    /// </value>
+    public int DisplayOrder { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'TenantId'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'TenantId'.
-        /// </value>
-        public Guid TenantId { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'TenantId'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'TenantId'.
+    /// </value>
+    public Guid TenantId { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'PeriodStart'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'PeriodStart'.
-        /// </value>
-        public DateTime PeriodStart { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'PeriodStart'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'PeriodStart'.
+    /// </value>
+    public DateTime PeriodStart { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'PeriodEnd'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'PeriodEnd'.
-        /// </value>
-        public DateTime PeriodEnd { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'PeriodEnd'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'PeriodEnd'.
+    /// </value>
+    public DateTime PeriodEnd { get; set; }
 
-        #endregion
+    #endregion
 
-    }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Group/Queries/GroupDropdownQuery.cs b/service/src/InstructorIQ.Core/Domain/Group/Queries/GroupDropdownQuery.cs
index 35dc87fa..4690e219 100644
--- a/service/src/InstructorIQ.Core/Domain/Group/Queries/GroupDropdownQuery.cs
+++ b/service/src/InstructorIQ.Core/Domain/Group/Queries/GroupDropdownQuery.cs
@@ -1,15 +1,16 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Security.Principal;
-using MediatR.CommandQuery.Queries;
+
 using InstructorIQ.Core.Domain.Models;
 
+using MediatR.CommandQuery.Queries;
+
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Queries
+namespace InstructorIQ.Core.Domain.Queries;
+
+public class GroupDropdownQuery : PrincipalQueryBase<IReadOnlyCollection<GroupDropdownModel>>
 {
-    public class GroupDropdownQuery : PrincipalQueryBase<IReadOnlyCollection<GroupDropdownModel>>
+    public GroupDropdownQuery(IPrincipal principal) : base(principal)
     {
-        public GroupDropdownQuery(IPrincipal principal) : base(principal)
-        {
-        }
     }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Group/Queries/GroupSequenceQuery.cs b/service/src/InstructorIQ.Core/Domain/Group/Queries/GroupSequenceQuery.cs
index 995fbe0c..44bac48d 100644
--- a/service/src/InstructorIQ.Core/Domain/Group/Queries/GroupSequenceQuery.cs
+++ b/service/src/InstructorIQ.Core/Domain/Group/Queries/GroupSequenceQuery.cs
@@ -1,16 +1,17 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Security.Principal;
-using MediatR.CommandQuery.Queries;
+
 using InstructorIQ.Core.Domain.Models;
 
+using MediatR.CommandQuery.Queries;
+
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Queries
+namespace InstructorIQ.Core.Domain.Queries;
+
+public class GroupSequenceQuery : PrincipalQueryBase<IReadOnlyCollection<GroupSequenceModel>>
 {
-    public class GroupSequenceQuery : PrincipalQueryBase<IReadOnlyCollection<GroupSequenceModel>>
+    public GroupSequenceQuery(IPrincipal principal) : base(principal)
     {
-        public GroupSequenceQuery(IPrincipal principal) : base(principal)
-        {
-        }
     }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.Core/Domain/Group/Validation/GroupCreateModelValidator.cs b/service/src/InstructorIQ.Core/Domain/Group/Validation/GroupCreateModelValidator.cs
index e2c21599..ed08f051 100644
--- a/service/src/InstructorIQ.Core/Domain/Group/Validation/GroupCreateModelValidator.cs
+++ b/service/src/InstructorIQ.Core/Domain/Group/Validation/GroupCreateModelValidator.cs
@@ -1,26 +1,27 @@
 using System;
+
 using FluentValidation;
+
 using InstructorIQ.Core.Domain.Models;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Validation
+namespace InstructorIQ.Core.Domain.Validation;
+
+/// <summary>
+/// Validator class for <see cref="GroupCreateModel"/> .
+/// </summary>
+public class GroupCreateModelValidator
+    : AbstractValidator<GroupCreateModel>
 {
     /// <summary>
-    /// Validator class for <see cref="GroupCreateModel"/> .
+    /// Initializes a new instance of the <see cref="GroupCreateModelValidator"/> class.
     /// </summary>
-    public class GroupCreateModelValidator
-        : AbstractValidator<GroupCreateModel>
+    public GroupCreateModelValidator()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="GroupCreateModelValidator"/> class.
-        /// </summary>
-        public GroupCreateModelValidator()
-        {
-            #region Generated Constructor
-            RuleFor(p => p.Name).NotEmpty();
-            RuleFor(p => p.Name).MaximumLength(256);
-            #endregion
-        }
-
+        #region Generated Constructor
+        RuleFor(p => p.Name).NotEmpty();
+        RuleFor(p => p.Name).MaximumLength(256);
+        #endregion
     }
+
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Group/Validation/GroupUpdateModelValidator.cs b/service/src/InstructorIQ.Core/Domain/Group/Validation/GroupUpdateModelValidator.cs
index 1ebd50c3..315cb5ad 100644
--- a/service/src/InstructorIQ.Core/Domain/Group/Validation/GroupUpdateModelValidator.cs
+++ b/service/src/InstructorIQ.Core/Domain/Group/Validation/GroupUpdateModelValidator.cs
@@ -1,26 +1,27 @@
 using System;
+
 using FluentValidation;
+
 using InstructorIQ.Core.Domain.Models;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Validation
+namespace InstructorIQ.Core.Domain.Validation;
+
+/// <summary>
+/// Validator class for <see cref="GroupUpdateModel"/> .
+/// </summary>
+public class GroupUpdateModelValidator
+    : AbstractValidator<GroupUpdateModel>
 {
     /// <summary>
-    /// Validator class for <see cref="GroupUpdateModel"/> .
+    /// Initializes a new instance of the <see cref="GroupUpdateModelValidator"/> class.
     /// </summary>
-    public class GroupUpdateModelValidator
-        : AbstractValidator<GroupUpdateModel>
+    public GroupUpdateModelValidator()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="GroupUpdateModelValidator"/> class.
-        /// </summary>
-        public GroupUpdateModelValidator()
-        {
-            #region Generated Constructor
-            RuleFor(p => p.Name).NotEmpty();
-            RuleFor(p => p.Name).MaximumLength(256);
-            #endregion
-        }
-
+        #region Generated Constructor
+        RuleFor(p => p.Name).NotEmpty();
+        RuleFor(p => p.Name).MaximumLength(256);
+        #endregion
     }
+
 }
diff --git a/service/src/InstructorIQ.Core/Domain/HistoryRecord/HistoryRecordServiceRegistration.cs b/service/src/InstructorIQ.Core/Domain/HistoryRecord/HistoryRecordServiceRegistration.cs
index ad89af83..406dd08e 100644
--- a/service/src/InstructorIQ.Core/Domain/HistoryRecord/HistoryRecordServiceRegistration.cs
+++ b/service/src/InstructorIQ.Core/Domain/HistoryRecord/HistoryRecordServiceRegistration.cs
@@ -8,15 +8,14 @@
 using Microsoft.Extensions.DependencyInjection;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain
+namespace InstructorIQ.Core.Domain;
+
+public class HistoryRecordServiceRegistration : DomainServiceRegistrationBase
 {
-    public class HistoryRecordServiceRegistration : DomainServiceRegistrationBase
-    {
 
-        [RegisterServices]
-        public override void Register(IServiceCollection services)
-        {
-            RegisterEntityQuery<Guid, HistoryRecord, HistoryRecordReadModel>(services);
-        }
+    [RegisterServices]
+    public override void Register(IServiceCollection services)
+    {
+        RegisterEntityQuery<Guid, HistoryRecord, HistoryRecordReadModel>(services);
     }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/HistoryRecord/Mapping/HistoryRecordProfile.cs b/service/src/InstructorIQ.Core/Domain/HistoryRecord/Mapping/HistoryRecordProfile.cs
index 593b808a..2309163f 100644
--- a/service/src/InstructorIQ.Core/Domain/HistoryRecord/Mapping/HistoryRecordProfile.cs
+++ b/service/src/InstructorIQ.Core/Domain/HistoryRecord/Mapping/HistoryRecordProfile.cs
@@ -1,25 +1,26 @@
 using System;
+
 using AutoMapper;
+
 using InstructorIQ.Core.Data.Entities;
 using InstructorIQ.Core.Domain.Models;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Mapping
+namespace InstructorIQ.Core.Domain.Mapping;
+
+/// <summary>
+/// Mapper class for entity <see cref="HistoryRecord"/> .
+/// </summary>
+public class HistoryRecordProfile
+    : Profile
 {
     /// <summary>
-    /// Mapper class for entity <see cref="HistoryRecord"/> .
+    /// Initializes a new instance of the <see cref="HistoryRecordProfile"/> class.
     /// </summary>
-    public class HistoryRecordProfile
-        : Profile
+    public HistoryRecordProfile()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="HistoryRecordProfile"/> class.
-        /// </summary>
-        public HistoryRecordProfile()
-        {
-            CreateMap<HistoryRecord, HistoryRecordReadModel>()
-                .ForMember(d => d.RowVersion, opt => opt.MapFrom(s => Convert.ToBase64String(s.RowVersion)));
-        }
-
+        CreateMap<HistoryRecord, HistoryRecordReadModel>()
+            .ForMember(d => d.RowVersion, opt => opt.MapFrom(s => Convert.ToBase64String(s.RowVersion)));
     }
+
 }
diff --git a/service/src/InstructorIQ.Core/Domain/HistoryRecord/Models/HistoryRecordReadModel.cs b/service/src/InstructorIQ.Core/Domain/HistoryRecord/Models/HistoryRecordReadModel.cs
index c96b7bc9..73d897ca 100644
--- a/service/src/InstructorIQ.Core/Domain/HistoryRecord/Models/HistoryRecordReadModel.cs
+++ b/service/src/InstructorIQ.Core/Domain/HistoryRecord/Models/HistoryRecordReadModel.cs
@@ -1,146 +1,146 @@
 using System;
 using System.Collections.Generic;
+
 using MediatR.CommandQuery.Models;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Models
+namespace InstructorIQ.Core.Domain.Models;
+
+/// <summary>
+/// View Model class
+/// </summary>
+public class HistoryRecordReadModel
+    : EntityReadModel<Guid>
 {
+    #region Generated Properties
+    /// <summary>
+    /// Gets or sets the property value for 'Key'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'Key'.
+    /// </value>
+    public Guid Key { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'Entity'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'Entity'.
+    /// </value>
+    public string Entity { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'ParentKey'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'ParentKey'.
+    /// </value>
+    public Guid? ParentKey { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'ParentEntity'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'ParentEntity'.
+    /// </value>
+    public string ParentEntity { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'Changed'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'Changed'.
+    /// </value>
+    public DateTimeOffset Changed { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'ChangedBy'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'ChangedBy'.
+    /// </value>
+    public string ChangedBy { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'PropertyName'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'PropertyName'.
+    /// </value>
+    public string PropertyName { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'DisplayName'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'DisplayName'.
+    /// </value>
+    public string DisplayName { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'Path'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'Path'.
+    /// </value>
+    public string Path { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'Operation'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'Operation'.
+    /// </value>
+    public string Operation { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'OriginalValue'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'OriginalValue'.
+    /// </value>
+    public string OriginalValue { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'OriginalFormatted'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'OriginalFormatted'.
+    /// </value>
+    public string OriginalFormatted { get; set; }
+
     /// <summary>
-    /// View Model class
-    /// </summary>
-    public class HistoryRecordReadModel
-        : EntityReadModel<Guid>
-    {
-        #region Generated Properties
-        /// <summary>
-        /// Gets or sets the property value for 'Key'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Key'.
-        /// </value>
-        public Guid Key { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'Entity'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Entity'.
-        /// </value>
-        public string Entity { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'ParentKey'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'ParentKey'.
-        /// </value>
-        public Guid? ParentKey { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'ParentEntity'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'ParentEntity'.
-        /// </value>
-        public string ParentEntity { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'Changed'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Changed'.
-        /// </value>
-        public DateTimeOffset Changed { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'ChangedBy'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'ChangedBy'.
-        /// </value>
-        public string ChangedBy { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'PropertyName'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'PropertyName'.
-        /// </value>
-        public string PropertyName { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'DisplayName'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'DisplayName'.
-        /// </value>
-        public string DisplayName { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'Path'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Path'.
-        /// </value>
-        public string Path { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'Operation'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Operation'.
-        /// </value>
-        public string Operation { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'OriginalValue'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'OriginalValue'.
-        /// </value>
-        public string OriginalValue { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'OriginalFormatted'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'OriginalFormatted'.
-        /// </value>
-        public string OriginalFormatted { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'OriginalType'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'OriginalType'.
-        /// </value>
-        public string OriginalType { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'CurrentValue'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'CurrentValue'.
-        /// </value>
-        public string CurrentValue { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'CurrentFormatted'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'CurrentFormatted'.
-        /// </value>
-        public string CurrentFormatted { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'CurrentType'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'CurrentType'.
-        /// </value>
-        public string CurrentType { get; set; }
-
-        #endregion
-
-    }
+    /// Gets or sets the property value for 'OriginalType'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'OriginalType'.
+    /// </value>
+    public string OriginalType { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'CurrentValue'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'CurrentValue'.
+    /// </value>
+    public string CurrentValue { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'CurrentFormatted'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'CurrentFormatted'.
+    /// </value>
+    public string CurrentFormatted { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'CurrentType'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'CurrentType'.
+    /// </value>
+    public string CurrentType { get; set; }
+
+    #endregion
+
 }
diff --git a/service/src/InstructorIQ.Core/Domain/InstructorRole/InstructorRoleServiceRegistration.cs b/service/src/InstructorIQ.Core/Domain/InstructorRole/InstructorRoleServiceRegistration.cs
index 6285eb2b..da1c9f4a 100644
--- a/service/src/InstructorIQ.Core/Domain/InstructorRole/InstructorRoleServiceRegistration.cs
+++ b/service/src/InstructorIQ.Core/Domain/InstructorRole/InstructorRoleServiceRegistration.cs
@@ -7,18 +7,17 @@
 using Microsoft.Extensions.DependencyInjection;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain
-{
-    public class InstructorRoleServiceRegistration : DomainServiceRegistrationBase
-    {
+namespace InstructorIQ.Core.Domain;
 
-        [RegisterServices]
-        public override void Register(IServiceCollection services)
-        {
-            RegisterEntityQuery<Guid, InstructorIQ.Core.Data.Entities.InstructorRole, InstructorRoleReadModel>(services);
+public class InstructorRoleServiceRegistration : DomainServiceRegistrationBase
+{
 
-            RegisterEntityCommand<Guid, InstructorIQ.Core.Data.Entities.InstructorRole, InstructorRoleReadModel, InstructorRoleCreateModel, InstructorRoleUpdateModel>(services);
-        }
+    [RegisterServices]
+    public override void Register(IServiceCollection services)
+    {
+        RegisterEntityQuery<Guid, InstructorIQ.Core.Data.Entities.InstructorRole, InstructorRoleReadModel>(services);
 
+        RegisterEntityCommand<Guid, InstructorIQ.Core.Data.Entities.InstructorRole, InstructorRoleReadModel, InstructorRoleCreateModel, InstructorRoleUpdateModel>(services);
     }
+
 }
diff --git a/service/src/InstructorIQ.Core/Domain/InstructorRole/Mapping/InstructorRoleProfile.cs b/service/src/InstructorIQ.Core/Domain/InstructorRole/Mapping/InstructorRoleProfile.cs
index df633c31..4f0c3cea 100644
--- a/service/src/InstructorIQ.Core/Domain/InstructorRole/Mapping/InstructorRoleProfile.cs
+++ b/service/src/InstructorIQ.Core/Domain/InstructorRole/Mapping/InstructorRoleProfile.cs
@@ -1,26 +1,27 @@
 using System;
+
 using AutoMapper;
+
 using InstructorIQ.Core.Data.Entities;
 using InstructorIQ.Core.Domain.Models;
 
-namespace InstructorIQ.Core.Domain.Mapping
+namespace InstructorIQ.Core.Domain.Mapping;
+
+/// <summary>
+/// Mapper class for entity <see cref="InstructorRole"/> .
+/// </summary>
+public partial class InstructorRoleProfile
+    : Profile
 {
     /// <summary>
-    /// Mapper class for entity <see cref="InstructorRole"/> .
+    /// Initializes a new instance of the <see cref="InstructorRoleProfile"/> class.
     /// </summary>
-    public partial class InstructorRoleProfile
-        : Profile
+    public InstructorRoleProfile()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="InstructorRoleProfile"/> class.
-        /// </summary>
-        public InstructorRoleProfile()
-        {
-            CreateMap<InstructorIQ.Core.Data.Entities.InstructorRole, InstructorIQ.Core.Domain.Models.InstructorRoleReadModel>();
-            CreateMap<InstructorIQ.Core.Domain.Models.InstructorRoleCreateModel, InstructorIQ.Core.Data.Entities.InstructorRole>();
-            CreateMap<InstructorIQ.Core.Data.Entities.InstructorRole, InstructorIQ.Core.Domain.Models.InstructorRoleUpdateModel>();
-            CreateMap<InstructorIQ.Core.Domain.Models.InstructorRoleUpdateModel, InstructorIQ.Core.Data.Entities.InstructorRole>();
-        }
-
+        CreateMap<InstructorIQ.Core.Data.Entities.InstructorRole, InstructorIQ.Core.Domain.Models.InstructorRoleReadModel>();
+        CreateMap<InstructorIQ.Core.Domain.Models.InstructorRoleCreateModel, InstructorIQ.Core.Data.Entities.InstructorRole>();
+        CreateMap<InstructorIQ.Core.Data.Entities.InstructorRole, InstructorIQ.Core.Domain.Models.InstructorRoleUpdateModel>();
+        CreateMap<InstructorIQ.Core.Domain.Models.InstructorRoleUpdateModel, InstructorIQ.Core.Data.Entities.InstructorRole>();
     }
+
 }
diff --git a/service/src/InstructorIQ.Core/Domain/InstructorRole/Models/InstructorRoleCreateModel.cs b/service/src/InstructorIQ.Core/Domain/InstructorRole/Models/InstructorRoleCreateModel.cs
index 81637641..4b50fc55 100644
--- a/service/src/InstructorIQ.Core/Domain/InstructorRole/Models/InstructorRoleCreateModel.cs
+++ b/service/src/InstructorIQ.Core/Domain/InstructorRole/Models/InstructorRoleCreateModel.cs
@@ -1,42 +1,42 @@
 using System;
 using System.Collections.Generic;
+
 using MediatR.CommandQuery.Models;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Models
+namespace InstructorIQ.Core.Domain.Models;
+
+/// <summary>
+/// View Model class
+/// </summary>
+public partial class InstructorRoleCreateModel
+    : EntityCreateModel<Guid>
 {
+    #region Generated Properties
     /// <summary>
-    /// View Model class
+    /// Gets or sets the property value for 'Name'.
     /// </summary>
-    public partial class InstructorRoleCreateModel
-        : EntityCreateModel<Guid>
-    {
-        #region Generated Properties
-        /// <summary>
-        /// Gets or sets the property value for 'Name'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Name'.
-        /// </value>
-        public string Name { get; set; }
+    /// <value>
+    /// The property value for 'Name'.
+    /// </value>
+    public string Name { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'Description'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Description'.
-        /// </value>
-        public string Description { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'Description'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'Description'.
+    /// </value>
+    public string Description { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'TenantId'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'TenantId'.
-        /// </value>
-        public Guid TenantId { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'TenantId'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'TenantId'.
+    /// </value>
+    public Guid TenantId { get; set; }
 
-        #endregion
+    #endregion
 
-    }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/InstructorRole/Models/InstructorRoleReadModel.cs b/service/src/InstructorIQ.Core/Domain/InstructorRole/Models/InstructorRoleReadModel.cs
index 1aaa34f5..07d22353 100644
--- a/service/src/InstructorIQ.Core/Domain/InstructorRole/Models/InstructorRoleReadModel.cs
+++ b/service/src/InstructorIQ.Core/Domain/InstructorRole/Models/InstructorRoleReadModel.cs
@@ -1,42 +1,42 @@
 using System;
 using System.Collections.Generic;
+
 using MediatR.CommandQuery.Models;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Models
+namespace InstructorIQ.Core.Domain.Models;
+
+/// <summary>
+/// View Model class
+/// </summary>
+public partial class InstructorRoleReadModel
+    : EntityReadModel<Guid>
 {
+    #region Generated Properties
     /// <summary>
-    /// View Model class
+    /// Gets or sets the property value for 'Name'.
     /// </summary>
-    public partial class InstructorRoleReadModel
-        : EntityReadModel<Guid>
-    {
-        #region Generated Properties
-        /// <summary>
-        /// Gets or sets the property value for 'Name'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Name'.
-        /// </value>
-        public string Name { get; set; }
+    /// <value>
+    /// The property value for 'Name'.
+    /// </value>
+    public string Name { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'Description'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Description'.
-        /// </value>
-        public string Description { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'Description'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'Description'.
+    /// </value>
+    public string Description { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'TenantId'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'TenantId'.
-        /// </value>
-        public Guid TenantId { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'TenantId'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'TenantId'.
+    /// </value>
+    public Guid TenantId { get; set; }
 
-        #endregion
+    #endregion
 
-    }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/InstructorRole/Models/InstructorRoleUpdateModel.cs b/service/src/InstructorIQ.Core/Domain/InstructorRole/Models/InstructorRoleUpdateModel.cs
index 8608bb9d..aced6d1f 100644
--- a/service/src/InstructorIQ.Core/Domain/InstructorRole/Models/InstructorRoleUpdateModel.cs
+++ b/service/src/InstructorIQ.Core/Domain/InstructorRole/Models/InstructorRoleUpdateModel.cs
@@ -1,42 +1,42 @@
 using System;
 using System.Collections.Generic;
+
 using MediatR.CommandQuery.Models;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Models
+namespace InstructorIQ.Core.Domain.Models;
+
+/// <summary>
+/// View Model class
+/// </summary>
+public partial class InstructorRoleUpdateModel
+    : EntityUpdateModel
 {
+    #region Generated Properties
     /// <summary>
-    /// View Model class
+    /// Gets or sets the property value for 'Name'.
     /// </summary>
-    public partial class InstructorRoleUpdateModel
-        : EntityUpdateModel
-    {
-        #region Generated Properties
-        /// <summary>
-        /// Gets or sets the property value for 'Name'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Name'.
-        /// </value>
-        public string Name { get; set; }
+    /// <value>
+    /// The property value for 'Name'.
+    /// </value>
+    public string Name { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'Description'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Description'.
-        /// </value>
-        public string Description { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'Description'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'Description'.
+    /// </value>
+    public string Description { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'TenantId'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'TenantId'.
-        /// </value>
-        public Guid TenantId { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'TenantId'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'TenantId'.
+    /// </value>
+    public Guid TenantId { get; set; }
 
-        #endregion
+    #endregion
 
-    }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/InstructorRole/Validation/InstructorRoleCreateModelValidator.cs b/service/src/InstructorIQ.Core/Domain/InstructorRole/Validation/InstructorRoleCreateModelValidator.cs
index 6dcc348b..fd41e538 100644
--- a/service/src/InstructorIQ.Core/Domain/InstructorRole/Validation/InstructorRoleCreateModelValidator.cs
+++ b/service/src/InstructorIQ.Core/Domain/InstructorRole/Validation/InstructorRoleCreateModelValidator.cs
@@ -1,25 +1,26 @@
 using System;
+
 using FluentValidation;
+
 using InstructorIQ.Core.Domain.Models;
 
-namespace InstructorIQ.Core.Domain.Validation
+namespace InstructorIQ.Core.Domain.Validation;
+
+/// <summary>
+/// Validator class for <see cref="InstructorRoleCreateModel"/> .
+/// </summary>
+public partial class InstructorRoleCreateModelValidator
+    : AbstractValidator<InstructorRoleCreateModel>
 {
     /// <summary>
-    /// Validator class for <see cref="InstructorRoleCreateModel"/> .
+    /// Initializes a new instance of the <see cref="InstructorRoleCreateModelValidator"/> class.
     /// </summary>
-    public partial class InstructorRoleCreateModelValidator
-        : AbstractValidator<InstructorRoleCreateModel>
+    public InstructorRoleCreateModelValidator()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="InstructorRoleCreateModelValidator"/> class.
-        /// </summary>
-        public InstructorRoleCreateModelValidator()
-        {
-            #region Generated Constructor
-            RuleFor(p => p.Name).NotEmpty();
-            RuleFor(p => p.Name).MaximumLength(256);
-            #endregion
-        }
-
+        #region Generated Constructor
+        RuleFor(p => p.Name).NotEmpty();
+        RuleFor(p => p.Name).MaximumLength(256);
+        #endregion
     }
+
 }
diff --git a/service/src/InstructorIQ.Core/Domain/InstructorRole/Validation/InstructorRoleUpdateModelValidator.cs b/service/src/InstructorIQ.Core/Domain/InstructorRole/Validation/InstructorRoleUpdateModelValidator.cs
index 6e060f4e..fed4e668 100644
--- a/service/src/InstructorIQ.Core/Domain/InstructorRole/Validation/InstructorRoleUpdateModelValidator.cs
+++ b/service/src/InstructorIQ.Core/Domain/InstructorRole/Validation/InstructorRoleUpdateModelValidator.cs
@@ -1,25 +1,26 @@
 using System;
+
 using FluentValidation;
+
 using InstructorIQ.Core.Domain.Models;
 
-namespace InstructorIQ.Core.Domain.Validation
+namespace InstructorIQ.Core.Domain.Validation;
+
+/// <summary>
+/// Validator class for <see cref="InstructorRoleUpdateModel"/> .
+/// </summary>
+public partial class InstructorRoleUpdateModelValidator
+    : AbstractValidator<InstructorRoleUpdateModel>
 {
     /// <summary>
-    /// Validator class for <see cref="InstructorRoleUpdateModel"/> .
+    /// Initializes a new instance of the <see cref="InstructorRoleUpdateModelValidator"/> class.
     /// </summary>
-    public partial class InstructorRoleUpdateModelValidator
-        : AbstractValidator<InstructorRoleUpdateModel>
+    public InstructorRoleUpdateModelValidator()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="InstructorRoleUpdateModelValidator"/> class.
-        /// </summary>
-        public InstructorRoleUpdateModelValidator()
-        {
-            #region Generated Constructor
-            RuleFor(p => p.Name).NotEmpty();
-            RuleFor(p => p.Name).MaximumLength(256);
-            #endregion
-        }
-
+        #region Generated Constructor
+        RuleFor(p => p.Name).NotEmpty();
+        RuleFor(p => p.Name).MaximumLength(256);
+        #endregion
     }
+
 }
diff --git a/service/src/InstructorIQ.Core/Domain/LinkToken/Commands/LinkTokenCreateCommand.cs b/service/src/InstructorIQ.Core/Domain/LinkToken/Commands/LinkTokenCreateCommand.cs
index f43c0270..744f985d 100644
--- a/service/src/InstructorIQ.Core/Domain/LinkToken/Commands/LinkTokenCreateCommand.cs
+++ b/service/src/InstructorIQ.Core/Domain/LinkToken/Commands/LinkTokenCreateCommand.cs
@@ -1,18 +1,19 @@
-using System.Security.Principal;
+using System.Security.Principal;
+
 using InstructorIQ.Core.Domain.Models;
+
 using MediatR.CommandQuery.Commands;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Commands
+namespace InstructorIQ.Core.Domain.Commands;
+
+public class LinkTokenCreateCommand : EntityModelCommand<LinkTokenCreateModel, LinkTokenReadModel>
 {
-    public class LinkTokenCreateCommand : EntityModelCommand<LinkTokenCreateModel, LinkTokenReadModel>
+    public LinkTokenCreateCommand(IPrincipal principal, LinkTokenCreateModel model, string token)
+        : base(principal, model)
     {
-        public LinkTokenCreateCommand(IPrincipal principal, LinkTokenCreateModel model, string token)
-            : base(principal, model)
-        {
-            Token = token;
-        }
-
-        public string Token { get; }
+        Token = token;
     }
+
+    public string Token { get; }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/LinkToken/Commands/LinkTokenValidateCommand.cs b/service/src/InstructorIQ.Core/Domain/LinkToken/Commands/LinkTokenValidateCommand.cs
index 3578b4dc..8ca1e93f 100644
--- a/service/src/InstructorIQ.Core/Domain/LinkToken/Commands/LinkTokenValidateCommand.cs
+++ b/service/src/InstructorIQ.Core/Domain/LinkToken/Commands/LinkTokenValidateCommand.cs
@@ -1,18 +1,19 @@
-using System;
+using System;
 using System.Security.Principal;
+
 using InstructorIQ.Core.Domain.Models;
+
 using MediatR.CommandQuery.Commands;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Commands
+namespace InstructorIQ.Core.Domain.Commands;
+
+public class LinkTokenValidateCommand : PrincipalCommandBase<LinkTokenReadModel>
 {
-    public class LinkTokenValidateCommand : PrincipalCommandBase<LinkTokenReadModel>
+    public LinkTokenValidateCommand(IPrincipal principal, string token) : base(principal)
     {
-        public LinkTokenValidateCommand(IPrincipal principal, string token) : base(principal)
-        {
-            Token = token;
-        }
-
-        public string Token { get; }
+        Token = token;
     }
-}
\ No newline at end of file
+
+    public string Token { get; }
+}
diff --git a/service/src/InstructorIQ.Core/Domain/LinkToken/Handlers/LinkTokenCreateCommandHandler.cs b/service/src/InstructorIQ.Core/Domain/LinkToken/Handlers/LinkTokenCreateCommandHandler.cs
index d01c2d5f..2a952d0a 100644
--- a/service/src/InstructorIQ.Core/Domain/LinkToken/Handlers/LinkTokenCreateCommandHandler.cs
+++ b/service/src/InstructorIQ.Core/Domain/LinkToken/Handlers/LinkTokenCreateCommandHandler.cs
@@ -1,75 +1,78 @@
-using System;
+using System;
 using System.Threading;
 using System.Threading.Tasks;
+
 using AutoMapper;
+
 using InstructorIQ.Core.Data;
 using InstructorIQ.Core.Domain.Commands;
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Extensions;
 using InstructorIQ.Core.Security;
+
 using MediatR.CommandQuery.EntityFrameworkCore.Handlers;
+
 using Microsoft.Extensions.Logging;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Handlers
+namespace InstructorIQ.Core.Domain.Handlers;
+
+public class LinkTokenCreateCommandHandler : DataContextHandlerBase<InstructorIQContext, LinkTokenCreateCommand, LinkTokenReadModel>
 {
-    public class LinkTokenCreateCommandHandler : DataContextHandlerBase<InstructorIQContext, LinkTokenCreateCommand, LinkTokenReadModel>
+    private readonly UserClaimManager _userClaimManager;
+
+    public LinkTokenCreateCommandHandler(ILoggerFactory loggerFactory, InstructorIQContext dataContext, IMapper mapper, UserClaimManager userClaimManager)
+        : base(loggerFactory, dataContext, mapper)
     {
-        private readonly UserClaimManager _userClaimManager;
+        _userClaimManager = userClaimManager;
+    }
 
-        public LinkTokenCreateCommandHandler(ILoggerFactory loggerFactory, InstructorIQContext dataContext, IMapper mapper, UserClaimManager userClaimManager)
-            : base(loggerFactory, dataContext, mapper)
-        {
-            _userClaimManager = userClaimManager;
-        }
+    protected override async Task<LinkTokenReadModel> Process(LinkTokenCreateCommand request, CancellationToken cancellationToken)
+    {
+        // token is stored hashed to prevent session hijacking 
+        var tokenHash = request.Token.ComputeHash();
+        var returnUrl = GetReturnUrl(request);
+        var tenantId = GetTenantId(request);
 
-        protected override async Task<LinkTokenReadModel> Process(LinkTokenCreateCommand request, CancellationToken cancellationToken)
+        var linkToken = new Data.Entities.LinkToken
         {
-            // token is stored hashed to prevent session hijacking 
-            var tokenHash = request.Token.ComputeHash();
-            var returnUrl = GetReturnUrl(request);
-            var tenantId = GetTenantId(request);
-
-            var linkToken = new Data.Entities.LinkToken
-            {
-                Expires = request.Model.Expires,
-                Issued = DateTimeOffset.UtcNow,
-                TenantId = tenantId,
-                TokenHash = tokenHash,
-                Url = returnUrl,
-                UserName = request.Model.UserName
-            };
-
-            // save to db
-            DataContext.LinkTokens.Add(linkToken);
-            await DataContext.SaveChangesAsync(cancellationToken);
-
-            var readToken = new LinkTokenReadModel
-            {
-                Url = linkToken.Url,
-                UserName = linkToken.UserName,
-                TenantId = linkToken.TenantId
-            };
-
-            return readToken;
-        }
-
-        private Guid? GetTenantId(LinkTokenCreateCommand request)
-        {
-            return request.Model.TenantId ??
-                _userClaimManager.GetTenantId(request.Principal);
-        }
+            Expires = request.Model.Expires,
+            Issued = DateTimeOffset.UtcNow,
+            TenantId = tenantId,
+            TokenHash = tokenHash,
+            Url = returnUrl,
+            UserName = request.Model.UserName
+        };
+
+        // save to db
+        DataContext.LinkTokens.Add(linkToken);
+        await DataContext.SaveChangesAsync(cancellationToken);
 
-        private string GetReturnUrl(LinkTokenCreateCommand request)
+        var readToken = new LinkTokenReadModel
         {
-            var linkUrl = request.Model.Url;
-            if (linkUrl.IsNullOrEmpty())
-                return "/";
+            Url = linkToken.Url,
+            UserName = linkToken.UserName,
+            TenantId = linkToken.TenantId
+        };
+
+        return readToken;
+    }
+
+    private Guid? GetTenantId(LinkTokenCreateCommand request)
+    {
+        return request.Model.TenantId ??
+            _userClaimManager.GetTenantId(request.Principal);
+    }
+
+    private string GetReturnUrl(LinkTokenCreateCommand request)
+    {
+        var linkUrl = request.Model.Url;
+        if (linkUrl.IsNullOrEmpty())
+            return "/";
 
-            var linkUri = new Uri(linkUrl, UriKind.RelativeOrAbsolute);
-            var returnUrl = linkUri.ToLocalPath();
+        var linkUri = new Uri(linkUrl, UriKind.RelativeOrAbsolute);
+        var returnUrl = linkUri.ToLocalPath();
 
-            return returnUrl;
-        }
+        return returnUrl;
     }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/LinkToken/Handlers/LinkTokenValidateCommandHandler.cs b/service/src/InstructorIQ.Core/Domain/LinkToken/Handlers/LinkTokenValidateCommandHandler.cs
index b600c9bb..46c18cc3 100644
--- a/service/src/InstructorIQ.Core/Domain/LinkToken/Handlers/LinkTokenValidateCommandHandler.cs
+++ b/service/src/InstructorIQ.Core/Domain/LinkToken/Handlers/LinkTokenValidateCommandHandler.cs
@@ -1,56 +1,59 @@
-using System;
+using System;
 using System.Threading;
 using System.Threading.Tasks;
+
 using AutoMapper;
+
 using InstructorIQ.Core.Data;
 using InstructorIQ.Core.Domain.Commands;
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Extensions;
+
 using MediatR.CommandQuery.EntityFrameworkCore.Handlers;
+
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Handlers
+namespace InstructorIQ.Core.Domain.Handlers;
+
+public class LinkTokenValidateCommandHandler : DataContextHandlerBase<InstructorIQContext, LinkTokenValidateCommand, LinkTokenReadModel>
 {
-    public class LinkTokenValidateCommandHandler : DataContextHandlerBase<InstructorIQContext, LinkTokenValidateCommand, LinkTokenReadModel>
+    public LinkTokenValidateCommandHandler(ILoggerFactory loggerFactory, InstructorIQContext dataContext, IMapper mapper)
+        : base(loggerFactory, dataContext, mapper)
     {
-        public LinkTokenValidateCommandHandler(ILoggerFactory loggerFactory, InstructorIQContext dataContext, IMapper mapper)
-            : base(loggerFactory, dataContext, mapper)
+    }
+
+    protected override async Task<LinkTokenReadModel> Process(LinkTokenValidateCommand request, CancellationToken cancellationToken)
+    {
+        // token is stored hashed to prevent session hijacking 
+        var tokenHash = request.Token.ComputeHash();
+
+        var linkToken = await DataContext.LinkTokens
+            .FirstOrDefaultAsync(t => t.TokenHash == tokenHash, cancellationToken)
+            .ConfigureAwait(false);
+
+        if (linkToken == null)
         {
+            Logger.LogWarning("Link token '{token}' not found.", request.Token);
+            return null;
         }
 
-        protected override async Task<LinkTokenReadModel> Process(LinkTokenValidateCommand request, CancellationToken cancellationToken)
+        // link expired
+        if (linkToken.Expires.HasValue && linkToken.Expires.Value < DateTimeOffset.UtcNow)
         {
-            // token is stored hashed to prevent session hijacking 
-            var tokenHash = request.Token.ComputeHash();
-
-            var linkToken = await DataContext.LinkTokens
-                .FirstOrDefaultAsync(t => t.TokenHash == tokenHash, cancellationToken)
-                .ConfigureAwait(false);
-
-            if (linkToken == null)
-            {
-                Logger.LogWarning("Link token '{token}' not found.", request.Token);
-                return null;
-            }
-
-            // link expired
-            if (linkToken.Expires.HasValue && linkToken.Expires.Value < DateTimeOffset.UtcNow)
-            {
-                Logger.LogWarning("User '{userName}' attempted to log in with expired link token: {token}", linkToken.UserName, request.Token);
-                return null;
-            }
-            
-            // return login information
-            var readToken = new LinkTokenReadModel
-            {
-                Url = linkToken.Url,
-                UserName = linkToken.UserName,
-                TenantId = linkToken.TenantId
-            };
-
-            return readToken;
+            Logger.LogWarning("User '{userName}' attempted to log in with expired link token: {token}", linkToken.UserName, request.Token);
+            return null;
         }
+
+        // return login information
+        var readToken = new LinkTokenReadModel
+        {
+            Url = linkToken.Url,
+            UserName = linkToken.UserName,
+            TenantId = linkToken.TenantId
+        };
+
+        return readToken;
     }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.Core/Domain/LinkToken/LoginLinkServiceRegistration.cs b/service/src/InstructorIQ.Core/Domain/LinkToken/LoginLinkServiceRegistration.cs
index 42ea45e5..83dff314 100644
--- a/service/src/InstructorIQ.Core/Domain/LinkToken/LoginLinkServiceRegistration.cs
+++ b/service/src/InstructorIQ.Core/Domain/LinkToken/LoginLinkServiceRegistration.cs
@@ -9,16 +9,15 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 
-namespace InstructorIQ.Core.Domain.LinkToken
+namespace InstructorIQ.Core.Domain.LinkToken;
+
+public class LoginLinkServiceRegistration : DomainServiceRegistrationBase
 {
-    public class LoginLinkServiceRegistration : DomainServiceRegistrationBase
-    {
 
-        [RegisterServices]
-        public override void Register(IServiceCollection services)
-        {
-            services.TryAddTransient<IRequestHandler<LinkTokenCreateCommand, LinkTokenReadModel>, LinkTokenCreateCommandHandler>();
-            services.TryAddTransient<IRequestHandler<LinkTokenValidateCommand, LinkTokenReadModel>, LinkTokenValidateCommandHandler>();
-        }
+    [RegisterServices]
+    public override void Register(IServiceCollection services)
+    {
+        services.TryAddTransient<IRequestHandler<LinkTokenCreateCommand, LinkTokenReadModel>, LinkTokenCreateCommandHandler>();
+        services.TryAddTransient<IRequestHandler<LinkTokenValidateCommand, LinkTokenReadModel>, LinkTokenValidateCommandHandler>();
     }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/LinkToken/Models/LinkTokenCreateModel.cs b/service/src/InstructorIQ.Core/Domain/LinkToken/Models/LinkTokenCreateModel.cs
index 2c4d2c2a..df1c5ca4 100644
--- a/service/src/InstructorIQ.Core/Domain/LinkToken/Models/LinkTokenCreateModel.cs
+++ b/service/src/InstructorIQ.Core/Domain/LinkToken/Models/LinkTokenCreateModel.cs
@@ -1,15 +1,14 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Text;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Models
+namespace InstructorIQ.Core.Domain.Models;
+
+public class LinkTokenCreateModel
 {
-    public class LinkTokenCreateModel
-    {
-        public string UserName { get; set; }
-        public string Url { get; set; }
-        public Guid? TenantId { get; set; }
-        public DateTimeOffset? Expires { get; set; }
-    }
+    public string UserName { get; set; }
+    public string Url { get; set; }
+    public Guid? TenantId { get; set; }
+    public DateTimeOffset? Expires { get; set; }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/LinkToken/Models/LinkTokenReadModel.cs b/service/src/InstructorIQ.Core/Domain/LinkToken/Models/LinkTokenReadModel.cs
index 34c1e9f8..7c9721cc 100644
--- a/service/src/InstructorIQ.Core/Domain/LinkToken/Models/LinkTokenReadModel.cs
+++ b/service/src/InstructorIQ.Core/Domain/LinkToken/Models/LinkTokenReadModel.cs
@@ -1,12 +1,11 @@
-using System;
+using System;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Models
+namespace InstructorIQ.Core.Domain.Models;
+
+public class LinkTokenReadModel
 {
-    public class LinkTokenReadModel
-    {
-        public string UserName { get; set; }
-        public string Url { get; set; }
-        public Guid? TenantId { get; set; }
-    }
-}
\ No newline at end of file
+    public string UserName { get; set; }
+    public string Url { get; set; }
+    public Guid? TenantId { get; set; }
+}
diff --git a/service/src/InstructorIQ.Core/Domain/Location/Handlers/LocationDropdownQueryHandler.cs b/service/src/InstructorIQ.Core/Domain/Location/Handlers/LocationDropdownQueryHandler.cs
index e74f6cc0..5870b42c 100644
--- a/service/src/InstructorIQ.Core/Domain/Location/Handlers/LocationDropdownQueryHandler.cs
+++ b/service/src/InstructorIQ.Core/Domain/Location/Handlers/LocationDropdownQueryHandler.cs
@@ -1,42 +1,45 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+
 using AutoMapper;
 using AutoMapper.QueryableExtensions;
+
 using InstructorIQ.Core.Data;
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Domain.Queries;
 using InstructorIQ.Core.Security;
+
 using MediatR.CommandQuery.EntityFrameworkCore.Handlers;
+
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Handlers
+namespace InstructorIQ.Core.Domain.Handlers;
+
+public class LocationDropdownQueryHandler : DataContextHandlerBase<InstructorIQContext, LocationDropdownQuery, IReadOnlyCollection<LocationDropdownModel>>
 {
-    public class LocationDropdownQueryHandler : DataContextHandlerBase<InstructorIQContext, LocationDropdownQuery, IReadOnlyCollection<LocationDropdownModel>>
+    private readonly UserClaimManager _userClaimManager;
+
+    public LocationDropdownQueryHandler(ILoggerFactory loggerFactory, InstructorIQContext dataContext, IMapper mapper, UserClaimManager userClaimManager)
+        : base(loggerFactory, dataContext, mapper)
     {
-        private readonly UserClaimManager _userClaimManager;
-
-        public LocationDropdownQueryHandler(ILoggerFactory loggerFactory, InstructorIQContext dataContext, IMapper mapper, UserClaimManager userClaimManager)
-            : base(loggerFactory, dataContext, mapper)
-        {
-            _userClaimManager = userClaimManager;
-        }
-
-        protected override async Task<IReadOnlyCollection<LocationDropdownModel>> Process(LocationDropdownQuery request, CancellationToken cancellationToken)
-        {
-            var tenantId = _userClaimManager.GetRequiredTenantId(request.Principal);
-
-            var result = await DataContext.Locations
-                .AsNoTracking()
-                .Where(q => q.TenantId == tenantId)
-                .OrderBy(q => q.Name)
-                .ProjectTo<LocationDropdownModel>(Mapper.ConfigurationProvider)
-                .ToListAsync(cancellationToken);
-
-            return result;
-        }
+        _userClaimManager = userClaimManager;
+    }
+
+    protected override async Task<IReadOnlyCollection<LocationDropdownModel>> Process(LocationDropdownQuery request, CancellationToken cancellationToken)
+    {
+        var tenantId = _userClaimManager.GetRequiredTenantId(request.Principal);
+
+        var result = await DataContext.Locations
+            .AsNoTracking()
+            .Where(q => q.TenantId == tenantId)
+            .OrderBy(q => q.Name)
+            .ProjectTo<LocationDropdownModel>(Mapper.ConfigurationProvider)
+            .ToListAsync(cancellationToken);
+
+        return result;
     }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Location/LocationServiceRegistration.cs b/service/src/InstructorIQ.Core/Domain/Location/LocationServiceRegistration.cs
index 347f29bd..3dbfffc7 100644
--- a/service/src/InstructorIQ.Core/Domain/Location/LocationServiceRegistration.cs
+++ b/service/src/InstructorIQ.Core/Domain/Location/LocationServiceRegistration.cs
@@ -14,18 +14,17 @@
 using Microsoft.Extensions.DependencyInjection.Extensions;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain
+namespace InstructorIQ.Core.Domain;
+
+public class LocationServiceRegistration : DomainServiceRegistrationBase
 {
-    public class LocationServiceRegistration : DomainServiceRegistrationBase
-    {
 
-        [RegisterServices]
-        public override void Register(IServiceCollection services)
-        {
-            RegisterEntityQuery<Guid, Location, LocationReadModel>(services);
-            RegisterEntityCommand<Guid, Location, LocationReadModel, LocationCreateModel, LocationUpdateModel>(services);
+    [RegisterServices]
+    public override void Register(IServiceCollection services)
+    {
+        RegisterEntityQuery<Guid, Location, LocationReadModel>(services);
+        RegisterEntityCommand<Guid, Location, LocationReadModel, LocationCreateModel, LocationUpdateModel>(services);
 
-            services.TryAddTransient<IRequestHandler<LocationDropdownQuery, IReadOnlyCollection<LocationDropdownModel>>, LocationDropdownQueryHandler>();
-        }
+        services.TryAddTransient<IRequestHandler<LocationDropdownQuery, IReadOnlyCollection<LocationDropdownModel>>, LocationDropdownQueryHandler>();
     }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Location/Mapping/LocationProfile.cs b/service/src/InstructorIQ.Core/Domain/Location/Mapping/LocationProfile.cs
index ed2594a7..34056a80 100644
--- a/service/src/InstructorIQ.Core/Domain/Location/Mapping/LocationProfile.cs
+++ b/service/src/InstructorIQ.Core/Domain/Location/Mapping/LocationProfile.cs
@@ -1,38 +1,39 @@
 using System;
+
 using AutoMapper;
+
 using InstructorIQ.Core.Data.Entities;
 using InstructorIQ.Core.Domain.Models;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Mapping
+namespace InstructorIQ.Core.Domain.Mapping;
+
+/// <summary>
+/// Mapper class for entity <see cref="Location"/> .
+/// </summary>
+public class LocationProfile
+    : Profile
 {
     /// <summary>
-    /// Mapper class for entity <see cref="Location"/> .
+    /// Initializes a new instance of the <see cref="LocationProfile"/> class.
     /// </summary>
-    public class LocationProfile
-        : Profile
+    public LocationProfile()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="LocationProfile"/> class.
-        /// </summary>
-        public LocationProfile()
-        {
-            CreateMap<LocationCreateModel, Location>();
+        CreateMap<LocationCreateModel, Location>();
 
-            CreateMap<LocationUpdateModel, Location>()
-                .ForMember(d => d.RowVersion, opt => opt.MapFrom(s => Convert.FromBase64String(s.RowVersion)));
+        CreateMap<LocationUpdateModel, Location>()
+            .ForMember(d => d.RowVersion, opt => opt.MapFrom(s => Convert.FromBase64String(s.RowVersion)));
 
-            CreateMap<Location, LocationReadModel>()
-                .ForMember(d => d.RowVersion, opt => opt.MapFrom(s => Convert.ToBase64String(s.RowVersion)))
-                .ForMember(d => d.TenantName, opt => opt.MapFrom(s => s.Tenant.Name));
+        CreateMap<Location, LocationReadModel>()
+            .ForMember(d => d.RowVersion, opt => opt.MapFrom(s => Convert.ToBase64String(s.RowVersion)))
+            .ForMember(d => d.TenantName, opt => opt.MapFrom(s => s.Tenant.Name));
 
-            CreateMap<Location, LocationUpdateModel>()
-                .ForMember(d => d.RowVersion, opt => opt.MapFrom(s => Convert.ToBase64String(s.RowVersion)));
-
-            CreateMap<Location, LocationDropdownModel>()
-                .ForMember(d => d.Value, opt => opt.MapFrom(s => s.Id.ToString().ToLowerInvariant()))
-                .ForMember(d => d.Text, opt => opt.MapFrom(s => s.Name));
-        }
+        CreateMap<Location, LocationUpdateModel>()
+            .ForMember(d => d.RowVersion, opt => opt.MapFrom(s => Convert.ToBase64String(s.RowVersion)));
 
+        CreateMap<Location, LocationDropdownModel>()
+            .ForMember(d => d.Value, opt => opt.MapFrom(s => s.Id.ToString().ToLowerInvariant()))
+            .ForMember(d => d.Text, opt => opt.MapFrom(s => s.Name));
     }
+
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Location/Models/LocationCreateModel.cs b/service/src/InstructorIQ.Core/Domain/Location/Models/LocationCreateModel.cs
index 34b2f6dc..1f6e038c 100644
--- a/service/src/InstructorIQ.Core/Domain/Location/Models/LocationCreateModel.cs
+++ b/service/src/InstructorIQ.Core/Domain/Location/Models/LocationCreateModel.cs
@@ -1,146 +1,146 @@
 using System;
+
 using MediatR.CommandQuery.Definitions;
 using MediatR.CommandQuery.Models;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Models
+namespace InstructorIQ.Core.Domain.Models;
+
+/// <summary>
+/// View Model class
+/// </summary>
+public class LocationCreateModel
+    : EntityCreateModel<Guid>, IHaveTenant<Guid>
 {
+    #region Generated Properties
+    /// <summary>
+    /// Gets or sets the property value for 'Name'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'Name'.
+    /// </value>
+    public string Name { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'Description'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'Description'.
+    /// </value>
+    public string Description { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'AddressLine1'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'AddressLine1'.
+    /// </value>
+    public string AddressLine1 { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'AddressLine2'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'AddressLine2'.
+    /// </value>
+    public string AddressLine2 { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'AddressLine3'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'AddressLine3'.
+    /// </value>
+    public string AddressLine3 { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'City'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'City'.
+    /// </value>
+    public string City { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'StateProvince'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'StateProvince'.
+    /// </value>
+    public string StateProvince { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'PostalCode'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'PostalCode'.
+    /// </value>
+    public string PostalCode { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'ContactName'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'ContactName'.
+    /// </value>
+    public string ContactName { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'ContactEmail'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'ContactEmail'.
+    /// </value>
+    public string ContactEmail { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'ContactPhone'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'ContactPhone'.
+    /// </value>
+    public string ContactPhone { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'Latitude'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'Latitude'.
+    /// </value>
+    public decimal? Latitude { get; set; }
+
     /// <summary>
-    /// View Model class
-    /// </summary>
-    public class LocationCreateModel
-        : EntityCreateModel<Guid>, IHaveTenant<Guid>
-    {
-        #region Generated Properties
-        /// <summary>
-        /// Gets or sets the property value for 'Name'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Name'.
-        /// </value>
-        public string Name { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'Description'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Description'.
-        /// </value>
-        public string Description { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'AddressLine1'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'AddressLine1'.
-        /// </value>
-        public string AddressLine1 { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'AddressLine2'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'AddressLine2'.
-        /// </value>
-        public string AddressLine2 { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'AddressLine3'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'AddressLine3'.
-        /// </value>
-        public string AddressLine3 { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'City'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'City'.
-        /// </value>
-        public string City { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'StateProvince'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'StateProvince'.
-        /// </value>
-        public string StateProvince { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'PostalCode'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'PostalCode'.
-        /// </value>
-        public string PostalCode { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'ContactName'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'ContactName'.
-        /// </value>
-        public string ContactName { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'ContactEmail'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'ContactEmail'.
-        /// </value>
-        public string ContactEmail { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'ContactPhone'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'ContactPhone'.
-        /// </value>
-        public string ContactPhone { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'Latitude'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Latitude'.
-        /// </value>
-        public decimal? Latitude { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'Longitude'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Longitude'.
-        /// </value>
-        public decimal? Longitude { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'TenantId'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'TenantId'.
-        /// </value>
-        public Guid TenantId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'PeriodStart'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'PeriodStart'.
-        /// </value>
-        public DateTime PeriodStart { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'PeriodEnd'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'PeriodEnd'.
-        /// </value>
-        public DateTime PeriodEnd { get; set; }
-
-        #endregion
-
-    }
+    /// Gets or sets the property value for 'Longitude'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'Longitude'.
+    /// </value>
+    public decimal? Longitude { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'TenantId'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'TenantId'.
+    /// </value>
+    public Guid TenantId { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'PeriodStart'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'PeriodStart'.
+    /// </value>
+    public DateTime PeriodStart { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'PeriodEnd'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'PeriodEnd'.
+    /// </value>
+    public DateTime PeriodEnd { get; set; }
+
+    #endregion
+
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Location/Models/LocationDropdownModel.cs b/service/src/InstructorIQ.Core/Domain/Location/Models/LocationDropdownModel.cs
index 10f0ad38..9110ea40 100644
--- a/service/src/InstructorIQ.Core/Domain/Location/Models/LocationDropdownModel.cs
+++ b/service/src/InstructorIQ.Core/Domain/Location/Models/LocationDropdownModel.cs
@@ -1,10 +1,10 @@
 using System;
+
 using Microsoft.AspNetCore.Mvc.Rendering;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Models
+namespace InstructorIQ.Core.Domain.Models;
+
+public class LocationDropdownModel : SelectListItem
 {
-    public class LocationDropdownModel : SelectListItem
-    {
-    }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.Core/Domain/Location/Models/LocationReadModel.cs b/service/src/InstructorIQ.Core/Domain/Location/Models/LocationReadModel.cs
index 4104054e..5ca47ae9 100644
--- a/service/src/InstructorIQ.Core/Domain/Location/Models/LocationReadModel.cs
+++ b/service/src/InstructorIQ.Core/Domain/Location/Models/LocationReadModel.cs
@@ -1,148 +1,148 @@
 using System;
+
 using MediatR.CommandQuery.Definitions;
 using MediatR.CommandQuery.Models;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Models
+namespace InstructorIQ.Core.Domain.Models;
+
+/// <summary>
+/// View Model class
+/// </summary>
+public class LocationReadModel
+    : EntityReadModel<Guid>, IHaveTenant<Guid>, ITrackHistory
 {
+    #region Generated Properties
+    /// <summary>
+    /// Gets or sets the property value for 'Name'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'Name'.
+    /// </value>
+    public string Name { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'Description'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'Description'.
+    /// </value>
+    public string Description { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'AddressLine1'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'AddressLine1'.
+    /// </value>
+    public string AddressLine1 { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'AddressLine2'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'AddressLine2'.
+    /// </value>
+    public string AddressLine2 { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'AddressLine3'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'AddressLine3'.
+    /// </value>
+    public string AddressLine3 { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'City'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'City'.
+    /// </value>
+    public string City { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'StateProvince'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'StateProvince'.
+    /// </value>
+    public string StateProvince { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'PostalCode'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'PostalCode'.
+    /// </value>
+    public string PostalCode { get; set; }
+
     /// <summary>
-    /// View Model class
-    /// </summary>
-    public class LocationReadModel
-        : EntityReadModel<Guid>, IHaveTenant<Guid>, ITrackHistory
-    {
-        #region Generated Properties
-        /// <summary>
-        /// Gets or sets the property value for 'Name'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Name'.
-        /// </value>
-        public string Name { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'Description'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Description'.
-        /// </value>
-        public string Description { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'AddressLine1'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'AddressLine1'.
-        /// </value>
-        public string AddressLine1 { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'AddressLine2'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'AddressLine2'.
-        /// </value>
-        public string AddressLine2 { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'AddressLine3'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'AddressLine3'.
-        /// </value>
-        public string AddressLine3 { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'City'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'City'.
-        /// </value>
-        public string City { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'StateProvince'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'StateProvince'.
-        /// </value>
-        public string StateProvince { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'PostalCode'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'PostalCode'.
-        /// </value>
-        public string PostalCode { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'ContactName'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'ContactName'.
-        /// </value>
-        public string ContactName { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'ContactEmail'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'ContactEmail'.
-        /// </value>
-        public string ContactEmail { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'ContactPhone'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'ContactPhone'.
-        /// </value>
-        public string ContactPhone { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'Latitude'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Latitude'.
-        /// </value>
-        public decimal? Latitude { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'Longitude'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Longitude'.
-        /// </value>
-        public decimal? Longitude { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'TenantId'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'TenantId'.
-        /// </value>
-        public Guid TenantId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'PeriodStart'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'PeriodStart'.
-        /// </value>
-        public DateTime PeriodStart { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'PeriodEnd'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'PeriodEnd'.
-        /// </value>
-        public DateTime PeriodEnd { get; set; }
-
-        #endregion
-
-        public string TenantName { get; set; }
-
-    }
+    /// Gets or sets the property value for 'ContactName'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'ContactName'.
+    /// </value>
+    public string ContactName { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'ContactEmail'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'ContactEmail'.
+    /// </value>
+    public string ContactEmail { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'ContactPhone'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'ContactPhone'.
+    /// </value>
+    public string ContactPhone { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'Latitude'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'Latitude'.
+    /// </value>
+    public decimal? Latitude { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'Longitude'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'Longitude'.
+    /// </value>
+    public decimal? Longitude { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'TenantId'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'TenantId'.
+    /// </value>
+    public Guid TenantId { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'PeriodStart'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'PeriodStart'.
+    /// </value>
+    public DateTime PeriodStart { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'PeriodEnd'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'PeriodEnd'.
+    /// </value>
+    public DateTime PeriodEnd { get; set; }
+
+    #endregion
+
+    public string TenantName { get; set; }
+
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Location/Models/LocationUpdateModel.cs b/service/src/InstructorIQ.Core/Domain/Location/Models/LocationUpdateModel.cs
index cc6b5848..f0afada6 100644
--- a/service/src/InstructorIQ.Core/Domain/Location/Models/LocationUpdateModel.cs
+++ b/service/src/InstructorIQ.Core/Domain/Location/Models/LocationUpdateModel.cs
@@ -1,146 +1,146 @@
 using System;
+
 using MediatR.CommandQuery.Definitions;
 using MediatR.CommandQuery.Models;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Models
+namespace InstructorIQ.Core.Domain.Models;
+
+/// <summary>
+/// View Model class
+/// </summary>
+public class LocationUpdateModel
+    : EntityUpdateModel, IHaveTenant<Guid>
 {
+    #region Generated Properties
+    /// <summary>
+    /// Gets or sets the property value for 'Name'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'Name'.
+    /// </value>
+    public string Name { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'Description'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'Description'.
+    /// </value>
+    public string Description { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'AddressLine1'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'AddressLine1'.
+    /// </value>
+    public string AddressLine1 { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'AddressLine2'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'AddressLine2'.
+    /// </value>
+    public string AddressLine2 { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'AddressLine3'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'AddressLine3'.
+    /// </value>
+    public string AddressLine3 { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'City'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'City'.
+    /// </value>
+    public string City { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'StateProvince'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'StateProvince'.
+    /// </value>
+    public string StateProvince { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'PostalCode'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'PostalCode'.
+    /// </value>
+    public string PostalCode { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'ContactName'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'ContactName'.
+    /// </value>
+    public string ContactName { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'ContactEmail'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'ContactEmail'.
+    /// </value>
+    public string ContactEmail { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'ContactPhone'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'ContactPhone'.
+    /// </value>
+    public string ContactPhone { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'Latitude'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'Latitude'.
+    /// </value>
+    public decimal? Latitude { get; set; }
+
     /// <summary>
-    /// View Model class
-    /// </summary>
-    public class LocationUpdateModel
-        : EntityUpdateModel, IHaveTenant<Guid>
-    {
-        #region Generated Properties
-        /// <summary>
-        /// Gets or sets the property value for 'Name'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Name'.
-        /// </value>
-        public string Name { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'Description'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Description'.
-        /// </value>
-        public string Description { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'AddressLine1'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'AddressLine1'.
-        /// </value>
-        public string AddressLine1 { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'AddressLine2'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'AddressLine2'.
-        /// </value>
-        public string AddressLine2 { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'AddressLine3'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'AddressLine3'.
-        /// </value>
-        public string AddressLine3 { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'City'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'City'.
-        /// </value>
-        public string City { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'StateProvince'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'StateProvince'.
-        /// </value>
-        public string StateProvince { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'PostalCode'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'PostalCode'.
-        /// </value>
-        public string PostalCode { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'ContactName'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'ContactName'.
-        /// </value>
-        public string ContactName { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'ContactEmail'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'ContactEmail'.
-        /// </value>
-        public string ContactEmail { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'ContactPhone'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'ContactPhone'.
-        /// </value>
-        public string ContactPhone { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'Latitude'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Latitude'.
-        /// </value>
-        public decimal? Latitude { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'Longitude'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Longitude'.
-        /// </value>
-        public decimal? Longitude { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'TenantId'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'TenantId'.
-        /// </value>
-        public Guid TenantId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'PeriodStart'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'PeriodStart'.
-        /// </value>
-        public DateTime PeriodStart { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'PeriodEnd'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'PeriodEnd'.
-        /// </value>
-        public DateTime PeriodEnd { get; set; }
-
-        #endregion
-
-    }
+    /// Gets or sets the property value for 'Longitude'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'Longitude'.
+    /// </value>
+    public decimal? Longitude { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'TenantId'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'TenantId'.
+    /// </value>
+    public Guid TenantId { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'PeriodStart'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'PeriodStart'.
+    /// </value>
+    public DateTime PeriodStart { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'PeriodEnd'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'PeriodEnd'.
+    /// </value>
+    public DateTime PeriodEnd { get; set; }
+
+    #endregion
+
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Location/Queries/LocationDropdownQuery.cs b/service/src/InstructorIQ.Core/Domain/Location/Queries/LocationDropdownQuery.cs
index e4ece86c..ccda335a 100644
--- a/service/src/InstructorIQ.Core/Domain/Location/Queries/LocationDropdownQuery.cs
+++ b/service/src/InstructorIQ.Core/Domain/Location/Queries/LocationDropdownQuery.cs
@@ -1,15 +1,16 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Security.Principal;
-using MediatR.CommandQuery.Queries;
+
 using InstructorIQ.Core.Domain.Models;
 
+using MediatR.CommandQuery.Queries;
+
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Queries
+namespace InstructorIQ.Core.Domain.Queries;
+
+public class LocationDropdownQuery : PrincipalQueryBase<IReadOnlyCollection<LocationDropdownModel>>
 {
-    public class LocationDropdownQuery : PrincipalQueryBase<IReadOnlyCollection<LocationDropdownModel>>
+    public LocationDropdownQuery(IPrincipal principal) : base(principal)
     {
-        public LocationDropdownQuery(IPrincipal principal) : base(principal)
-        {
-        }
     }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Location/Validation/LocationCreateModelValidator.cs b/service/src/InstructorIQ.Core/Domain/Location/Validation/LocationCreateModelValidator.cs
index ddb16c79..cab25304 100644
--- a/service/src/InstructorIQ.Core/Domain/Location/Validation/LocationCreateModelValidator.cs
+++ b/service/src/InstructorIQ.Core/Domain/Location/Validation/LocationCreateModelValidator.cs
@@ -1,35 +1,36 @@
 using System;
+
 using FluentValidation;
+
 using InstructorIQ.Core.Domain.Models;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Validation
+namespace InstructorIQ.Core.Domain.Validation;
+
+/// <summary>
+/// Validator class for <see cref="LocationCreateModel"/> .
+/// </summary>
+public class LocationCreateModelValidator
+    : AbstractValidator<LocationCreateModel>
 {
     /// <summary>
-    /// Validator class for <see cref="LocationCreateModel"/> .
+    /// Initializes a new instance of the <see cref="LocationCreateModelValidator"/> class.
     /// </summary>
-    public class LocationCreateModelValidator
-        : AbstractValidator<LocationCreateModel>
+    public LocationCreateModelValidator()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="LocationCreateModelValidator"/> class.
-        /// </summary>
-        public LocationCreateModelValidator()
-        {
-            #region Generated Constructor
-            RuleFor(p => p.Name).NotEmpty();
-            RuleFor(p => p.Name).MaximumLength(256);
-            RuleFor(p => p.AddressLine1).MaximumLength(256);
-            RuleFor(p => p.AddressLine2).MaximumLength(256);
-            RuleFor(p => p.AddressLine3).MaximumLength(256);
-            RuleFor(p => p.City).MaximumLength(150);
-            RuleFor(p => p.StateProvince).MaximumLength(150);
-            RuleFor(p => p.PostalCode).MaximumLength(50);
-            RuleFor(p => p.ContactName).MaximumLength(256);
-            RuleFor(p => p.ContactEmail).MaximumLength(256);
-            RuleFor(p => p.ContactPhone).MaximumLength(50);
-            #endregion
-        }
-
+        #region Generated Constructor
+        RuleFor(p => p.Name).NotEmpty();
+        RuleFor(p => p.Name).MaximumLength(256);
+        RuleFor(p => p.AddressLine1).MaximumLength(256);
+        RuleFor(p => p.AddressLine2).MaximumLength(256);
+        RuleFor(p => p.AddressLine3).MaximumLength(256);
+        RuleFor(p => p.City).MaximumLength(150);
+        RuleFor(p => p.StateProvince).MaximumLength(150);
+        RuleFor(p => p.PostalCode).MaximumLength(50);
+        RuleFor(p => p.ContactName).MaximumLength(256);
+        RuleFor(p => p.ContactEmail).MaximumLength(256);
+        RuleFor(p => p.ContactPhone).MaximumLength(50);
+        #endregion
     }
+
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Location/Validation/LocationUpdateModelValidator.cs b/service/src/InstructorIQ.Core/Domain/Location/Validation/LocationUpdateModelValidator.cs
index 100514e8..8055974f 100644
--- a/service/src/InstructorIQ.Core/Domain/Location/Validation/LocationUpdateModelValidator.cs
+++ b/service/src/InstructorIQ.Core/Domain/Location/Validation/LocationUpdateModelValidator.cs
@@ -1,35 +1,36 @@
 using System;
+
 using FluentValidation;
+
 using InstructorIQ.Core.Domain.Models;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Validation
+namespace InstructorIQ.Core.Domain.Validation;
+
+/// <summary>
+/// Validator class for <see cref="LocationUpdateModel"/> .
+/// </summary>
+public class LocationUpdateModelValidator
+    : AbstractValidator<LocationUpdateModel>
 {
     /// <summary>
-    /// Validator class for <see cref="LocationUpdateModel"/> .
+    /// Initializes a new instance of the <see cref="LocationUpdateModelValidator"/> class.
     /// </summary>
-    public class LocationUpdateModelValidator
-        : AbstractValidator<LocationUpdateModel>
+    public LocationUpdateModelValidator()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="LocationUpdateModelValidator"/> class.
-        /// </summary>
-        public LocationUpdateModelValidator()
-        {
-            #region Generated Constructor
-            RuleFor(p => p.Name).NotEmpty();
-            RuleFor(p => p.Name).MaximumLength(256);
-            RuleFor(p => p.AddressLine1).MaximumLength(256);
-            RuleFor(p => p.AddressLine2).MaximumLength(256);
-            RuleFor(p => p.AddressLine3).MaximumLength(256);
-            RuleFor(p => p.City).MaximumLength(150);
-            RuleFor(p => p.StateProvince).MaximumLength(150);
-            RuleFor(p => p.PostalCode).MaximumLength(50);
-            RuleFor(p => p.ContactName).MaximumLength(256);
-            RuleFor(p => p.ContactEmail).MaximumLength(256);
-            RuleFor(p => p.ContactPhone).MaximumLength(50);
-            #endregion
-        }
-
+        #region Generated Constructor
+        RuleFor(p => p.Name).NotEmpty();
+        RuleFor(p => p.Name).MaximumLength(256);
+        RuleFor(p => p.AddressLine1).MaximumLength(256);
+        RuleFor(p => p.AddressLine2).MaximumLength(256);
+        RuleFor(p => p.AddressLine3).MaximumLength(256);
+        RuleFor(p => p.City).MaximumLength(150);
+        RuleFor(p => p.StateProvince).MaximumLength(150);
+        RuleFor(p => p.PostalCode).MaximumLength(50);
+        RuleFor(p => p.ContactName).MaximumLength(256);
+        RuleFor(p => p.ContactEmail).MaximumLength(256);
+        RuleFor(p => p.ContactPhone).MaximumLength(50);
+        #endregion
     }
+
 }
diff --git a/service/src/InstructorIQ.Core/Domain/LogEvent/Handlers/LogEventQueryHandler.cs b/service/src/InstructorIQ.Core/Domain/LogEvent/Handlers/LogEventQueryHandler.cs
index b7d7ea69..22d9caba 100644
--- a/service/src/InstructorIQ.Core/Domain/LogEvent/Handlers/LogEventQueryHandler.cs
+++ b/service/src/InstructorIQ.Core/Domain/LogEvent/Handlers/LogEventQueryHandler.cs
@@ -1,81 +1,55 @@
-using System;
+using System;
 using System.Linq;
-using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
-using FluentCommand;
-using FluentCommand.Extensions;
+
+using Azure.Data.Tables;
+
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Domain.Queries;
+using InstructorIQ.Core.Extensions;
+
 using MediatR.CommandQuery.Handlers;
-using MediatR.CommandQuery.Queries;
+
 using Microsoft.Extensions.Logging;
 
-namespace InstructorIQ.Core.Domain.Handlers
+namespace InstructorIQ.Core.Domain.Handlers;
+
+public class LogEventQueryHandler : RequestHandlerBase<LogEventQuery, LogPagedResult>
 {
-    public class LogEventQueryHandler : RequestHandlerBase<LogEventQuery, EntityPagedResult<LogEventModel>>
+    private readonly TableServiceClient _tableServiceClient;
+
+    public LogEventQueryHandler(ILoggerFactory loggerFactory, TableServiceClient tableServiceClient) : base(loggerFactory)
     {
-        private readonly IDataSession _dataSession;
+        _tableServiceClient = tableServiceClient;
+    }
 
-        public LogEventQueryHandler(ILoggerFactory loggerFactory, IDataSession dataSession) : base(loggerFactory)
-        {
-            _dataSession = dataSession;
-        }
+    protected override async Task<LogPagedResult> Process(LogEventQuery request, CancellationToken cancellationToken)
+    {
+        int pageSize = request.PageSize == 0 ? 100 : request.PageSize;
 
-        protected override async Task<EntityPagedResult<LogEventModel>> Process(LogEventQuery request, CancellationToken cancellationToken)
-        {
-            int page = request.Page == 0 ? 1 : request.Page;
-            int pageSize = request.PageSize == 0 ? 100 : request.PageSize;
-            int offset = Math.Max(pageSize * (page - 1), 0);
-
-            long total = 0;
-
-            var rows = await _dataSession
-                .StoredProcedure("[Log].[SearchLogs]")
-                .Parameter("@Date", request.Date)
-                .Parameter("@Level", request.Level)
-                .Parameter("@Search", request.Search)
-                .Parameter("@Offset", offset)
-                .Parameter("@Size", pageSize)
-                .ParameterOut("@Total", (Action<long>)(v => total = v))
-                .QueryAsync(r =>
-                {
-                    return new LogEventModel
-                    {
-                        TimeStamp = r.GetDateTime("TimeStamp"),
-                        Level = r.GetString("Level"),
-                        Message = r.GetString("Message"),
-                        Exception = r.GetString("Exception"),
-                        Properties = GetJson(r, "LogEvent")
-                    };
-                });
-
-            return new EntityPagedResult<LogEventModel>
-            {
-                Total = total,
-                Data = rows.ToList()
-            };
-
-        }
-
-        private JsonElement GetJson(System.Data.IDataReader reader, string name)
+        var logTable = _tableServiceClient.GetTableClient("LogEvent");
+
+        var dateTime = request.Date.Date.ToUniversalTime();
+        var upper = $"{DateTime.MaxValue.Ticks - dateTime.Ticks:D19}";
+        var lower = $"{DateTime.MaxValue.Ticks - dateTime.AddDays(1).Ticks:D19}";
+
+        var filter = $"(PartitionKey ge '{lower}') and (PartitionKey lt '{upper}')";
+
+        if (request.Level.HasValue())
+            filter += $" and (Level eq '{request.Level}')";
+
+        var resultPageable = logTable.QueryAsync<LogEventModel>(filter, cancellationToken: cancellationToken);
+
+        var resultPage = await resultPageable
+            .AsPages(continuationToken: request.ContinuationToken, pageSizeHint: pageSize)
+            .FirstOrDefault();
+
+        return new LogPagedResult
         {
-            var json = reader.GetString(name);
-            if (json.IsNullOrWhiteSpace())
-                return default;
-
-            try
-            {
-                JsonDocument jsonDocument = JsonDocument.Parse(json);
-                jsonDocument.RootElement.TryGetProperty("Properties", out JsonElement jsonElement);
-
-                return jsonElement;
-            }
-            catch (Exception ex)
-            {
-                Logger.LogError(ex, "Error parsing JSON: {message}", ex.Message);
-                return default;
-            }
-        }
+            ContinuationToken = resultPage.ContinuationToken,
+            Data = resultPage.Values.ToList()
+        };
+
     }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/LogEvent/LogEventServiceRegistration.cs b/service/src/InstructorIQ.Core/Domain/LogEvent/LogEventServiceRegistration.cs
index dfa54099..38f21cb5 100644
--- a/service/src/InstructorIQ.Core/Domain/LogEvent/LogEventServiceRegistration.cs
+++ b/service/src/InstructorIQ.Core/Domain/LogEvent/LogEventServiceRegistration.cs
@@ -1,24 +1,20 @@
-using Injectio.Attributes;
-
 using InstructorIQ.Core.Domain.Handlers;
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Domain.Queries;
 
 using MediatR;
-using MediatR.CommandQuery.Queries;
 
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 
-namespace InstructorIQ.Core.Domain
+namespace InstructorIQ.Core.Domain;
+
+public class LogEventServiceRegistration : DomainServiceRegistrationBase
 {
-    public class LogEventServiceRegistration : DomainServiceRegistrationBase
-    {
 
-        [RegisterServices]
-        public override void Register(IServiceCollection services)
-        {
-            services.TryAddTransient<IRequestHandler<LogEventQuery, EntityPagedResult<LogEventModel>>, LogEventQueryHandler>();
-        }
+    [RegisterServices]
+    public override void Register(IServiceCollection services)
+    {
+        services.TryAddTransient<IRequestHandler<LogEventQuery, LogPagedResult>, LogEventQueryHandler>();
     }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/LogEvent/Models/LogEventModel.cs b/service/src/InstructorIQ.Core/Domain/LogEvent/Models/LogEventModel.cs
index 7feec198..8ce3c7a8 100644
--- a/service/src/InstructorIQ.Core/Domain/LogEvent/Models/LogEventModel.cs
+++ b/service/src/InstructorIQ.Core/Domain/LogEvent/Models/LogEventModel.cs
@@ -1,18 +1,27 @@
-using System;
-using System.Text.Json;
+using System;
 
-namespace InstructorIQ.Core.Domain.Models
+using Azure;
+using Azure.Data.Tables;
+
+namespace InstructorIQ.Core.Domain.Models;
+
+public class LogEventModel : ITableEntity
 {
-    public class LogEventModel
-    {
-        public DateTime TimeStamp { get; set; }
+    public string PartitionKey { get; set; }
+
+    public string RowKey { get; set; }
+
+    public DateTimeOffset? Timestamp { get; set; }
+
+    public ETag ETag { get; set; }
+
+    public string Level { get; set; }
 
-        public string Level { get; set; }
+    public string MessageTemplate { get; set; }
 
-        public string Message { get; set; }
+    public string RenderedMessage { get; set; }
 
-        public string Exception { get; set; }
+    public string Exception { get; set; }
 
-        public JsonElement Properties { get; set; }
-    }
+    public string Data { get; set; }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/LogEvent/Models/LogPagedResult.cs b/service/src/InstructorIQ.Core/Domain/LogEvent/Models/LogPagedResult.cs
new file mode 100644
index 00000000..216a4245
--- /dev/null
+++ b/service/src/InstructorIQ.Core/Domain/LogEvent/Models/LogPagedResult.cs
@@ -0,0 +1,10 @@
+using System.Collections.Generic;
+
+namespace InstructorIQ.Core.Domain.Models;
+
+public class LogPagedResult
+{
+    public string ContinuationToken { get; set; }
+
+    public IReadOnlyCollection<LogEventModel> Data { get; set; }
+}
diff --git a/service/src/InstructorIQ.Core/Domain/LogEvent/Queries/LogEventQuery.cs b/service/src/InstructorIQ.Core/Domain/LogEvent/Queries/LogEventQuery.cs
index 34e5cc6c..95b4c748 100644
--- a/service/src/InstructorIQ.Core/Domain/LogEvent/Queries/LogEventQuery.cs
+++ b/service/src/InstructorIQ.Core/Domain/LogEvent/Queries/LogEventQuery.cs
@@ -1,25 +1,24 @@
-using System;
+using System;
 using System.Security.Principal;
+
 using InstructorIQ.Core.Domain.Models;
+
 using MediatR.CommandQuery.Queries;
 
-namespace InstructorIQ.Core.Domain.Queries
+namespace InstructorIQ.Core.Domain.Queries;
+
+public class LogEventQuery : PrincipalQueryBase<LogPagedResult>
 {
-    public class LogEventQuery : PrincipalQueryBase<EntityPagedResult<LogEventModel>>
+    public LogEventQuery(IPrincipal principal) : base(principal)
     {
-        public LogEventQuery(IPrincipal principal) : base(principal)
-        {
 
-        }
-
-        public DateTime Date { get; set; } = DateTime.Today;
+    }
 
-        public string Level { get; set; }
+    public string ContinuationToken { get; set; }
 
-        public string Search { get; set; }
+    public DateTime Date { get; set; } = DateTime.Today;
 
-        public int Page { get; set; } = 1;
+    public string Level { get; set; }
 
-        public int PageSize { get; set; } = 100;
-    }
+    public int PageSize { get; set; } = 100;
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Member/Commands/MemberAssignRoleCommand.cs b/service/src/InstructorIQ.Core/Domain/Member/Commands/MemberAssignRoleCommand.cs
index e2839479..866f4385 100644
--- a/service/src/InstructorIQ.Core/Domain/Member/Commands/MemberAssignRoleCommand.cs
+++ b/service/src/InstructorIQ.Core/Domain/Member/Commands/MemberAssignRoleCommand.cs
@@ -1,27 +1,27 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Security.Principal;
+
 using MediatR.CommandQuery.Commands;
 using MediatR.CommandQuery.Models;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Commands
+namespace InstructorIQ.Core.Domain.Commands;
+
+public class MemberAssignRoleCommand : PrincipalCommandBase<CompleteModel>
 {
-    public class MemberAssignRoleCommand : PrincipalCommandBase<CompleteModel>
+    public MemberAssignRoleCommand(IPrincipal principal, Guid tenantId, IEnumerable<string> users, IEnumerable<string> roles)
+        : base(principal)
     {
-        public MemberAssignRoleCommand(IPrincipal principal, Guid tenantId, IEnumerable<string> users, IEnumerable<string> roles) 
-            : base(principal)
-        {
-            TenantId = tenantId;
-            Users = users.ToList();
-            Roles = roles.ToList();
-        }
+        TenantId = tenantId;
+        Users = users.ToList();
+        Roles = roles.ToList();
+    }
 
-        public Guid TenantId { get; }
+    public Guid TenantId { get; }
 
-        public List<string> Users { get; }
+    public List<string> Users { get; }
 
-        public List<string> Roles { get; }
-    }
-}
\ No newline at end of file
+    public List<string> Roles { get; }
+}
diff --git a/service/src/InstructorIQ.Core/Domain/Member/Commands/MemberChangeTenantCommand.cs b/service/src/InstructorIQ.Core/Domain/Member/Commands/MemberChangeTenantCommand.cs
index 6ca70e29..0fda5067 100644
--- a/service/src/InstructorIQ.Core/Domain/Member/Commands/MemberChangeTenantCommand.cs
+++ b/service/src/InstructorIQ.Core/Domain/Member/Commands/MemberChangeTenantCommand.cs
@@ -1,17 +1,18 @@
-using System;
+using System;
 using System.Security.Principal;
+
 using InstructorIQ.Core.Domain.Models;
+
 using MediatR.CommandQuery.Commands;
 
-namespace InstructorIQ.Core.Domain.Commands
+namespace InstructorIQ.Core.Domain.Commands;
+
+public class MemberChangeTenantCommand : PrincipalCommandBase<MemberReadModel>
 {
-    public class MemberChangeTenantCommand : PrincipalCommandBase<MemberReadModel>
+    public MemberChangeTenantCommand(IPrincipal principal, Guid tenantId) : base(principal)
     {
-        public MemberChangeTenantCommand(IPrincipal principal, Guid tenantId) : base(principal)
-        {
-            TenantId = tenantId;
-        }
-
-        public Guid TenantId { get; set; }
+        TenantId = tenantId;
     }
+
+    public Guid TenantId { get; set; }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Member/Commands/MemberImportProcessCommand.cs b/service/src/InstructorIQ.Core/Domain/Member/Commands/MemberImportProcessCommand.cs
index 10721623..5ec89f43 100644
--- a/service/src/InstructorIQ.Core/Domain/Member/Commands/MemberImportProcessCommand.cs
+++ b/service/src/InstructorIQ.Core/Domain/Member/Commands/MemberImportProcessCommand.cs
@@ -1,18 +1,19 @@
-using System;
+using System;
 using System.Security.Principal;
+
 using InstructorIQ.Core.Domain.Models;
+
 using MediatR.CommandQuery.Commands;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Commands
+namespace InstructorIQ.Core.Domain.Commands;
+
+public class MemberImportProcessCommand : PrincipalCommandBase<MemberImportJobModel>
 {
-    public class MemberImportProcessCommand : PrincipalCommandBase<MemberImportJobModel>
+    public MemberImportProcessCommand(IPrincipal principal, MemberImportJobModel import) : base(principal)
     {
-        public MemberImportProcessCommand(IPrincipal principal, MemberImportJobModel import) : base(principal)
-        {
-            Import = import;
-        }
-
-        public MemberImportJobModel Import { get; }
+        Import = import;
     }
-}
\ No newline at end of file
+
+    public MemberImportJobModel Import { get; }
+}
diff --git a/service/src/InstructorIQ.Core/Domain/Member/Commands/MemberImportUploadCommand.cs b/service/src/InstructorIQ.Core/Domain/Member/Commands/MemberImportUploadCommand.cs
index 043d3410..cb061b52 100644
--- a/service/src/InstructorIQ.Core/Domain/Member/Commands/MemberImportUploadCommand.cs
+++ b/service/src/InstructorIQ.Core/Domain/Member/Commands/MemberImportUploadCommand.cs
@@ -1,23 +1,25 @@
-using System;
+using System;
 using System.Security.Principal;
+
 using InstructorIQ.Core.Domain.Models;
+
 using MediatR.CommandQuery.Commands;
+
 using Microsoft.AspNetCore.Http;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Commands
+namespace InstructorIQ.Core.Domain.Commands;
+
+public class MemberImportUploadCommand : PrincipalCommandBase<MemberImportJobModel>
 {
-    public class MemberImportUploadCommand : PrincipalCommandBase<MemberImportJobModel>
-    {
 
-        public MemberImportUploadCommand(IPrincipal principal, IFormFile upload, Guid tenantId) : base(principal)
-        {
-            Upload = upload;
-            TenantId = tenantId;
-        }
+    public MemberImportUploadCommand(IPrincipal principal, IFormFile upload, Guid tenantId) : base(principal)
+    {
+        Upload = upload;
+        TenantId = tenantId;
+    }
 
-        public IFormFile Upload { get; }
+    public IFormFile Upload { get; }
 
-        public Guid TenantId { get; }
-    }
+    public Guid TenantId { get; }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Member/Handlers/MemberAssignRoleCommandHandler.cs b/service/src/InstructorIQ.Core/Domain/Member/Handlers/MemberAssignRoleCommandHandler.cs
index 93062274..ecaca9c5 100644
--- a/service/src/InstructorIQ.Core/Domain/Member/Handlers/MemberAssignRoleCommandHandler.cs
+++ b/service/src/InstructorIQ.Core/Domain/Member/Handlers/MemberAssignRoleCommandHandler.cs
@@ -1,61 +1,64 @@
-using System.Linq;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+
 using FluentCommand;
 using FluentCommand.Merge;
+
 using InstructorIQ.Core.Domain.Commands;
 using InstructorIQ.Core.Domain.Models;
+
 using MediatR.CommandQuery.Handlers;
 using MediatR.CommandQuery.Models;
+
 using Microsoft.Extensions.Logging;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Handlers
+namespace InstructorIQ.Core.Domain.Handlers;
+
+public class MemberAssignRoleCommandHandler
+    : RequestHandlerBase<MemberAssignRoleCommand, CompleteModel>
 {
-    public class MemberAssignRoleCommandHandler
-        : RequestHandlerBase<MemberAssignRoleCommand, CompleteModel>
+    private readonly IDataSession _dataSession;
+
+    public MemberAssignRoleCommandHandler(ILoggerFactory loggerFactory, IDataSession dataSession)
+        : base(loggerFactory)
     {
-        private readonly IDataSession _dataSession;
+        _dataSession = dataSession;
+    }
 
-        public MemberAssignRoleCommandHandler(ILoggerFactory loggerFactory, IDataSession dataSession)
-            : base(loggerFactory)
+    protected override async Task<CompleteModel> Process(MemberAssignRoleCommand request, CancellationToken cancellationToken)
+    {
+        if (request.Users.Count == 0 || request.Roles.Count == 0)
         {
-            _dataSession = dataSession;
+            Logger.LogWarning("No users or roles to process");
+            return new CompleteModel();
         }
 
-        protected override async Task<CompleteModel> Process(MemberAssignRoleCommand request, CancellationToken cancellationToken)
-        {
-            if (request.Users.Count == 0 || request.Roles.Count == 0)
+        var assignments = from user in request.Users
+                          from role in request.Roles
+                          select new MemberAssignRoleModel
+                          {
+                              TenantId = request.TenantId,
+                              UserName = user,
+                              RoleName = role
+                          };
+
+        int rows = await _dataSession
+            .MergeData("[IQ].[TenantUserRole]")
+            .IncludeInsert()
+            .IncludeUpdate(false)
+            .Mode(DataMergeMode.SqlStatement)
+            .Map<MemberAssignRoleModel>(m =>
             {
-                Logger.LogWarning("No users or roles to process");
-                return new CompleteModel();
-            }
-
-            var assignments = from user in request.Users
-                              from role in request.Roles
-                              select new MemberAssignRoleModel
-                              {
-                                  TenantId = request.TenantId,
-                                  UserName = user,
-                                  RoleName = role
-                              };
-
-            int rows = await _dataSession
-                .MergeData("[IQ].[TenantUserRole]")
-                .IncludeInsert()
-                .IncludeUpdate(false)
-                .Mode(DataMergeMode.SqlStatement)
-                .Map<MemberAssignRoleModel>(m =>
-                {
-                    m.Column(p => p.TenantId).Key();
-                    m.Column(p => p.UserName).Key();
-                    m.Column(p => p.RoleName).Key();
-                })
-                .ExecuteAsync(assignments, cancellationToken);
-
-            Logger.LogInformation("Processed {rows} user role assignments", rows);
+                m.Column(p => p.TenantId).Key();
+                m.Column(p => p.UserName).Key();
+                m.Column(p => p.RoleName).Key();
+            })
+            .ExecuteAsync(assignments, cancellationToken);
 
-            return new CompleteModel();
-        }
+        Logger.LogInformation("Processed {rows} user role assignments", rows);
+
+        return new CompleteModel();
     }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.Core/Domain/Member/Handlers/MemberChangeTenantCommandHandler.cs b/service/src/InstructorIQ.Core/Domain/Member/Handlers/MemberChangeTenantCommandHandler.cs
index c094970b..a8db172f 100644
--- a/service/src/InstructorIQ.Core/Domain/Member/Handlers/MemberChangeTenantCommandHandler.cs
+++ b/service/src/InstructorIQ.Core/Domain/Member/Handlers/MemberChangeTenantCommandHandler.cs
@@ -1,39 +1,42 @@
-using System.Threading;
+using System.Threading;
 using System.Threading.Tasks;
+
 using AutoMapper;
+
 using InstructorIQ.Core.Data;
 using InstructorIQ.Core.Domain.Commands;
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Security;
+
 using MediatR.CommandQuery.EntityFrameworkCore.Handlers;
+
 using Microsoft.Extensions.Logging;
 
-namespace InstructorIQ.Core.Domain.Handlers
+namespace InstructorIQ.Core.Domain.Handlers;
+
+public class MemberChangeTenantCommandHandler : DataContextHandlerBase<InstructorIQContext, MemberChangeTenantCommand, MemberReadModel>
 {
-    public class MemberChangeTenantCommandHandler : DataContextHandlerBase<InstructorIQContext, MemberChangeTenantCommand, MemberReadModel>
-    {
-        private readonly UserClaimManager _claimManager;
+    private readonly UserClaimManager _claimManager;
 
-        public MemberChangeTenantCommandHandler(ILoggerFactory loggerFactory, InstructorIQContext dataContext, IMapper mapper, UserClaimManager claimManager) : base(loggerFactory, dataContext, mapper)
-        {
-            _claimManager = claimManager;
-        }
+    public MemberChangeTenantCommandHandler(ILoggerFactory loggerFactory, InstructorIQContext dataContext, IMapper mapper, UserClaimManager claimManager) : base(loggerFactory, dataContext, mapper)
+    {
+        _claimManager = claimManager;
+    }
 
-        protected override async Task<MemberReadModel> Process(MemberChangeTenantCommand request, CancellationToken cancellationToken)
-        {
-            var userId = _claimManager.GetUserId(request.Principal);
+    protected override async Task<MemberReadModel> Process(MemberChangeTenantCommand request, CancellationToken cancellationToken)
+    {
+        var userId = _claimManager.GetUserId(request.Principal);
 
-            // get user
-            var user = await DataContext.Users
-                .FindAsync(new object[] { userId }, cancellationToken);
+        // get user
+        var user = await DataContext.Users
+            .FindAsync(new object[] { userId }, cancellationToken);
 
-            user.LastTenantId = request.TenantId;
+        user.LastTenantId = request.TenantId;
 
-            await DataContext.SaveChangesAsync(cancellationToken);
+        await DataContext.SaveChangesAsync(cancellationToken);
 
-            var result = Mapper.Map<MemberReadModel>(user);
+        var result = Mapper.Map<MemberReadModel>(user);
 
-            return result;
-        }
+        return result;
     }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Member/Handlers/MemberDropdownQueryHandler.cs b/service/src/InstructorIQ.Core/Domain/Member/Handlers/MemberDropdownQueryHandler.cs
index 922e1182..8e078051 100644
--- a/service/src/InstructorIQ.Core/Domain/Member/Handlers/MemberDropdownQueryHandler.cs
+++ b/service/src/InstructorIQ.Core/Domain/Member/Handlers/MemberDropdownQueryHandler.cs
@@ -1,39 +1,41 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+
 using AutoMapper;
 using AutoMapper.QueryableExtensions;
+
 using InstructorIQ.Core.Data;
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Domain.Queries;
+
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Handlers
+namespace InstructorIQ.Core.Domain.Handlers;
+
+public class MemberDropdownQueryHandler
+    : MemberQueryHandlerBase<MemberDropdownQuery, IReadOnlyCollection<MemberDropdownModel>>
 {
-    public class MemberDropdownQueryHandler
-        : MemberQueryHandlerBase<MemberDropdownQuery, IReadOnlyCollection<MemberDropdownModel>>
+    public MemberDropdownQueryHandler(ILoggerFactory loggerFactory, InstructorIQContext dataContext, IMapper mapper)
+        : base(loggerFactory, dataContext, mapper)
     {
-        public MemberDropdownQueryHandler(ILoggerFactory loggerFactory, InstructorIQContext dataContext, IMapper mapper)
-            : base(loggerFactory, dataContext, mapper)
-        {
-        }
-
-        protected override async Task<IReadOnlyCollection<MemberDropdownModel>> Process(MemberDropdownQuery request, CancellationToken cancellationToken)
-        {
-            // users that are members for tenant
-            var query = UserQuery(request.TenantId, request.RoleId);
-
-            var result = await query
-                .AsNoTracking()
-                .OrderBy(p => p.SortName)
-                .ProjectTo<MemberDropdownModel>(Mapper.ConfigurationProvider)
-                .ToListAsync(cancellationToken)
-                .ConfigureAwait(false);
-
-            return result;
-        }
     }
-}
\ No newline at end of file
+
+    protected override async Task<IReadOnlyCollection<MemberDropdownModel>> Process(MemberDropdownQuery request, CancellationToken cancellationToken)
+    {
+        // users that are members for tenant
+        var query = UserQuery(request.TenantId, request.RoleId);
+
+        var result = await query
+            .AsNoTracking()
+            .OrderBy(p => p.SortName)
+            .ProjectTo<MemberDropdownModel>(Mapper.ConfigurationProvider)
+            .ToListAsync(cancellationToken)
+            .ConfigureAwait(false);
+
+        return result;
+    }
+}
diff --git a/service/src/InstructorIQ.Core/Domain/Member/Handlers/MemberImportJobQueryHandler.cs b/service/src/InstructorIQ.Core/Domain/Member/Handlers/MemberImportJobQueryHandler.cs
index aeda7244..c73bf06f 100644
--- a/service/src/InstructorIQ.Core/Domain/Member/Handlers/MemberImportJobQueryHandler.cs
+++ b/service/src/InstructorIQ.Core/Domain/Member/Handlers/MemberImportJobQueryHandler.cs
@@ -1,32 +1,36 @@
-using System.Threading;
+using System.Threading;
 using System.Threading.Tasks;
+
 using AutoMapper;
+
 using InstructorIQ.Core.Data;
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Domain.Queries;
+
 using MediatR.CommandQuery.EntityFrameworkCore.Handlers;
+
 using Microsoft.Extensions.Logging;
+
 using Newtonsoft.Json;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Handlers
+namespace InstructorIQ.Core.Domain.Handlers;
+
+public class MemberImportJobQueryHandler : DataContextHandlerBase<InstructorIQContext, MemberImportJobQuery, MemberImportJobModel>
 {
-    public class MemberImportJobQueryHandler : DataContextHandlerBase<InstructorIQContext, MemberImportJobQuery, MemberImportJobModel>
+    public MemberImportJobQueryHandler(ILoggerFactory loggerFactory, InstructorIQContext dataContext, IMapper mapper)
+        : base(loggerFactory, dataContext, mapper)
     {
-        public MemberImportJobQueryHandler(ILoggerFactory loggerFactory, InstructorIQContext dataContext, IMapper mapper)
-            : base(loggerFactory, dataContext, mapper)
-        {
-        }
+    }
 
-        protected override async Task<MemberImportJobModel> Process(MemberImportJobQuery request, CancellationToken cancellationToken)
-        {
-            var importJob = await DataContext.ImportJobs.FindAsync(request.Id);
-            if (importJob == null)
-                return null;
+    protected override async Task<MemberImportJobModel> Process(MemberImportJobQuery request, CancellationToken cancellationToken)
+    {
+        var importJob = await DataContext.ImportJobs.FindAsync(request.Id);
+        if (importJob == null)
+            return null;
 
-            var importModel = JsonConvert.DeserializeObject<MemberImportJobModel>(importJob.MappingJson);
+        var importModel = JsonConvert.DeserializeObject<MemberImportJobModel>(importJob.MappingJson);
 
-            return importModel;
-        }
+        return importModel;
     }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.Core/Domain/Member/Handlers/MemberImportProcessCommandHandler.cs b/service/src/InstructorIQ.Core/Domain/Member/Handlers/MemberImportProcessCommandHandler.cs
index 9b81d7cb..068218a7 100644
--- a/service/src/InstructorIQ.Core/Domain/Member/Handlers/MemberImportProcessCommandHandler.cs
+++ b/service/src/InstructorIQ.Core/Domain/Member/Handlers/MemberImportProcessCommandHandler.cs
@@ -16,37 +16,36 @@
 using Newtonsoft.Json;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Handlers
+namespace InstructorIQ.Core.Domain.Handlers;
+
+public class MemberImportProcessCommandHandler : DataContextHandlerBase<InstructorIQContext, MemberImportProcessCommand, MemberImportJobModel>
 {
-    public class MemberImportProcessCommandHandler : DataContextHandlerBase<InstructorIQContext, MemberImportProcessCommand, MemberImportJobModel>
-    {
-        private readonly IImportProcessService _importProcessService;
+    private readonly IImportProcessService _importProcessService;
 
-        public MemberImportProcessCommandHandler(ILoggerFactory loggerFactory, InstructorIQContext dataContext, IMapper mapper, IImportProcessService importProcessService)
-            : base(loggerFactory, dataContext, mapper)
-        {
-            _importProcessService = importProcessService;
-        }
+    public MemberImportProcessCommandHandler(ILoggerFactory loggerFactory, InstructorIQContext dataContext, IMapper mapper, IImportProcessService importProcessService)
+        : base(loggerFactory, dataContext, mapper)
+    {
+        _importProcessService = importProcessService;
+    }
 
-        protected override async Task<MemberImportJobModel> Process(MemberImportProcessCommand request, CancellationToken cancellationToken)
-        {
-            var id = request.Import.Id;
-            var importJob = await DataContext.ImportJobs.FindAsync(id);
-            if (importJob == null)
-                return null;
+    protected override async Task<MemberImportJobModel> Process(MemberImportProcessCommand request, CancellationToken cancellationToken)
+    {
+        var id = request.Import.Id;
+        var importJob = await DataContext.ImportJobs.FindAsync(id);
+        if (importJob == null)
+            return null;
 
-            var mappingJson = JsonConvert.SerializeObject(request.Import);
-            var identityName = request.Principal?.Identity?.Name;
+        var mappingJson = JsonConvert.SerializeObject(request.Import);
+        var identityName = request.Principal?.Identity?.Name;
 
-            importJob.Updated = DateTimeOffset.UtcNow;
-            importJob.UpdatedBy = identityName;
-            importJob.MappingJson = mappingJson;
+        importJob.Updated = DateTimeOffset.UtcNow;
+        importJob.UpdatedBy = identityName;
+        importJob.MappingJson = mappingJson;
 
-            await DataContext.SaveChangesAsync(cancellationToken);
+        await DataContext.SaveChangesAsync(cancellationToken);
 
-            await _importProcessService.ImportMembersAsync(id);
+        await _importProcessService.ImportMembersAsync(id);
 
-            return request.Import;
-        }
+        return request.Import;
     }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Member/Handlers/MemberImportUploadCommandHandler.cs b/service/src/InstructorIQ.Core/Domain/Member/Handlers/MemberImportUploadCommandHandler.cs
index ebd4e035..9247180a 100644
--- a/service/src/InstructorIQ.Core/Domain/Member/Handlers/MemberImportUploadCommandHandler.cs
+++ b/service/src/InstructorIQ.Core/Domain/Member/Handlers/MemberImportUploadCommandHandler.cs
@@ -4,124 +4,129 @@
 using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
+
 using AutoMapper;
+
 using CsvHelper;
 using CsvHelper.Configuration;
+
 using InstructorIQ.Core.Data;
 using InstructorIQ.Core.Data.Entities;
 using InstructorIQ.Core.Domain.Commands;
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Services;
+
 using MediatR.CommandQuery.EntityFrameworkCore.Handlers;
+
 using Microsoft.Extensions.Logging;
+
 using Newtonsoft.Json;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Handlers
+namespace InstructorIQ.Core.Domain.Handlers;
+
+public class MemberImportUploadCommandHandler : DataContextHandlerBase<InstructorIQContext, MemberImportUploadCommand, MemberImportJobModel>
 {
-    public class MemberImportUploadCommandHandler : DataContextHandlerBase<InstructorIQContext, MemberImportUploadCommand, MemberImportJobModel>
+    private readonly IStorageService _storageService;
+
+    public MemberImportUploadCommandHandler(ILoggerFactory loggerFactory, InstructorIQContext dataContext, IMapper mapper, IStorageService storageService)
+        : base(loggerFactory, dataContext, mapper)
+    {
+        _storageService = storageService;
+    }
+
+    protected override async Task<MemberImportJobModel> Process(MemberImportUploadCommand request, CancellationToken cancellationToken)
     {
-        private readonly IStorageService _storageService;
+        var id = Guid.NewGuid();
+        var fileName = request.Upload.FileName ?? "upload.csv";
+        fileName = Path.GetFileName(fileName);
+        var storageFile = $"members/{id}/{fileName}";
+
+        var importModel = new MemberImportJobModel { Id = id, Name = fileName };
 
-        public MemberImportUploadCommandHandler(ILoggerFactory loggerFactory, InstructorIQContext dataContext, IMapper mapper, IStorageService storageService)
-            : base(loggerFactory, dataContext, mapper)
+        // need to upload and parse file, copy stream to memory
+        using (var memoryStream = new MemoryStream())
         {
-            _storageService = storageService;
+            await request.Upload.CopyToAsync(memoryStream, cancellationToken);
+
+            // upload file
+            await StoreFile(storageFile, memoryStream, cancellationToken);
+
+            // parse csv
+            ParseCsv(memoryStream, importModel);
         }
 
-        protected override async Task<MemberImportJobModel> Process(MemberImportUploadCommand request, CancellationToken cancellationToken)
-        {
-            var id = Guid.NewGuid();
-            var fileName = request.Upload.FileName ?? "upload.csv";
-            fileName = Path.GetFileName(fileName);
-            var storageFile = $"members/{id}/{fileName}";
+        await SaveImportJob(id, storageFile, request, importModel, cancellationToken);
 
-            var importModel = new MemberImportJobModel { Id = id, Name = fileName };
+        return importModel;
+    }
 
-            // need to upload and parse file, copy stream to memory
-            using (var memoryStream = new MemoryStream())
-            {
-                await request.Upload.CopyToAsync(memoryStream, cancellationToken);
 
-                // upload file
-                await StoreFile(storageFile, memoryStream, cancellationToken);
+    private async Task SaveImportJob(Guid id, string storageFile, MemberImportUploadCommand request, MemberImportJobModel importModel, CancellationToken cancellationToken)
+    {
+        var json = JsonConvert.SerializeObject(importModel);
 
-                // parse csv
-                ParseCsv(memoryStream, importModel);
-            }
+        // create job
+        var identityName = request.Principal?.Identity?.Name;
 
-            await SaveImportJob(id, storageFile, request, importModel, cancellationToken);
+        var importJob = new ImportJob
+        {
+            Id = id,
+            Type = "MemberImport",
+            TenantId = request.TenantId,
+            StorageFile = storageFile,
+            MappingJson = json,
+            Created = DateTimeOffset.UtcNow,
+            CreatedBy = identityName,
+            Updated = DateTimeOffset.UtcNow,
+            UpdatedBy = identityName
+        };
+
+        DataContext.ImportJobs.Add(importJob);
+        await DataContext.SaveChangesAsync(cancellationToken);
+    }
 
-            return importModel;
-        }
+    private void ParseCsv(MemoryStream memoryStream, MemberImportJobModel importModel)
+    {
+        // reset stream
+        memoryStream.Position = 0;
 
+        var configuration = new CsvConfiguration(CultureInfo.CurrentCulture) { HasHeaderRecord = true };
 
-        private async Task SaveImportJob(Guid id, string storageFile, MemberImportUploadCommand request, MemberImportJobModel importModel, CancellationToken cancellationToken)
+        using (var reader = new StreamReader(memoryStream))
+        using (var csv = new CsvReader(reader, configuration))
         {
-            var json = JsonConvert.SerializeObject(importModel);
-
-            // create job
-            var identityName = request.Principal?.Identity?.Name;
-
-            var importJob = new ImportJob
-            {
-                Id = id,
-                Type = "MemberImport",
-                TenantId = request.TenantId,
-                StorageFile = storageFile,
-                MappingJson = json,
-                Created = DateTimeOffset.UtcNow,
-                CreatedBy = identityName,
-                Updated = DateTimeOffset.UtcNow,
-                UpdatedBy = identityName
-            };
-
-            DataContext.ImportJobs.Add(importJob);
-            await DataContext.SaveChangesAsync(cancellationToken);
+            csv.Read();
+            csv.ReadHeader();
+
+            importModel.Headers = csv.HeaderRecord;
         }
 
-        private void ParseCsv(MemoryStream memoryStream, MemberImportJobModel importModel)
+        // default match headers
+        foreach (var header in importModel.Headers)
         {
-            // reset stream
-            memoryStream.Position = 0;
-
-            var configuration = new CsvConfiguration(CultureInfo.CurrentCulture) { HasHeaderRecord = true };
-
-            using (var reader = new StreamReader(memoryStream))
-            using (var csv = new CsvReader(reader, configuration))
-            {
-                csv.Read();
-                csv.ReadHeader();
-
-                importModel.Headers = csv.HeaderRecord;
-            }
-
-            // default match headers
-            foreach (var header in importModel.Headers)
-            {
-                if (Regex.IsMatch(header, "first|given", RegexOptions.IgnoreCase))
-                    importModel.GivenNameMapping = header;
-                else if (Regex.IsMatch(header, "last|family", RegexOptions.IgnoreCase))
-                    importModel.FamilyNameMapping = header;
-                else if (Regex.IsMatch(header, "middle", RegexOptions.IgnoreCase))
-                    importModel.MiddleNameMapping = header;
-                else if (Regex.IsMatch(header, "^name|name$|dispay", RegexOptions.IgnoreCase))
-                    importModel.DisplayNameMapping = header;
-                else if (Regex.IsMatch(header, "email", RegexOptions.IgnoreCase))
-                    importModel.EmailMapping = header;
-                else if (Regex.IsMatch(header, "phone", RegexOptions.IgnoreCase))
-                    importModel.PhoneNumberMapping = header;
-                else if (Regex.IsMatch(header, "title|rank", RegexOptions.IgnoreCase))
-                    importModel.JobTitleMapping = header;
-            }
+            if (Regex.IsMatch(header, "first|given", RegexOptions.IgnoreCase))
+                importModel.GivenNameMapping = header;
+            else if (Regex.IsMatch(header, "last|family", RegexOptions.IgnoreCase))
+                importModel.FamilyNameMapping = header;
+            else if (Regex.IsMatch(header, "middle", RegexOptions.IgnoreCase))
+                importModel.MiddleNameMapping = header;
+            else if (Regex.IsMatch(header, "^name|name$|dispay", RegexOptions.IgnoreCase))
+                importModel.DisplayNameMapping = header;
+            else if (Regex.IsMatch(header, "email", RegexOptions.IgnoreCase))
+                importModel.EmailMapping = header;
+            else if (Regex.IsMatch(header, "phone", RegexOptions.IgnoreCase))
+                importModel.PhoneNumberMapping = header;
+            else if (Regex.IsMatch(header, "title|rank", RegexOptions.IgnoreCase))
+                importModel.JobTitleMapping = header;
         }
+    }
 
-        private async Task StoreFile(string blobName, MemoryStream memoryStream, CancellationToken cancellationToken)
-        {
-            // reset stream
-            memoryStream.Position = 0;
+    private async Task StoreFile(string blobName, MemoryStream memoryStream, CancellationToken cancellationToken)
+    {
+        // reset stream
+        memoryStream.Position = 0;
 
-            await _storageService.UploadAsync(blobName, memoryStream, cancellationToken);
-        }
+        await _storageService.UploadAsync(blobName, memoryStream, cancellationToken);
     }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Member/Handlers/MemberPagedQueryHandler.cs b/service/src/InstructorIQ.Core/Domain/Member/Handlers/MemberPagedQueryHandler.cs
index 3420bc28..03ef83b7 100644
--- a/service/src/InstructorIQ.Core/Domain/Member/Handlers/MemberPagedQueryHandler.cs
+++ b/service/src/InstructorIQ.Core/Domain/Member/Handlers/MemberPagedQueryHandler.cs
@@ -1,71 +1,74 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Dynamic.Core;
 using System.Threading;
 using System.Threading.Tasks;
+
 using AutoMapper;
 using AutoMapper.QueryableExtensions;
+
 using InstructorIQ.Core.Data;
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Domain.Queries;
+
 using MediatR.CommandQuery.EntityFrameworkCore.Handlers;
 using MediatR.CommandQuery.Extensions;
 using MediatR.CommandQuery.Queries;
+
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Handlers
+namespace InstructorIQ.Core.Domain.Handlers;
+
+public class MemberPagedQueryHandler
+    : MemberQueryHandlerBase<MemberPagedQuery, EntityPagedResult<MemberReadModel>>
 {
-    public class MemberPagedQueryHandler
-        : MemberQueryHandlerBase<MemberPagedQuery, EntityPagedResult<MemberReadModel>>
+    public MemberPagedQueryHandler(ILoggerFactory loggerFactory, InstructorIQContext dataContext, IMapper mapper)
+        : base(loggerFactory, dataContext, mapper)
     {
-        public MemberPagedQueryHandler(ILoggerFactory loggerFactory, InstructorIQContext dataContext, IMapper mapper)
-            : base(loggerFactory, dataContext, mapper)
-        {
-        }
+    }
 
-        protected override async Task<EntityPagedResult<MemberReadModel>> Process(MemberPagedQuery request, CancellationToken cancellationToken)
-        {
-            var entityQuery = request.Query;
+    protected override async Task<EntityPagedResult<MemberReadModel>> Process(MemberPagedQuery request, CancellationToken cancellationToken)
+    {
+        var entityQuery = request.Query;
 
-            // users that are members for tenant
-            var query = UserQuery(request.TenantId, request.RoleId);
+        // users that are members for tenant
+        var query = UserQuery(request.TenantId, request.RoleId);
 
-            // build query from filter
-            query = query
-                .AsNoTracking()
-                .Filter(entityQuery.Filter);
+        // build query from filter
+        query = query
+            .AsNoTracking()
+            .Filter(entityQuery.Filter);
 
-            // add raw query
-            if (!string.IsNullOrEmpty(entityQuery.Query))
-                query = query.Where(entityQuery.Query);
+        // add raw query
+        if (!string.IsNullOrEmpty(entityQuery.Query))
+            query = query.Where(entityQuery.Query);
 
 
-            // get total for query
-            var total = await query
-                .CountAsync(cancellationToken)
-                .ConfigureAwait(false);
+        // get total for query
+        var total = await query
+            .CountAsync(cancellationToken)
+            .ConfigureAwait(false);
 
-            // short circuit if total is zero
-            if (total == 0)
-                return new EntityPagedResult<MemberReadModel> { Data = new List<MemberReadModel>() };
+        // short circuit if total is zero
+        if (total == 0)
+            return new EntityPagedResult<MemberReadModel> { Data = new List<MemberReadModel>() };
 
-            // page the query and convert to read model
-            var result = await query
-                .Sort(entityQuery.Sort)
-                .Page(entityQuery.Page, entityQuery.PageSize)
-                .ProjectTo<MemberReadModel>(Mapper.ConfigurationProvider)
-                .ToListAsync(cancellationToken)
-                .ConfigureAwait(false);
+        // page the query and convert to read model
+        var result = await query
+            .Sort(entityQuery.Sort)
+            .Page(entityQuery.Page, entityQuery.PageSize)
+            .ProjectTo<MemberReadModel>(Mapper.ConfigurationProvider)
+            .ToListAsync(cancellationToken)
+            .ConfigureAwait(false);
 
-            return new EntityPagedResult<MemberReadModel>
-            {
-                Total = total,
-                Data = result.AsReadOnly()
-            };
+        return new EntityPagedResult<MemberReadModel>
+        {
+            Total = total,
+            Data = result.AsReadOnly()
+        };
 
-        }
     }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Member/Handlers/MemberQueryHandlerBase.cs b/service/src/InstructorIQ.Core/Domain/Member/Handlers/MemberQueryHandlerBase.cs
index c41f6aa3..0101fccb 100644
--- a/service/src/InstructorIQ.Core/Domain/Member/Handlers/MemberQueryHandlerBase.cs
+++ b/service/src/InstructorIQ.Core/Domain/Member/Handlers/MemberQueryHandlerBase.cs
@@ -1,56 +1,59 @@
-using System;
+using System;
 using System.Linq;
+
 using AutoMapper;
+
 using InstructorIQ.Core.Data;
 using InstructorIQ.Core.Data.Entities;
+
 using MediatR;
 using MediatR.CommandQuery.EntityFrameworkCore.Handlers;
+
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Handlers
+namespace InstructorIQ.Core.Domain.Handlers;
+
+public abstract class MemberQueryHandlerBase<TRequest, TResponse>
+    : DataContextHandlerBase<InstructorIQContext, TRequest, TResponse>
+    where TRequest : IRequest<TResponse>
 {
-    public abstract class MemberQueryHandlerBase<TRequest, TResponse>
-        : DataContextHandlerBase<InstructorIQContext, TRequest, TResponse>
-        where TRequest : IRequest<TResponse>
+    protected MemberQueryHandlerBase(ILoggerFactory loggerFactory, InstructorIQContext dataContext, IMapper mapper)
+        : base(loggerFactory, dataContext, mapper)
+    {
+    }
+
+    protected virtual IQueryable<User> UserQuery(Guid tenantId, Guid? roleId)
     {
-        protected MemberQueryHandlerBase(ILoggerFactory loggerFactory, InstructorIQContext dataContext, IMapper mapper)
-            : base(loggerFactory, dataContext, mapper)
-        {
-        }
-
-        protected virtual IQueryable<User> UserQuery(Guid tenantId, Guid? roleId)
-        {
-            return roleId.HasValue
-                ? UserRoleQuery(tenantId, roleId.Value)
-                : UserMemberQuery(tenantId);
-        }
-
-        protected virtual IQueryable<User> UserRoleQuery(Guid tenantId, Guid roleId)
-        {
-            return from c in DataContext.Users
-                   where
-                   (
-                       from t in DataContext.TenantUserRoles
-                       where t.TenantId == tenantId
-                             && t.RoleId == roleId
-                       select t.UserId
-                   ).Contains(c.Id)
-                   select c;
-        }
-
-        protected virtual IQueryable<User> UserMemberQuery(Guid tenantId)
-        {
-            return from c in DataContext.Users
-                   where
-                   (
-                       from t in DataContext.TenantUserRoles
-                       where t.TenantId == tenantId
-                       select t.UserId
-                   ).Contains(c.Id)
-                   select c;
-        }
+        return roleId.HasValue
+            ? UserRoleQuery(tenantId, roleId.Value)
+            : UserMemberQuery(tenantId);
+    }
 
+    protected virtual IQueryable<User> UserRoleQuery(Guid tenantId, Guid roleId)
+    {
+        return from c in DataContext.Users
+               where
+               (
+                   from t in DataContext.TenantUserRoles
+                   where t.TenantId == tenantId
+                         && t.RoleId == roleId
+                   select t.UserId
+               ).Contains(c.Id)
+               select c;
     }
-}
\ No newline at end of file
+
+    protected virtual IQueryable<User> UserMemberQuery(Guid tenantId)
+    {
+        return from c in DataContext.Users
+               where
+               (
+                   from t in DataContext.TenantUserRoles
+                   where t.TenantId == tenantId
+                   select t.UserId
+               ).Contains(c.Id)
+               select c;
+    }
+
+}
diff --git a/service/src/InstructorIQ.Core/Domain/Member/Handlers/MemberSelectQueryHandler.cs b/service/src/InstructorIQ.Core/Domain/Member/Handlers/MemberSelectQueryHandler.cs
index 51c4163a..60ec7d7e 100644
--- a/service/src/InstructorIQ.Core/Domain/Member/Handlers/MemberSelectQueryHandler.cs
+++ b/service/src/InstructorIQ.Core/Domain/Member/Handlers/MemberSelectQueryHandler.cs
@@ -1,39 +1,41 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+
 using AutoMapper;
 using AutoMapper.QueryableExtensions;
+
 using InstructorIQ.Core.Data;
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Domain.Queries;
+
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Handlers
+namespace InstructorIQ.Core.Domain.Handlers;
+
+public class MemberSelectQueryHandler
+    : MemberQueryHandlerBase<MemberSelectQuery, IReadOnlyCollection<MemberReadModel>>
 {
-    public class MemberSelectQueryHandler
-        : MemberQueryHandlerBase<MemberSelectQuery, IReadOnlyCollection<MemberReadModel>>
+    public MemberSelectQueryHandler(ILoggerFactory loggerFactory, InstructorIQContext dataContext, IMapper mapper)
+        : base(loggerFactory, dataContext, mapper)
     {
-        public MemberSelectQueryHandler(ILoggerFactory loggerFactory, InstructorIQContext dataContext, IMapper mapper)
-            : base(loggerFactory, dataContext, mapper)
-        {
-        }
-
-        protected override async Task<IReadOnlyCollection<MemberReadModel>> Process(MemberSelectQuery request, CancellationToken cancellationToken)
-        {
-            // users that are members for tenant
-            var query = UserQuery(request.TenantId, request.RoleId);
-
-            var result = await query
-                .AsNoTracking()
-                .OrderBy(p => p.DisplayName)
-                .ProjectTo<MemberReadModel>(Mapper.ConfigurationProvider)
-                .ToListAsync(cancellationToken)
-                .ConfigureAwait(false);
-
-            return result;
-        }
     }
-}
\ No newline at end of file
+
+    protected override async Task<IReadOnlyCollection<MemberReadModel>> Process(MemberSelectQuery request, CancellationToken cancellationToken)
+    {
+        // users that are members for tenant
+        var query = UserQuery(request.TenantId, request.RoleId);
+
+        var result = await query
+            .AsNoTracking()
+            .OrderBy(p => p.DisplayName)
+            .ProjectTo<MemberReadModel>(Mapper.ConfigurationProvider)
+            .ToListAsync(cancellationToken)
+            .ConfigureAwait(false);
+
+        return result;
+    }
+}
diff --git a/service/src/InstructorIQ.Core/Domain/Member/Handlers/MemberUpdateCommandHandler.cs b/service/src/InstructorIQ.Core/Domain/Member/Handlers/MemberUpdateCommandHandler.cs
index 7f314489..5d00a685 100644
--- a/service/src/InstructorIQ.Core/Domain/Member/Handlers/MemberUpdateCommandHandler.cs
+++ b/service/src/InstructorIQ.Core/Domain/Member/Handlers/MemberUpdateCommandHandler.cs
@@ -1,103 +1,106 @@
-using System;
+using System;
 using System.Threading;
 using System.Threading.Tasks;
+
 using AutoMapper;
+
 using InstructorIQ.Core.Data;
 using InstructorIQ.Core.Data.Entities;
 using InstructorIQ.Core.Domain.Models;
+
 using MediatR.CommandQuery;
 using MediatR.CommandQuery.Commands;
 using MediatR.CommandQuery.EntityFrameworkCore.Handlers;
+
 using Microsoft.AspNetCore.Identity;
 using Microsoft.Extensions.Logging;
 
-namespace InstructorIQ.Core.Domain.Handlers
+namespace InstructorIQ.Core.Domain.Handlers;
+
+public class MemberUpdateCommandHandler
+    : EntityDataContextHandlerBase<InstructorIQContext, Data.Entities.User, Guid, MemberReadModel, EntityUpdateCommand<Guid, MemberUpdateModel, MemberReadModel>, MemberReadModel>
 {
-    public class MemberUpdateCommandHandler
-        : EntityDataContextHandlerBase<InstructorIQContext, Data.Entities.User, Guid, MemberReadModel, EntityUpdateCommand<Guid, MemberUpdateModel, MemberReadModel>, MemberReadModel>
-    {
-        private readonly UserManager<Core.Data.Entities.User> _userManager;
+    private readonly UserManager<Core.Data.Entities.User> _userManager;
 
-        public MemberUpdateCommandHandler(ILoggerFactory loggerFactory, InstructorIQContext dataContext, IMapper mapper, UserManager<Core.Data.Entities.User> userManager)
-            : base(loggerFactory, dataContext, mapper)
-        {
-            _userManager = userManager;
-        }
+    public MemberUpdateCommandHandler(ILoggerFactory loggerFactory, InstructorIQContext dataContext, IMapper mapper, UserManager<Core.Data.Entities.User> userManager)
+        : base(loggerFactory, dataContext, mapper)
+    {
+        _userManager = userManager;
+    }
 
-        protected override async Task<MemberReadModel> Process(EntityUpdateCommand<Guid, MemberUpdateModel, MemberReadModel> request, CancellationToken cancellationToken)
-        {
-            var id = request.Id;
-            var model = request.Model;
+    protected override async Task<MemberReadModel> Process(EntityUpdateCommand<Guid, MemberUpdateModel, MemberReadModel> request, CancellationToken cancellationToken)
+    {
+        var id = request.Id;
+        var model = request.Model;
 
-            var user = await _userManager.FindByIdAsync(id.ToString());
-            if (user == null)
-                return null;
+        var user = await _userManager.FindByIdAsync(id.ToString());
+        if (user == null)
+            return null;
 
-            if (string.IsNullOrEmpty(user.SecurityStamp))
-                await _userManager.UpdateSecurityStampAsync(user);
+        if (string.IsNullOrEmpty(user.SecurityStamp))
+            await _userManager.UpdateSecurityStampAsync(user);
 
-            bool isGlobalAdministrator = request.Principal.IsInRole(Data.Constants.Role.GlobalAdministrator);
+        bool isGlobalAdministrator = request.Principal.IsInRole(Data.Constants.Role.GlobalAdministrator);
 
-            await UpdateEmail(id, model, user);
-            await UpdatePhoneNumber(id, model, user);
-            await UpdateModel(id, model, user, isGlobalAdministrator);
-            await UpdateLockoutEnd(id, model, user);
+        await UpdateEmail(id, model, user);
+        await UpdatePhoneNumber(id, model, user);
+        await UpdateModel(id, model, user, isGlobalAdministrator);
+        await UpdateLockoutEnd(id, model, user);
 
-            return await Read(id, cancellationToken).ConfigureAwait(false);
-        }
+        return await Read(id, cancellationToken).ConfigureAwait(false);
+    }
 
-        private async Task UpdateLockoutEnd(Guid id, MemberUpdateModel model, User user)
-        {
-            var currentLockoutEnabled = await _userManager.GetLockoutEndDateAsync(user);
+    private async Task UpdateLockoutEnd(Guid id, MemberUpdateModel model, User user)
+    {
+        var currentLockoutEnabled = await _userManager.GetLockoutEndDateAsync(user);
 
-            if (currentLockoutEnabled == model.LockoutEnd)
-                return;
+        if (currentLockoutEnabled == model.LockoutEnd)
+            return;
 
-            var result = await _userManager.SetLockoutEndDateAsync(user, model.LockoutEnd);
-            if (!result.Succeeded)
-                throw new DomainException(System.Net.HttpStatusCode.InternalServerError, $"Unexpected error occurred setting lockout end date for user with ID '{id}'.");
-        }
+        var result = await _userManager.SetLockoutEndDateAsync(user, model.LockoutEnd);
+        if (!result.Succeeded)
+            throw new DomainException(System.Net.HttpStatusCode.InternalServerError, $"Unexpected error occurred setting lockout end date for user with ID '{id}'.");
+    }
 
-        private async Task UpdateModel(Guid id, MemberUpdateModel model, Data.Entities.User user, bool isGlobalAdministrator)
+    private async Task UpdateModel(Guid id, MemberUpdateModel model, Data.Entities.User user, bool isGlobalAdministrator)
+    {
+        // update model properties
+        user.GivenName = model.GivenName;
+        user.MiddleName = model.MiddleName;
+        user.FamilyName = model.FamilyName;
+        user.DisplayName = model.DisplayName;
+        user.JobTitle = model.JobTitle;
+
+        // global admin fields
+        if (isGlobalAdministrator)
         {
-            // update model properties
-            user.GivenName = model.GivenName;
-            user.MiddleName = model.MiddleName;
-            user.FamilyName = model.FamilyName;
-            user.DisplayName = model.DisplayName;
-            user.JobTitle = model.JobTitle;
-
-            // global admin fields
-            if (isGlobalAdministrator)
-            {
-                user.IsGlobalAdministrator = model.IsGlobalAdministrator;
-            }
-
-            var updateResult = await _userManager.UpdateAsync(user);
-            if (!updateResult.Succeeded)
-                throw new InvalidOperationException($"Unexpected error occurred updating display name for user with ID '{id}'.");
+            user.IsGlobalAdministrator = model.IsGlobalAdministrator;
         }
 
-        private async Task UpdatePhoneNumber(Guid id, MemberUpdateModel model, Data.Entities.User user)
-        {
-            var phoneNumber = await _userManager.GetPhoneNumberAsync(user);
-            if (model.PhoneNumber == phoneNumber)
-                return;
+        var updateResult = await _userManager.UpdateAsync(user);
+        if (!updateResult.Succeeded)
+            throw new InvalidOperationException($"Unexpected error occurred updating display name for user with ID '{id}'.");
+    }
 
-            var setPhoneResult = await _userManager.SetPhoneNumberAsync(user, model.PhoneNumber);
-            if (!setPhoneResult.Succeeded)
-                throw new DomainException(System.Net.HttpStatusCode.InternalServerError, $"Unexpected error occurred setting phone number for user with ID '{id}'.");
-        }
+    private async Task UpdatePhoneNumber(Guid id, MemberUpdateModel model, Data.Entities.User user)
+    {
+        var phoneNumber = await _userManager.GetPhoneNumberAsync(user);
+        if (model.PhoneNumber == phoneNumber)
+            return;
 
-        private async Task UpdateEmail(Guid id, MemberUpdateModel model, Data.Entities.User user)
-        {
-            var email = await _userManager.GetEmailAsync(user);
-            if (model.Email == email)
-                return;
+        var setPhoneResult = await _userManager.SetPhoneNumberAsync(user, model.PhoneNumber);
+        if (!setPhoneResult.Succeeded)
+            throw new DomainException(System.Net.HttpStatusCode.InternalServerError, $"Unexpected error occurred setting phone number for user with ID '{id}'.");
+    }
 
-            var setEmailResult = await _userManager.SetEmailAsync(user, model.Email);
-            if (!setEmailResult.Succeeded)
-                throw new DomainException(System.Net.HttpStatusCode.InternalServerError, $"Unexpected error occurred setting email for user with ID '{id}'.");
-        }
+    private async Task UpdateEmail(Guid id, MemberUpdateModel model, Data.Entities.User user)
+    {
+        var email = await _userManager.GetEmailAsync(user);
+        if (model.Email == email)
+            return;
+
+        var setEmailResult = await _userManager.SetEmailAsync(user, model.Email);
+        if (!setEmailResult.Succeeded)
+            throw new DomainException(System.Net.HttpStatusCode.InternalServerError, $"Unexpected error occurred setting email for user with ID '{id}'.");
     }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Member/Handlers/MemberUserNameQueryHandler.cs b/service/src/InstructorIQ.Core/Domain/Member/Handlers/MemberUserNameQueryHandler.cs
index 50477453..b7070513 100644
--- a/service/src/InstructorIQ.Core/Domain/Member/Handlers/MemberUserNameQueryHandler.cs
+++ b/service/src/InstructorIQ.Core/Domain/Member/Handlers/MemberUserNameQueryHandler.cs
@@ -1,36 +1,39 @@
-using System.Linq;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+
 using AutoMapper;
 using AutoMapper.QueryableExtensions;
+
 using InstructorIQ.Core.Data;
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Domain.Queries;
+
 using MediatR.CommandQuery.EntityFrameworkCore.Handlers;
+
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Handlers
+namespace InstructorIQ.Core.Domain.Handlers;
+
+public class MemberUserNameQueryHandler
+    : DataContextHandlerBase<InstructorIQContext, MemberUserNameQuery, MemberReadModel>
 {
-    public class MemberUserNameQueryHandler
-        : DataContextHandlerBase<InstructorIQContext, MemberUserNameQuery, MemberReadModel>
+    public MemberUserNameQueryHandler(ILoggerFactory loggerFactory, InstructorIQContext dataContext, IMapper mapper)
+        : base(loggerFactory, dataContext, mapper)
     {
-        public MemberUserNameQueryHandler(ILoggerFactory loggerFactory, InstructorIQContext dataContext, IMapper mapper)
-            : base(loggerFactory, dataContext, mapper)
-        {
-        }
-
-        protected override async Task<MemberReadModel> Process(MemberUserNameQuery request, CancellationToken cancellationToken)
-        {
-            var result = await DataContext.Users
-                .AsNoTracking()
-                .Where(u => u.UserName == request.UserName)
-                .ProjectTo<MemberReadModel>(Mapper.ConfigurationProvider)
-                .FirstOrDefaultAsync(cancellationToken)
-                .ConfigureAwait(false);
-
-            return result;
-        }
     }
-}
\ No newline at end of file
+
+    protected override async Task<MemberReadModel> Process(MemberUserNameQuery request, CancellationToken cancellationToken)
+    {
+        var result = await DataContext.Users
+            .AsNoTracking()
+            .Where(u => u.UserName == request.UserName)
+            .ProjectTo<MemberReadModel>(Mapper.ConfigurationProvider)
+            .FirstOrDefaultAsync(cancellationToken)
+            .ConfigureAwait(false);
+
+        return result;
+    }
+}
diff --git a/service/src/InstructorIQ.Core/Domain/Member/Mapping/MemberProfile.cs b/service/src/InstructorIQ.Core/Domain/Member/Mapping/MemberProfile.cs
index c5e3f7cb..50235776 100644
--- a/service/src/InstructorIQ.Core/Domain/Member/Mapping/MemberProfile.cs
+++ b/service/src/InstructorIQ.Core/Domain/Member/Mapping/MemberProfile.cs
@@ -1,28 +1,28 @@
-using AutoMapper;
+using AutoMapper;
+
 using InstructorIQ.Core.Domain.Models;
 
-namespace InstructorIQ.Core.Domain.Mapping
+namespace InstructorIQ.Core.Domain.Mapping;
+
+public class MemberProfile : Profile
 {
-    public class MemberProfile : Profile
+    public MemberProfile()
     {
-        public MemberProfile()
-        {
-            CreateMap<Data.Entities.User, MemberReadModel>();
+        CreateMap<Data.Entities.User, MemberReadModel>();
 
-            CreateMap<Data.Entities.User, MemberUpdateModel>();
+        CreateMap<Data.Entities.User, MemberUpdateModel>();
 
-            CreateMap<Data.Entities.User, MemberImportModel>();
+        CreateMap<Data.Entities.User, MemberImportModel>();
 
-            CreateMap<MemberUpdateModel, Data.Entities.User>();
+        CreateMap<MemberUpdateModel, Data.Entities.User>();
 
-            CreateMap<MemberReadModel, MemberUpdateModel>();
+        CreateMap<MemberReadModel, MemberUpdateModel>();
 
-            CreateMap<MemberReadModel, MemberImportModel>();
+        CreateMap<MemberReadModel, MemberImportModel>();
 
-            CreateMap<Data.Entities.User, MemberDropdownModel>()
-                .ForMember(d => d.Value, opt => opt.MapFrom(s => s.Id.ToString().ToLowerInvariant()))
-                .ForMember(d => d.Text, opt => opt.MapFrom(s => s.SortName));
+        CreateMap<Data.Entities.User, MemberDropdownModel>()
+            .ForMember(d => d.Value, opt => opt.MapFrom(s => s.Id.ToString().ToLowerInvariant()))
+            .ForMember(d => d.Text, opt => opt.MapFrom(s => s.SortName));
 
-        }
     }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Member/MemberServiceRegistration.cs b/service/src/InstructorIQ.Core/Domain/Member/MemberServiceRegistration.cs
index e6713050..51d824ea 100644
--- a/service/src/InstructorIQ.Core/Domain/Member/MemberServiceRegistration.cs
+++ b/service/src/InstructorIQ.Core/Domain/Member/MemberServiceRegistration.cs
@@ -19,28 +19,27 @@
 using Microsoft.Extensions.DependencyInjection.Extensions;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain
+namespace InstructorIQ.Core.Domain;
+
+public class MemberServiceRegistration : DomainServiceRegistrationBase
 {
-    public class MemberServiceRegistration : DomainServiceRegistrationBase
-    {
 
-        [RegisterServices]
-        public override void Register(IServiceCollection services)
-        {
-            services.TryAddTransient<IRequestHandler<EntityIdentifierQuery<Guid, MemberReadModel>, MemberReadModel>, EntityIdentifierQueryHandler<InstructorIQContext, Data.Entities.User, Guid, MemberReadModel>>();
-            services.TryAddTransient<IRequestHandler<MemberPagedQuery, EntityPagedResult<MemberReadModel>>, MemberPagedQueryHandler>();
-            services.TryAddTransient<IRequestHandler<MemberSelectQuery, IReadOnlyCollection<MemberReadModel>>, MemberSelectQueryHandler>();
-            services.TryAddTransient<IRequestHandler<MemberDropdownQuery, IReadOnlyCollection<MemberDropdownModel>>, MemberDropdownQueryHandler>();
-            services.TryAddTransient<IRequestHandler<MemberUserNameQuery, MemberReadModel>, MemberUserNameQueryHandler>();
+    [RegisterServices]
+    public override void Register(IServiceCollection services)
+    {
+        services.TryAddTransient<IRequestHandler<EntityIdentifierQuery<Guid, MemberReadModel>, MemberReadModel>, EntityIdentifierQueryHandler<InstructorIQContext, Data.Entities.User, Guid, MemberReadModel>>();
+        services.TryAddTransient<IRequestHandler<MemberPagedQuery, EntityPagedResult<MemberReadModel>>, MemberPagedQueryHandler>();
+        services.TryAddTransient<IRequestHandler<MemberSelectQuery, IReadOnlyCollection<MemberReadModel>>, MemberSelectQueryHandler>();
+        services.TryAddTransient<IRequestHandler<MemberDropdownQuery, IReadOnlyCollection<MemberDropdownModel>>, MemberDropdownQueryHandler>();
+        services.TryAddTransient<IRequestHandler<MemberUserNameQuery, MemberReadModel>, MemberUserNameQueryHandler>();
 
-            services.AddEntityUpdateCommand<InstructorIQContext, Data.Entities.User, Guid, MemberReadModel, MemberUpdateModel>();
+        services.AddEntityUpdateCommand<InstructorIQContext, Data.Entities.User, Guid, MemberReadModel, MemberUpdateModel>();
 
-            services.TryAddTransient<IRequestHandler<MemberChangeTenantCommand, MemberReadModel>, MemberChangeTenantCommandHandler>();
-            services.TryAddTransient<IRequestHandler<MemberAssignRoleCommand, CompleteModel>, MemberAssignRoleCommandHandler>();
+        services.TryAddTransient<IRequestHandler<MemberChangeTenantCommand, MemberReadModel>, MemberChangeTenantCommandHandler>();
+        services.TryAddTransient<IRequestHandler<MemberAssignRoleCommand, CompleteModel>, MemberAssignRoleCommandHandler>();
 
-            services.TryAddTransient<IRequestHandler<MemberImportJobQuery, MemberImportJobModel>, MemberImportJobQueryHandler>();
-            services.TryAddTransient<IRequestHandler<MemberImportUploadCommand, MemberImportJobModel>, MemberImportUploadCommandHandler>();
-            services.TryAddTransient<IRequestHandler<MemberImportProcessCommand, MemberImportJobModel>, MemberImportProcessCommandHandler>();
-        }
+        services.TryAddTransient<IRequestHandler<MemberImportJobQuery, MemberImportJobModel>, MemberImportJobQueryHandler>();
+        services.TryAddTransient<IRequestHandler<MemberImportUploadCommand, MemberImportJobModel>, MemberImportUploadCommandHandler>();
+        services.TryAddTransient<IRequestHandler<MemberImportProcessCommand, MemberImportJobModel>, MemberImportProcessCommandHandler>();
     }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Member/Models/MemberAssignRoleModel.cs b/service/src/InstructorIQ.Core/Domain/Member/Models/MemberAssignRoleModel.cs
index fc53d03c..7fbe7b61 100644
--- a/service/src/InstructorIQ.Core/Domain/Member/Models/MemberAssignRoleModel.cs
+++ b/service/src/InstructorIQ.Core/Domain/Member/Models/MemberAssignRoleModel.cs
@@ -1,14 +1,13 @@
-using System;
+using System;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Models
+namespace InstructorIQ.Core.Domain.Models;
+
+public class MemberAssignRoleModel
 {
-    public class MemberAssignRoleModel
-    {
-        public Guid TenantId { get; set; }
+    public Guid TenantId { get; set; }
 
-        public string UserName { get; set; }
+    public string UserName { get; set; }
 
-        public string RoleName { get; set; }
-    }
-}
\ No newline at end of file
+    public string RoleName { get; set; }
+}
diff --git a/service/src/InstructorIQ.Core/Domain/Member/Models/MemberDropdownModel.cs b/service/src/InstructorIQ.Core/Domain/Member/Models/MemberDropdownModel.cs
index 173238ad..aac85beb 100644
--- a/service/src/InstructorIQ.Core/Domain/Member/Models/MemberDropdownModel.cs
+++ b/service/src/InstructorIQ.Core/Domain/Member/Models/MemberDropdownModel.cs
@@ -1,9 +1,8 @@
-using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.Rendering;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Models
+namespace InstructorIQ.Core.Domain.Models;
+
+public class MemberDropdownModel : SelectListItem
 {
-    public class MemberDropdownModel : SelectListItem
-    {
-    }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Member/Models/MemberImportJobModel.cs b/service/src/InstructorIQ.Core/Domain/Member/Models/MemberImportJobModel.cs
index 30ec11e6..df9616f9 100644
--- a/service/src/InstructorIQ.Core/Domain/Member/Models/MemberImportJobModel.cs
+++ b/service/src/InstructorIQ.Core/Domain/Member/Models/MemberImportJobModel.cs
@@ -1,30 +1,29 @@
-using System;
+using System;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Models
+namespace InstructorIQ.Core.Domain.Models;
+
+public class MemberImportJobModel
 {
-    public class MemberImportJobModel
-    {
-        public Guid Id { get; set; }
+    public Guid Id { get; set; }
 
-        public string Name { get; set; }
+    public string Name { get; set; }
 
-        public string[] Headers { get; set; }
+    public string[] Headers { get; set; }
 
-        public string EmailMapping { get; set; }
+    public string EmailMapping { get; set; }
 
-        public string PhoneNumberMapping { get; set; }
+    public string PhoneNumberMapping { get; set; }
 
-        public string GivenNameMapping { get; set; }
+    public string GivenNameMapping { get; set; }
 
-        public string MiddleNameMapping { get; set; }
+    public string MiddleNameMapping { get; set; }
 
-        public string FamilyNameMapping { get; set; }
+    public string FamilyNameMapping { get; set; }
 
-        public string DisplayNameMapping { get; set; }
+    public string DisplayNameMapping { get; set; }
 
-        public string SortNameMapping { get; set; }
+    public string SortNameMapping { get; set; }
 
-        public string JobTitleMapping { get; set; }
-    }
+    public string JobTitleMapping { get; set; }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Member/Models/MemberImportModel.cs b/service/src/InstructorIQ.Core/Domain/Member/Models/MemberImportModel.cs
index 02da6520..9986eb3f 100644
--- a/service/src/InstructorIQ.Core/Domain/Member/Models/MemberImportModel.cs
+++ b/service/src/InstructorIQ.Core/Domain/Member/Models/MemberImportModel.cs
@@ -1,24 +1,23 @@
-using System;
+using System;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Models
+namespace InstructorIQ.Core.Domain.Models;
+
+public class MemberImportModel
 {
-    public class MemberImportModel
-    {
-        public string Email { get; set; }
+    public string Email { get; set; }
+
+    public string DisplayName { get; set; }
 
-        public string DisplayName { get; set; }
+    public string SortName { get; set; }
 
-        public string SortName { get; set; }
-        
-        public string GivenName { get; set; }
+    public string GivenName { get; set; }
 
-        public string MiddleName { get; set; }
+    public string MiddleName { get; set; }
 
-        public string FamilyName { get; set; }
+    public string FamilyName { get; set; }
 
-        public string PhoneNumber { get; set; }
+    public string PhoneNumber { get; set; }
 
-        public string JobTitle { get; set; }
-    }
-}
\ No newline at end of file
+    public string JobTitle { get; set; }
+}
diff --git a/service/src/InstructorIQ.Core/Domain/Member/Models/MemberInviteModel.cs b/service/src/InstructorIQ.Core/Domain/Member/Models/MemberInviteModel.cs
index 3a39870f..badfbc8c 100644
--- a/service/src/InstructorIQ.Core/Domain/Member/Models/MemberInviteModel.cs
+++ b/service/src/InstructorIQ.Core/Domain/Member/Models/MemberInviteModel.cs
@@ -1,10 +1,9 @@
-// ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Models
+// ReSharper disable once CheckNamespace
+namespace InstructorIQ.Core.Domain.Models;
+
+public class MemberInviteModel
 {
-    public class MemberInviteModel
-    {
-        public string Email { get; set; }
+    public string Email { get; set; }
 
-        public string DisplayName { get; set; }
-    }
+    public string DisplayName { get; set; }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Member/Models/MemberReadModel.cs b/service/src/InstructorIQ.Core/Domain/Member/Models/MemberReadModel.cs
index b20f138e..18dd1369 100644
--- a/service/src/InstructorIQ.Core/Domain/Member/Models/MemberReadModel.cs
+++ b/service/src/InstructorIQ.Core/Domain/Member/Models/MemberReadModel.cs
@@ -1,37 +1,37 @@
-using System;
+using System;
+
 using MediatR.CommandQuery.Definitions;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Models
+namespace InstructorIQ.Core.Domain.Models;
+
+public class MemberReadModel : IHaveIdentifier<Guid>
 {
-    public class MemberReadModel : IHaveIdentifier<Guid>
-    {
-        public Guid Id { get; set; }
+    public Guid Id { get; set; }
 
-        public string UserName { get; set; }
+    public string UserName { get; set; }
 
-        public string Email { get; set; }
+    public string Email { get; set; }
 
-        public string PhoneNumber { get; set; }
+    public string PhoneNumber { get; set; }
 
-        public string GivenName { get; set; }
+    public string GivenName { get; set; }
 
-        public string MiddleName { get; set; }
+    public string MiddleName { get; set; }
 
-        public string FamilyName { get; set; }
+    public string FamilyName { get; set; }
 
-        public string DisplayName { get; set; }
+    public string DisplayName { get; set; }
 
-        public string SortName { get; set; }
+    public string SortName { get; set; }
 
-        public string JobTitle { get; set; }
+    public string JobTitle { get; set; }
 
-        public DateTimeOffset? LockoutEnd { get; set; }
+    public DateTimeOffset? LockoutEnd { get; set; }
 
-        public int AccessFailedCount { get; set; }
+    public int AccessFailedCount { get; set; }
 
-        public Guid? LastTenantId { get; set; }
+    public Guid? LastTenantId { get; set; }
 
-        public bool IsGlobalAdministrator { get; set; }
-    }
+    public bool IsGlobalAdministrator { get; set; }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Member/Models/MemberUpdateModel.cs b/service/src/InstructorIQ.Core/Domain/Member/Models/MemberUpdateModel.cs
index dc8d2dde..87cf7283 100644
--- a/service/src/InstructorIQ.Core/Domain/Member/Models/MemberUpdateModel.cs
+++ b/service/src/InstructorIQ.Core/Domain/Member/Models/MemberUpdateModel.cs
@@ -1,33 +1,32 @@
-
+
 using System;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Models
+namespace InstructorIQ.Core.Domain.Models;
+
+public class MemberUpdateModel
 {
-    public class MemberUpdateModel
-    {
-        public string UserName { get; set; }
+    public string UserName { get; set; }
 
-        public string Email { get; set; }
+    public string Email { get; set; }
 
-        public string PhoneNumber { get; set; }
+    public string PhoneNumber { get; set; }
 
-        public string GivenName { get; set; }
+    public string GivenName { get; set; }
 
-        public string MiddleName { get; set; }
+    public string MiddleName { get; set; }
 
-        public string FamilyName { get; set; }
+    public string FamilyName { get; set; }
 
-        public string DisplayName { get; set; }
+    public string DisplayName { get; set; }
 
-        public string SortName { get; set; }
+    public string SortName { get; set; }
 
-        public string JobTitle { get; set; }
+    public string JobTitle { get; set; }
 
-        public bool LockoutEnabled { get; set; }
+    public bool LockoutEnabled { get; set; }
 
-        public virtual DateTimeOffset? LockoutEnd { get; set; }
+    public virtual DateTimeOffset? LockoutEnd { get; set; }
 
-        public bool IsGlobalAdministrator { get; set; }
-    }
+    public bool IsGlobalAdministrator { get; set; }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Member/Queries/MemberDropdownQuery.cs b/service/src/InstructorIQ.Core/Domain/Member/Queries/MemberDropdownQuery.cs
index 1fe8209e..20798bff 100644
--- a/service/src/InstructorIQ.Core/Domain/Member/Queries/MemberDropdownQuery.cs
+++ b/service/src/InstructorIQ.Core/Domain/Member/Queries/MemberDropdownQuery.cs
@@ -1,22 +1,23 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Security.Principal;
+
 using InstructorIQ.Core.Domain.Models;
+
 using MediatR.CommandQuery.Queries;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Queries
+namespace InstructorIQ.Core.Domain.Queries;
+
+public class MemberDropdownQuery : PrincipalQueryBase<IReadOnlyCollection<MemberDropdownModel>>
 {
-    public class MemberDropdownQuery : PrincipalQueryBase<IReadOnlyCollection<MemberDropdownModel>>
+    public MemberDropdownQuery(IPrincipal principal, Guid tenantId)
+        : base(principal)
     {
-        public MemberDropdownQuery(IPrincipal principal, Guid tenantId)
-            : base(principal)
-        {
-            TenantId = tenantId;
-        }
+        TenantId = tenantId;
+    }
 
-        public Guid TenantId { get; }
+    public Guid TenantId { get; }
 
-        public Guid? RoleId { get; set; }
-    }
-}
\ No newline at end of file
+    public Guid? RoleId { get; set; }
+}
diff --git a/service/src/InstructorIQ.Core/Domain/Member/Queries/MemberImportJobQuery.cs b/service/src/InstructorIQ.Core/Domain/Member/Queries/MemberImportJobQuery.cs
index a1646a9c..01c88be0 100644
--- a/service/src/InstructorIQ.Core/Domain/Member/Queries/MemberImportJobQuery.cs
+++ b/service/src/InstructorIQ.Core/Domain/Member/Queries/MemberImportJobQuery.cs
@@ -1,15 +1,16 @@
-using System;
+using System;
 using System.Security.Principal;
+
 using InstructorIQ.Core.Domain.Models;
+
 using MediatR.CommandQuery.Queries;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Queries
+namespace InstructorIQ.Core.Domain.Queries;
+
+public class MemberImportJobQuery : EntityIdentifierQuery<Guid, MemberImportJobModel>
 {
-    public class MemberImportJobQuery : EntityIdentifierQuery<Guid, MemberImportJobModel>
+    public MemberImportJobQuery(IPrincipal principal, Guid id) : base(principal, id)
     {
-        public MemberImportJobQuery(IPrincipal principal, Guid id) : base(principal, id)
-        {
-        }
     }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Member/Queries/MemberPagedQuery.cs b/service/src/InstructorIQ.Core/Domain/Member/Queries/MemberPagedQuery.cs
index 1d93679f..ca546e99 100644
--- a/service/src/InstructorIQ.Core/Domain/Member/Queries/MemberPagedQuery.cs
+++ b/service/src/InstructorIQ.Core/Domain/Member/Queries/MemberPagedQuery.cs
@@ -1,20 +1,21 @@
-using System;
+using System;
 using System.Security.Principal;
-using MediatR.CommandQuery.Queries;
+
 using InstructorIQ.Core.Domain.Models;
 
+using MediatR.CommandQuery.Queries;
+
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Queries
+namespace InstructorIQ.Core.Domain.Queries;
+
+public class MemberPagedQuery : EntityPagedQuery<MemberReadModel>
 {
-    public class MemberPagedQuery : EntityPagedQuery<MemberReadModel>
+    public MemberPagedQuery(IPrincipal principal, EntityQuery query, Guid tenantId) : base(principal, query)
     {
-        public MemberPagedQuery(IPrincipal principal, EntityQuery query, Guid tenantId) : base(principal, query)
-        {
-            TenantId = tenantId;
-        }
+        TenantId = tenantId;
+    }
 
-        public Guid TenantId { get; }
+    public Guid TenantId { get; }
 
-        public Guid? RoleId { get; set; }
-    }
+    public Guid? RoleId { get; set; }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Member/Queries/MemberSelectQuery.cs b/service/src/InstructorIQ.Core/Domain/Member/Queries/MemberSelectQuery.cs
index 1c1775cf..630635b0 100644
--- a/service/src/InstructorIQ.Core/Domain/Member/Queries/MemberSelectQuery.cs
+++ b/service/src/InstructorIQ.Core/Domain/Member/Queries/MemberSelectQuery.cs
@@ -1,26 +1,27 @@
-using System;
+using System;
 using System.Security.Principal;
+
 using InstructorIQ.Core.Domain.Models;
+
 using MediatR.CommandQuery.Queries;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Queries
+namespace InstructorIQ.Core.Domain.Queries;
+
+public class MemberSelectQuery : EntitySelectQuery<MemberReadModel>
 {
-    public class MemberSelectQuery : EntitySelectQuery<MemberReadModel>
+    public MemberSelectQuery(IPrincipal principal, Guid tenantId)
+        : this(principal, new EntitySelect(), tenantId)
     {
-        public MemberSelectQuery(IPrincipal principal, Guid tenantId)
-            : this(principal, new EntitySelect(), tenantId)
-        {
-        }
+    }
 
-        public MemberSelectQuery(IPrincipal principal, EntitySelect select, Guid tenantId)
-            : base(principal, select)
-        {
-            TenantId = tenantId;
-        }
+    public MemberSelectQuery(IPrincipal principal, EntitySelect select, Guid tenantId)
+        : base(principal, select)
+    {
+        TenantId = tenantId;
+    }
 
-        public Guid TenantId { get; }
+    public Guid TenantId { get; }
 
-        public Guid? RoleId { get; set; }
-    }
-}
\ No newline at end of file
+    public Guid? RoleId { get; set; }
+}
diff --git a/service/src/InstructorIQ.Core/Domain/Member/Queries/MemberUserNameQuery.cs b/service/src/InstructorIQ.Core/Domain/Member/Queries/MemberUserNameQuery.cs
index 425a9cda..7ccf0754 100644
--- a/service/src/InstructorIQ.Core/Domain/Member/Queries/MemberUserNameQuery.cs
+++ b/service/src/InstructorIQ.Core/Domain/Member/Queries/MemberUserNameQuery.cs
@@ -1,23 +1,24 @@
-using System.Security.Principal;
+using System.Security.Principal;
+
 using InstructorIQ.Core.Domain.Models;
+
 using MediatR.CommandQuery.Queries;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Queries
+namespace InstructorIQ.Core.Domain.Queries;
+
+public class MemberUserNameQuery : CacheableQueryBase<MemberReadModel>
 {
-    public class MemberUserNameQuery : CacheableQueryBase<MemberReadModel>
+    public MemberUserNameQuery(IPrincipal principal, string userName)
+        : base(principal)
     {
-        public MemberUserNameQuery(IPrincipal principal, string userName)
-            : base(principal)
-        {
-            UserName = userName;
-        }
+        UserName = userName;
+    }
 
-        public string UserName { get; }
+    public string UserName { get; }
 
-        public override string GetCacheKey()
-        {
-            return $"{typeof(MemberReadModel).FullName}-{UserName}";
-        }
+    public override string GetCacheKey()
+    {
+        return $"{typeof(MemberReadModel).FullName}-{UserName}";
     }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.Core/Domain/Member/Validation/MemberImportJobModelValidator.cs b/service/src/InstructorIQ.Core/Domain/Member/Validation/MemberImportJobModelValidator.cs
index f002604c..d2253d2a 100644
--- a/service/src/InstructorIQ.Core/Domain/Member/Validation/MemberImportJobModelValidator.cs
+++ b/service/src/InstructorIQ.Core/Domain/Member/Validation/MemberImportJobModelValidator.cs
@@ -1,15 +1,15 @@
-using FluentValidation;
+using FluentValidation;
+
 using InstructorIQ.Core.Domain.Models;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Validation
+namespace InstructorIQ.Core.Domain.Validation;
+
+public class MemberImportJobModelValidator
+    : AbstractValidator<MemberImportJobModel>
 {
-    public class MemberImportJobModelValidator
-        : AbstractValidator<MemberImportJobModel>
+    public MemberImportJobModelValidator()
     {
-        public MemberImportJobModelValidator()
-        {
-            RuleFor(p => p.EmailMapping).NotEmpty();
-        }
+        RuleFor(p => p.EmailMapping).NotEmpty();
     }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.Core/Domain/Member/Validation/MemberUpdateModelValidator.cs b/service/src/InstructorIQ.Core/Domain/Member/Validation/MemberUpdateModelValidator.cs
index 41cf996c..9f0f935c 100644
--- a/service/src/InstructorIQ.Core/Domain/Member/Validation/MemberUpdateModelValidator.cs
+++ b/service/src/InstructorIQ.Core/Domain/Member/Validation/MemberUpdateModelValidator.cs
@@ -1,18 +1,18 @@
-using FluentValidation;
+using FluentValidation;
+
 using InstructorIQ.Core.Domain.Models;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Validation
+namespace InstructorIQ.Core.Domain.Validation;
+
+public class MemberUpdateModelValidator
+    : AbstractValidator<MemberUpdateModel>
 {
-    public class MemberUpdateModelValidator
-        : AbstractValidator<MemberUpdateModel>
+    public MemberUpdateModelValidator()
     {
-        public MemberUpdateModelValidator()
-        {
-            RuleFor(p => p.DisplayName).NotEmpty();
-            RuleFor(p => p.DisplayName).MaximumLength(256);
-            RuleFor(p => p.Email).NotEmpty();
-            RuleFor(p => p.Email).MaximumLength(256);
-        }
+        RuleFor(p => p.DisplayName).NotEmpty();
+        RuleFor(p => p.DisplayName).MaximumLength(256);
+        RuleFor(p => p.Email).NotEmpty();
+        RuleFor(p => p.Email).MaximumLength(256);
     }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Notification/Handlers/NotificationUnreadQueryHandler.cs b/service/src/InstructorIQ.Core/Domain/Notification/Handlers/NotificationUnreadQueryHandler.cs
index 513fd76c..ca0c2fbc 100644
--- a/service/src/InstructorIQ.Core/Domain/Notification/Handlers/NotificationUnreadQueryHandler.cs
+++ b/service/src/InstructorIQ.Core/Domain/Notification/Handlers/NotificationUnreadQueryHandler.cs
@@ -1,33 +1,36 @@
-using System.Linq;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+
 using AutoMapper;
+
 using InstructorIQ.Core.Data;
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Domain.Queries;
+
 using MediatR.CommandQuery.EntityFrameworkCore.Handlers;
+
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Handlers
+namespace InstructorIQ.Core.Domain.Handlers;
+
+public class NotificationUnreadQueryHandler : DataContextHandlerBase<InstructorIQContext, NotificationUnreadQuery, NotificationUnreadModel>
 {
-    public class NotificationUnreadQueryHandler : DataContextHandlerBase<InstructorIQContext, NotificationUnreadQuery, NotificationUnreadModel>
+    public NotificationUnreadQueryHandler(ILoggerFactory loggerFactory, InstructorIQContext dataContext, IMapper mapper) : base(loggerFactory, dataContext, mapper)
     {
-        public NotificationUnreadQueryHandler(ILoggerFactory loggerFactory, InstructorIQContext dataContext, IMapper mapper) : base(loggerFactory, dataContext, mapper)
-        {
-        }
+    }
 
-        protected override async Task<NotificationUnreadModel> Process(NotificationUnreadQuery request, CancellationToken cancellationToken)
-        {
-            var count = await DataContext.Notifications
-                .AsTracking()
-                .Where(n => n.TenantId == request.TenantId && n.UserName == request.UserName && n.Read == null)
-                .CountAsync(cancellationToken);
+    protected override async Task<NotificationUnreadModel> Process(NotificationUnreadQuery request, CancellationToken cancellationToken)
+    {
+        var count = await DataContext.Notifications
+            .AsTracking()
+            .Where(n => n.TenantId == request.TenantId && n.UserName == request.UserName && n.Read == null)
+            .CountAsync(cancellationToken);
 
-            var model = new NotificationUnreadModel { Count = count };
+        var model = new NotificationUnreadModel { Count = count };
 
-            return model;
-        }
+        return model;
     }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Notification/Mapping/NotificationProfile.cs b/service/src/InstructorIQ.Core/Domain/Notification/Mapping/NotificationProfile.cs
index 1ff538ad..46fb63b6 100644
--- a/service/src/InstructorIQ.Core/Domain/Notification/Mapping/NotificationProfile.cs
+++ b/service/src/InstructorIQ.Core/Domain/Notification/Mapping/NotificationProfile.cs
@@ -1,33 +1,34 @@
 using System;
+
 using AutoMapper;
+
 using InstructorIQ.Core.Data.Entities;
 using InstructorIQ.Core.Domain.Models;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Mapping
+namespace InstructorIQ.Core.Domain.Mapping;
+
+/// <summary>
+/// Mapper class for entity <see cref="Notification"/> .
+/// </summary>
+public class NotificationProfile
+    : Profile
 {
     /// <summary>
-    /// Mapper class for entity <see cref="Notification"/> .
+    /// Initializes a new instance of the <see cref="NotificationProfile"/> class.
     /// </summary>
-    public class NotificationProfile
-        : Profile
+    public NotificationProfile()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="NotificationProfile"/> class.
-        /// </summary>
-        public NotificationProfile()
-        {
-            CreateMap<Notification, NotificationReadModel>()
-                .ForMember(d => d.RowVersion, opt => opt.MapFrom(s => Convert.ToBase64String(s.RowVersion)));
+        CreateMap<Notification, NotificationReadModel>()
+            .ForMember(d => d.RowVersion, opt => opt.MapFrom(s => Convert.ToBase64String(s.RowVersion)));
 
-            CreateMap<NotificationCreateModel, Notification>();
+        CreateMap<NotificationCreateModel, Notification>();
 
-            CreateMap<Notification, NotificationUpdateModel>()
-                .ForMember(d => d.RowVersion, opt => opt.MapFrom(s => Convert.ToBase64String(s.RowVersion)));
-
-            CreateMap<NotificationUpdateModel, Notification>()
-                .ForMember(d => d.RowVersion, opt => opt.MapFrom(s => Convert.FromBase64String(s.RowVersion)));
-        }
+        CreateMap<Notification, NotificationUpdateModel>()
+            .ForMember(d => d.RowVersion, opt => opt.MapFrom(s => Convert.ToBase64String(s.RowVersion)));
 
+        CreateMap<NotificationUpdateModel, Notification>()
+            .ForMember(d => d.RowVersion, opt => opt.MapFrom(s => Convert.FromBase64String(s.RowVersion)));
     }
+
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Notification/Models/NotificationCreateModel.cs b/service/src/InstructorIQ.Core/Domain/Notification/Models/NotificationCreateModel.cs
index 19c5b9c8..ebdc8c04 100644
--- a/service/src/InstructorIQ.Core/Domain/Notification/Models/NotificationCreateModel.cs
+++ b/service/src/InstructorIQ.Core/Domain/Notification/Models/NotificationCreateModel.cs
@@ -1,58 +1,58 @@
 using System;
 using System.Collections.Generic;
+
 using MediatR.CommandQuery.Models;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Models
+namespace InstructorIQ.Core.Domain.Models;
+
+/// <summary>
+/// View Model class
+/// </summary>
+public partial class NotificationCreateModel
+    : EntityCreateModel<Guid>
 {
+    #region Generated Properties
+    /// <summary>
+    /// Gets or sets the property value for 'Type'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'Type'.
+    /// </value>
+    public string Type { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'Message'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'Message'.
+    /// </value>
+    public string Message { get; set; }
+
     /// <summary>
-    /// View Model class
+    /// Gets or sets the property value for 'UserName'.
     /// </summary>
-    public partial class NotificationCreateModel
-        : EntityCreateModel<Guid>
-    {
-        #region Generated Properties
-        /// <summary>
-        /// Gets or sets the property value for 'Type'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Type'.
-        /// </value>
-        public string Type { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'Message'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Message'.
-        /// </value>
-        public string Message { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'UserName'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'UserName'.
-        /// </value>
-        public string UserName { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'Read'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Read'.
-        /// </value>
-        public DateTimeOffset? Read { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'TenantId'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'TenantId'.
-        /// </value>
-        public Guid TenantId { get; set; }
-
-        #endregion
-
-    }
+    /// <value>
+    /// The property value for 'UserName'.
+    /// </value>
+    public string UserName { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'Read'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'Read'.
+    /// </value>
+    public DateTimeOffset? Read { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'TenantId'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'TenantId'.
+    /// </value>
+    public Guid TenantId { get; set; }
+
+    #endregion
+
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Notification/Models/NotificationReadModel.cs b/service/src/InstructorIQ.Core/Domain/Notification/Models/NotificationReadModel.cs
index 8ebf710a..7c7e7c08 100644
--- a/service/src/InstructorIQ.Core/Domain/Notification/Models/NotificationReadModel.cs
+++ b/service/src/InstructorIQ.Core/Domain/Notification/Models/NotificationReadModel.cs
@@ -1,58 +1,58 @@
 using System;
 using System.Collections.Generic;
+
 using MediatR.CommandQuery.Models;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Models
+namespace InstructorIQ.Core.Domain.Models;
+
+/// <summary>
+/// View Model class
+/// </summary>
+public partial class NotificationReadModel
+    : EntityReadModel<Guid>
 {
+    #region Generated Properties
+    /// <summary>
+    /// Gets or sets the property value for 'Type'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'Type'.
+    /// </value>
+    public string Type { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'Message'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'Message'.
+    /// </value>
+    public string Message { get; set; }
+
     /// <summary>
-    /// View Model class
+    /// Gets or sets the property value for 'UserName'.
     /// </summary>
-    public partial class NotificationReadModel
-        : EntityReadModel<Guid>
-    {
-        #region Generated Properties
-        /// <summary>
-        /// Gets or sets the property value for 'Type'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Type'.
-        /// </value>
-        public string Type { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'Message'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Message'.
-        /// </value>
-        public string Message { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'UserName'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'UserName'.
-        /// </value>
-        public string UserName { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'Read'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Read'.
-        /// </value>
-        public DateTimeOffset? Read { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'TenantId'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'TenantId'.
-        /// </value>
-        public Guid TenantId { get; set; }
-
-        #endregion
-
-    }
+    /// <value>
+    /// The property value for 'UserName'.
+    /// </value>
+    public string UserName { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'Read'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'Read'.
+    /// </value>
+    public DateTimeOffset? Read { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'TenantId'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'TenantId'.
+    /// </value>
+    public Guid TenantId { get; set; }
+
+    #endregion
+
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Notification/Models/NotificationUnreadModel.cs b/service/src/InstructorIQ.Core/Domain/Notification/Models/NotificationUnreadModel.cs
index 5ccb9a55..1f9cbc4e 100644
--- a/service/src/InstructorIQ.Core/Domain/Notification/Models/NotificationUnreadModel.cs
+++ b/service/src/InstructorIQ.Core/Domain/Notification/Models/NotificationUnreadModel.cs
@@ -1,10 +1,9 @@
 using System;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Models
+namespace InstructorIQ.Core.Domain.Models;
+
+public class NotificationUnreadModel
 {
-    public class NotificationUnreadModel
-    {
-        public int Count { get; set; }
-    }
-}
\ No newline at end of file
+    public int Count { get; set; }
+}
diff --git a/service/src/InstructorIQ.Core/Domain/Notification/Models/NotificationUpdateModel.cs b/service/src/InstructorIQ.Core/Domain/Notification/Models/NotificationUpdateModel.cs
index 2a3b33dd..c3336b65 100644
--- a/service/src/InstructorIQ.Core/Domain/Notification/Models/NotificationUpdateModel.cs
+++ b/service/src/InstructorIQ.Core/Domain/Notification/Models/NotificationUpdateModel.cs
@@ -1,57 +1,57 @@
 using System;
+
 using MediatR.CommandQuery.Models;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Models
+namespace InstructorIQ.Core.Domain.Models;
+
+/// <summary>
+/// View Model class
+/// </summary>
+public partial class NotificationUpdateModel
+    : EntityUpdateModel
 {
+    #region Generated Properties
+    /// <summary>
+    /// Gets or sets the property value for 'Type'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'Type'.
+    /// </value>
+    public string Type { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'Message'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'Message'.
+    /// </value>
+    public string Message { get; set; }
+
     /// <summary>
-    /// View Model class
+    /// Gets or sets the property value for 'UserName'.
     /// </summary>
-    public partial class NotificationUpdateModel
-        : EntityUpdateModel
-    {
-        #region Generated Properties
-        /// <summary>
-        /// Gets or sets the property value for 'Type'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Type'.
-        /// </value>
-        public string Type { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'Message'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Message'.
-        /// </value>
-        public string Message { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'UserName'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'UserName'.
-        /// </value>
-        public string UserName { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'Read'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Read'.
-        /// </value>
-        public DateTimeOffset? Read { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'TenantId'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'TenantId'.
-        /// </value>
-        public Guid TenantId { get; set; }
-
-        #endregion
-
-    }
+    /// <value>
+    /// The property value for 'UserName'.
+    /// </value>
+    public string UserName { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'Read'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'Read'.
+    /// </value>
+    public DateTimeOffset? Read { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'TenantId'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'TenantId'.
+    /// </value>
+    public Guid TenantId { get; set; }
+
+    #endregion
+
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Notification/NotificationServiceRegistration.cs b/service/src/InstructorIQ.Core/Domain/Notification/NotificationServiceRegistration.cs
index 6e37d14e..89adb3a9 100644
--- a/service/src/InstructorIQ.Core/Domain/Notification/NotificationServiceRegistration.cs
+++ b/service/src/InstructorIQ.Core/Domain/Notification/NotificationServiceRegistration.cs
@@ -13,18 +13,17 @@
 using Microsoft.Extensions.DependencyInjection.Extensions;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain
+namespace InstructorIQ.Core.Domain;
+
+public class NotificationServiceRegistration : DomainServiceRegistrationBase
 {
-    public class NotificationServiceRegistration : DomainServiceRegistrationBase
-    {
 
-        [RegisterServices]
-        public override void Register(IServiceCollection services)
-        {
-            RegisterEntityQuery<Guid, Notification, NotificationReadModel>(services);
-            RegisterEntityCommand<Guid, Notification, NotificationReadModel, NotificationCreateModel, NotificationUpdateModel>(services);
+    [RegisterServices]
+    public override void Register(IServiceCollection services)
+    {
+        RegisterEntityQuery<Guid, Notification, NotificationReadModel>(services);
+        RegisterEntityCommand<Guid, Notification, NotificationReadModel, NotificationCreateModel, NotificationUpdateModel>(services);
 
-            services.TryAddTransient<IRequestHandler<NotificationUnreadQuery, NotificationUnreadModel>, NotificationUnreadQueryHandler>();
-        }
+        services.TryAddTransient<IRequestHandler<NotificationUnreadQuery, NotificationUnreadModel>, NotificationUnreadQueryHandler>();
     }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Notification/Queries/NotificationUnreadQuery.cs b/service/src/InstructorIQ.Core/Domain/Notification/Queries/NotificationUnreadQuery.cs
index 5f3e46da..b9ab603d 100644
--- a/service/src/InstructorIQ.Core/Domain/Notification/Queries/NotificationUnreadQuery.cs
+++ b/service/src/InstructorIQ.Core/Domain/Notification/Queries/NotificationUnreadQuery.cs
@@ -1,21 +1,22 @@
-using System;
+using System;
 using System.Security.Principal;
+
 using InstructorIQ.Core.Domain.Models;
+
 using MediatR.CommandQuery.Queries;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Queries
+namespace InstructorIQ.Core.Domain.Queries;
+
+public class NotificationUnreadQuery : PrincipalQueryBase<NotificationUnreadModel>
 {
-    public class NotificationUnreadQuery : PrincipalQueryBase<NotificationUnreadModel>
+    public NotificationUnreadQuery(IPrincipal principal, string userName, Guid tenantId) : base(principal)
     {
-        public NotificationUnreadQuery(IPrincipal principal, string userName, Guid tenantId) : base(principal)
-        {
-            UserName = userName;
-            TenantId = tenantId;
-        }
+        UserName = userName;
+        TenantId = tenantId;
+    }
 
-        public string UserName { get; }
+    public string UserName { get; }
 
-        public Guid TenantId { get; }
-    }
+    public Guid TenantId { get; }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Notification/Validation/NotificationCreateModelValidator.cs b/service/src/InstructorIQ.Core/Domain/Notification/Validation/NotificationCreateModelValidator.cs
index 3e234041..6d18d245 100644
--- a/service/src/InstructorIQ.Core/Domain/Notification/Validation/NotificationCreateModelValidator.cs
+++ b/service/src/InstructorIQ.Core/Domain/Notification/Validation/NotificationCreateModelValidator.cs
@@ -1,28 +1,29 @@
 using System;
+
 using FluentValidation;
+
 using InstructorIQ.Core.Domain.Models;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Validation
+namespace InstructorIQ.Core.Domain.Validation;
+
+/// <summary>
+/// Validator class for <see cref="NotificationCreateModel"/> .
+/// </summary>
+public partial class NotificationCreateModelValidator
+    : AbstractValidator<NotificationCreateModel>
 {
     /// <summary>
-    /// Validator class for <see cref="NotificationCreateModel"/> .
+    /// Initializes a new instance of the <see cref="NotificationCreateModelValidator"/> class.
     /// </summary>
-    public partial class NotificationCreateModelValidator
-        : AbstractValidator<NotificationCreateModel>
+    public NotificationCreateModelValidator()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="NotificationCreateModelValidator"/> class.
-        /// </summary>
-        public NotificationCreateModelValidator()
-        {
-            #region Generated Constructor
-            RuleFor(p => p.Type).NotEmpty();
-            RuleFor(p => p.Type).MaximumLength(256);
-            RuleFor(p => p.UserName).NotEmpty();
-            RuleFor(p => p.UserName).MaximumLength(256);
-            #endregion
-        }
-
+        #region Generated Constructor
+        RuleFor(p => p.Type).NotEmpty();
+        RuleFor(p => p.Type).MaximumLength(256);
+        RuleFor(p => p.UserName).NotEmpty();
+        RuleFor(p => p.UserName).MaximumLength(256);
+        #endregion
     }
+
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Notification/Validation/NotificationUpdateModelValidator.cs b/service/src/InstructorIQ.Core/Domain/Notification/Validation/NotificationUpdateModelValidator.cs
index 5d52396e..86e3a299 100644
--- a/service/src/InstructorIQ.Core/Domain/Notification/Validation/NotificationUpdateModelValidator.cs
+++ b/service/src/InstructorIQ.Core/Domain/Notification/Validation/NotificationUpdateModelValidator.cs
@@ -1,28 +1,29 @@
 using System;
+
 using FluentValidation;
+
 using InstructorIQ.Core.Domain.Models;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Validation
+namespace InstructorIQ.Core.Domain.Validation;
+
+/// <summary>
+/// Validator class for <see cref="NotificationUpdateModel"/> .
+/// </summary>
+public partial class NotificationUpdateModelValidator
+    : AbstractValidator<NotificationUpdateModel>
 {
     /// <summary>
-    /// Validator class for <see cref="NotificationUpdateModel"/> .
+    /// Initializes a new instance of the <see cref="NotificationUpdateModelValidator"/> class.
     /// </summary>
-    public partial class NotificationUpdateModelValidator
-        : AbstractValidator<NotificationUpdateModel>
+    public NotificationUpdateModelValidator()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="NotificationUpdateModelValidator"/> class.
-        /// </summary>
-        public NotificationUpdateModelValidator()
-        {
-            #region Generated Constructor
-            RuleFor(p => p.Type).NotEmpty();
-            RuleFor(p => p.Type).MaximumLength(256);
-            RuleFor(p => p.UserName).NotEmpty();
-            RuleFor(p => p.UserName).MaximumLength(256);
-            #endregion
-        }
-
+        #region Generated Constructor
+        RuleFor(p => p.Type).NotEmpty();
+        RuleFor(p => p.Type).MaximumLength(256);
+        RuleFor(p => p.UserName).NotEmpty();
+        RuleFor(p => p.UserName).MaximumLength(256);
+        #endregion
     }
+
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Role/Mapping/RoleProfile.cs b/service/src/InstructorIQ.Core/Domain/Role/Mapping/RoleProfile.cs
index 71ff1886..1af968aa 100644
--- a/service/src/InstructorIQ.Core/Domain/Role/Mapping/RoleProfile.cs
+++ b/service/src/InstructorIQ.Core/Domain/Role/Mapping/RoleProfile.cs
@@ -1,14 +1,14 @@
-using AutoMapper;
+using AutoMapper;
+
 using InstructorIQ.Core.Domain.Models;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Mapping
+namespace InstructorIQ.Core.Domain.Mapping;
+
+public class RoleProfile : Profile
 {
-    public class RoleProfile : Profile
+    public RoleProfile()
     {
-        public RoleProfile()
-        {
-            CreateMap<Data.Entities.Role, RoleReadModel>();
-        }
+        CreateMap<Data.Entities.Role, RoleReadModel>();
     }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Role/Models/RoleReadModel.cs b/service/src/InstructorIQ.Core/Domain/Role/Models/RoleReadModel.cs
index 062e2679..41e8b2e5 100644
--- a/service/src/InstructorIQ.Core/Domain/Role/Models/RoleReadModel.cs
+++ b/service/src/InstructorIQ.Core/Domain/Role/Models/RoleReadModel.cs
@@ -1,15 +1,15 @@
-using System;
+using System;
+
 using MediatR.CommandQuery.Definitions;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Models
+namespace InstructorIQ.Core.Domain.Models;
+
+public class RoleReadModel : IHaveIdentifier<Guid>
 {
-    public class RoleReadModel : IHaveIdentifier<Guid>
-    {
-        public Guid Id { get; set; }
+    public Guid Id { get; set; }
 
-        public string Name { get; set; }
+    public string Name { get; set; }
 
-        public string Description { get; set; }
-    }
+    public string Description { get; set; }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Role/RoleServiceRegistration.cs b/service/src/InstructorIQ.Core/Domain/Role/RoleServiceRegistration.cs
index bd85c9fd..c65accd7 100644
--- a/service/src/InstructorIQ.Core/Domain/Role/RoleServiceRegistration.cs
+++ b/service/src/InstructorIQ.Core/Domain/Role/RoleServiceRegistration.cs
@@ -8,15 +8,14 @@
 using Microsoft.Extensions.DependencyInjection;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain
+namespace InstructorIQ.Core.Domain;
+
+public class RoleServiceRegistration : DomainServiceRegistrationBase
 {
-    public class RoleServiceRegistration : DomainServiceRegistrationBase
-    {
 
-        [RegisterServices]
-        public override void Register(IServiceCollection services)
-        {
-            RegisterEntityQuery<Guid, Role, RoleReadModel>(services);
-        }
+    [RegisterServices]
+    public override void Register(IServiceCollection services)
+    {
+        RegisterEntityQuery<Guid, Role, RoleReadModel>(services);
     }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Session/Commands/SessionInstructorUpdateCommand.cs b/service/src/InstructorIQ.Core/Domain/Session/Commands/SessionInstructorUpdateCommand.cs
index d3f20e25..3da3d44c 100644
--- a/service/src/InstructorIQ.Core/Domain/Session/Commands/SessionInstructorUpdateCommand.cs
+++ b/service/src/InstructorIQ.Core/Domain/Session/Commands/SessionInstructorUpdateCommand.cs
@@ -1,23 +1,23 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Security.Principal;
+
 using MediatR.CommandQuery.Commands;
 using MediatR.CommandQuery.Models;
 
-namespace InstructorIQ.Core.Domain.Commands
+namespace InstructorIQ.Core.Domain.Commands;
+
+public class SessionInstructorUpdateCommand : PrincipalCommandBase<CompleteModel>
 {
-    public class SessionInstructorUpdateCommand : PrincipalCommandBase<CompleteModel>
+    public SessionInstructorUpdateCommand(IPrincipal principal, Guid sessionId, IEnumerable<Guid> instructors) :
+        base(principal)
     {
-        public SessionInstructorUpdateCommand(IPrincipal principal, Guid sessionId, IEnumerable<Guid> instructors) :
-            base(principal)
-        {
-            SessionId = sessionId;
-            Instructors = instructors.ToList();
-        }
+        SessionId = sessionId;
+        Instructors = instructors.ToList();
+    }
 
-        public Guid SessionId { get; set; }
+    public Guid SessionId { get; set; }
 
-        public List<Guid> Instructors { get; set; }
-    }
-}
\ No newline at end of file
+    public List<Guid> Instructors { get; set; }
+}
diff --git a/service/src/InstructorIQ.Core/Domain/Session/Commands/SessionMultipleUpdateCommand.cs b/service/src/InstructorIQ.Core/Domain/Session/Commands/SessionMultipleUpdateCommand.cs
index bf208093..2dc3cbcc 100644
--- a/service/src/InstructorIQ.Core/Domain/Session/Commands/SessionMultipleUpdateCommand.cs
+++ b/service/src/InstructorIQ.Core/Domain/Session/Commands/SessionMultipleUpdateCommand.cs
@@ -1,19 +1,20 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Security.Principal;
+
 using InstructorIQ.Core.Domain.Models;
+
 using MediatR.CommandQuery.Commands;
 using MediatR.CommandQuery.Models;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Commands
+namespace InstructorIQ.Core.Domain.Commands;
+
+public class SessionMultipleUpdateCommand : PrincipalCommandBase<CompleteModel>
 {
-    public class SessionMultipleUpdateCommand : PrincipalCommandBase<CompleteModel>
+    public SessionMultipleUpdateCommand(IPrincipal principal, IReadOnlyCollection<SessionMultipleUpdateModel> models) : base(principal)
     {
-        public SessionMultipleUpdateCommand(IPrincipal principal, IReadOnlyCollection<SessionMultipleUpdateModel> models) : base(principal)
-        {
-            Models = models;
-        }
-
-        public IReadOnlyCollection<SessionMultipleUpdateModel> Models { get; set; }
+        Models = models;
     }
+
+    public IReadOnlyCollection<SessionMultipleUpdateModel> Models { get; set; }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Session/Commands/SessionSequenceCreateCommand.cs b/service/src/InstructorIQ.Core/Domain/Session/Commands/SessionSequenceCreateCommand.cs
index 41fca588..1bb3acdd 100644
--- a/service/src/InstructorIQ.Core/Domain/Session/Commands/SessionSequenceCreateCommand.cs
+++ b/service/src/InstructorIQ.Core/Domain/Session/Commands/SessionSequenceCreateCommand.cs
@@ -1,30 +1,30 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Security.Principal;
+
 using MediatR.CommandQuery.Commands;
 using MediatR.CommandQuery.Models;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Commands
+namespace InstructorIQ.Core.Domain.Commands;
+
+public class SessionSequenceCreateCommand : PrincipalCommandBase<CompleteModel>
 {
-    public class SessionSequenceCreateCommand : PrincipalCommandBase<CompleteModel>
+    public SessionSequenceCreateCommand(IPrincipal principal, Guid topicId, IEnumerable<int> sequences) : base(principal)
     {
-        public SessionSequenceCreateCommand(IPrincipal principal, Guid topicId, IEnumerable<int> sequences) : base(principal)
-        {
-            TopicIds = new List<Guid> { topicId };
-            Sequences = sequences.ToList();
-        }
+        TopicIds = new List<Guid> { topicId };
+        Sequences = sequences.ToList();
+    }
 
-        public SessionSequenceCreateCommand(IPrincipal principal, IEnumerable<Guid> topicIds, IEnumerable<int> sequences) : base(principal)
-        {
-            TopicIds = topicIds.ToList();
-            Sequences = sequences.ToList();
-        }
+    public SessionSequenceCreateCommand(IPrincipal principal, IEnumerable<Guid> topicIds, IEnumerable<int> sequences) : base(principal)
+    {
+        TopicIds = topicIds.ToList();
+        Sequences = sequences.ToList();
+    }
 
-        public IReadOnlyCollection<Guid> TopicIds { get; set; }
+    public IReadOnlyCollection<Guid> TopicIds { get; set; }
 
-        public IReadOnlyCollection<int> Sequences { get; set; }
+    public IReadOnlyCollection<int> Sequences { get; set; }
 
-    }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.Core/Domain/Session/Handlers/SessionCalendarQueryHandler.cs b/service/src/InstructorIQ.Core/Domain/Session/Handlers/SessionCalendarQueryHandler.cs
index 8c249807..f2749a64 100644
--- a/service/src/InstructorIQ.Core/Domain/Session/Handlers/SessionCalendarQueryHandler.cs
+++ b/service/src/InstructorIQ.Core/Domain/Session/Handlers/SessionCalendarQueryHandler.cs
@@ -1,41 +1,44 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+
 using AutoMapper;
 using AutoMapper.QueryableExtensions;
+
 using InstructorIQ.Core.Data;
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Domain.Queries;
+
 using MediatR.CommandQuery.EntityFrameworkCore.Handlers;
+
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Handlers
+namespace InstructorIQ.Core.Domain.Handlers;
+
+public class SessionCalendarQueryHandler
+    : DataContextHandlerBase<InstructorIQContext, SessionCalendarQuery, IReadOnlyCollection<SessionCalendarModel>>
 {
-    public class SessionCalendarQueryHandler
-        : DataContextHandlerBase<InstructorIQContext, SessionCalendarQuery, IReadOnlyCollection<SessionCalendarModel>>
+    public SessionCalendarQueryHandler(ILoggerFactory loggerFactory, InstructorIQContext dataContext, IMapper mapper)
+        : base(loggerFactory, dataContext, mapper)
     {
-        public SessionCalendarQueryHandler(ILoggerFactory loggerFactory, InstructorIQContext dataContext, IMapper mapper)
-            : base(loggerFactory, dataContext, mapper)
-        {
-        }
-
-        protected override async Task<IReadOnlyCollection<SessionCalendarModel>> Process(SessionCalendarQuery request, CancellationToken cancellationToken)
-        {
-            var query = DataContext.Sessions
-                .AsNoTracking()
-                .Where(q => q.TenantId == request.TenantId)
-                .Where(q => q.StartDate >= request.StartDate && q.StartDate < request.EndDate)
-                .OrderBy(q => q.StartDate)
-                .ThenBy(q => q.StartTime);
-
-            var result = await query
-                .ProjectTo<SessionCalendarModel>(Mapper.ConfigurationProvider)
-                .ToListAsync(cancellationToken);
-
-            return result;
-        }
     }
-}
\ No newline at end of file
+
+    protected override async Task<IReadOnlyCollection<SessionCalendarModel>> Process(SessionCalendarQuery request, CancellationToken cancellationToken)
+    {
+        var query = DataContext.Sessions
+            .AsNoTracking()
+            .Where(q => q.TenantId == request.TenantId)
+            .Where(q => q.StartDate >= request.StartDate && q.StartDate < request.EndDate)
+            .OrderBy(q => q.StartDate)
+            .ThenBy(q => q.StartTime);
+
+        var result = await query
+            .ProjectTo<SessionCalendarModel>(Mapper.ConfigurationProvider)
+            .ToListAsync(cancellationToken);
+
+        return result;
+    }
+}
diff --git a/service/src/InstructorIQ.Core/Domain/Session/Handlers/SessionFrequentTimeHandler.cs b/service/src/InstructorIQ.Core/Domain/Session/Handlers/SessionFrequentTimeHandler.cs
index 01f830c0..b2438f89 100644
--- a/service/src/InstructorIQ.Core/Domain/Session/Handlers/SessionFrequentTimeHandler.cs
+++ b/service/src/InstructorIQ.Core/Domain/Session/Handlers/SessionFrequentTimeHandler.cs
@@ -1,43 +1,46 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+
 using FluentCommand;
+
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Domain.Queries;
+
 using MediatR.CommandQuery.Handlers;
+
 using Microsoft.Data.SqlClient;
 using Microsoft.Extensions.Logging;
 
-namespace InstructorIQ.Core.Domain.Handlers
+namespace InstructorIQ.Core.Domain.Handlers;
+
+public class SessionFrequentTimeHandler : RequestHandlerBase<SessionFrequentTimeQuery, IReadOnlyCollection<SessionFrequentTimeModel>>
 {
-    public class SessionFrequentTimeHandler : RequestHandlerBase<SessionFrequentTimeQuery, IReadOnlyCollection<SessionFrequentTimeModel>>
+    private readonly IDataSession _dataSession;
+
+    public SessionFrequentTimeHandler(ILoggerFactory loggerFactory, IDataSession dataSession)
+        : base(loggerFactory)
     {
-        private readonly IDataSession _dataSession;
-
-        public SessionFrequentTimeHandler(ILoggerFactory loggerFactory, IDataSession dataSession)
-            : base(loggerFactory)
-        {
-            _dataSession = dataSession;
-        }
-
-        protected override async Task<IReadOnlyCollection<SessionFrequentTimeModel>> Process(SessionFrequentTimeQuery request, CancellationToken cancellationToken)
-        {
-            var results = await _dataSession
-                .StoredProcedure("[IQ].[FrequentSessionTimes]")
-                .Parameter("@tenantId", request.TenantId)
-                .QueryAsync(r =>
+        _dataSession = dataSession;
+    }
+
+    protected override async Task<IReadOnlyCollection<SessionFrequentTimeModel>> Process(SessionFrequentTimeQuery request, CancellationToken cancellationToken)
+    {
+        var results = await _dataSession
+            .StoredProcedure("[IQ].[FrequentSessionTimes]")
+            .Parameter("@tenantId", request.TenantId)
+            .QueryAsync(r =>
+            {
+                var reader = r as SqlDataReader;
+                return new SessionFrequentTimeModel
                 {
-                    var reader = r as SqlDataReader;
-                    return new SessionFrequentTimeModel
-                    {
-                        StartTime = reader.GetTimeSpan(0),
-                        EndTime = reader.GetTimeSpan(1),
-                        Count = r.GetInt32(2)
-                    };
-                }, cancellationToken);
-
-            return results.ToList();
-        }
+                    StartTime = reader.GetTimeSpan(0),
+                    EndTime = reader.GetTimeSpan(1),
+                    Count = r.GetInt32(2)
+                };
+            }, cancellationToken);
+
+        return results.ToList();
     }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Session/Handlers/SessionHistoryQueryHandler.cs b/service/src/InstructorIQ.Core/Domain/Session/Handlers/SessionHistoryQueryHandler.cs
index d72ffd30..0ae7230a 100644
--- a/service/src/InstructorIQ.Core/Domain/Session/Handlers/SessionHistoryQueryHandler.cs
+++ b/service/src/InstructorIQ.Core/Domain/Session/Handlers/SessionHistoryQueryHandler.cs
@@ -1,105 +1,107 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+
 using AutoMapper;
 using AutoMapper.QueryableExtensions;
+
 using InstructorIQ.Core.Data;
 using InstructorIQ.Core.Data.Entities;
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Domain.Queries;
 using InstructorIQ.Core.Extensions;
+
 using MediatR.CommandQuery.Audit;
 using MediatR.CommandQuery.EntityFrameworkCore.Handlers;
+
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 
-namespace InstructorIQ.Core.Domain.Handlers
+namespace InstructorIQ.Core.Domain.Handlers;
+
+public class SessionHistoryQueryHandler : DataContextHandlerBase<InstructorIQContext, SessionHistoryQuery, IReadOnlyCollection<AuditRecord<Guid>>>
 {
-    public class SessionHistoryQueryHandler : DataContextHandlerBase<InstructorIQContext, SessionHistoryQuery, IReadOnlyCollection<AuditRecord<Guid>>>
+    private readonly IChangeCollector<Guid, SessionReadModel> _changeCollector;
+
+    public SessionHistoryQueryHandler(ILoggerFactory loggerFactory, InstructorIQContext dataContext, IMapper mapper, IChangeCollector<Guid, SessionReadModel> changeCollector) : base(loggerFactory, dataContext, mapper)
     {
-        private readonly IChangeCollector<Guid, SessionReadModel> _changeCollector;
+        _changeCollector = changeCollector;
+    }
+
+    protected override async Task<IReadOnlyCollection<AuditRecord<Guid>>> Process(SessionHistoryQuery request, CancellationToken cancellationToken)
+    {
+        var parameters = new List<object>();
 
-        public SessionHistoryQueryHandler(ILoggerFactory loggerFactory, InstructorIQContext dataContext, IMapper mapper, IChangeCollector<Guid, SessionReadModel> changeCollector) : base(loggerFactory, dataContext, mapper)
+        var sql = new StringBuilder();
+        sql.AppendLine("SELECT *");
+        sql.AppendLine("FROM [IQ].[Session]");
+        sql.AppendLine("FOR SYSTEM_TIME ALL");
+
+        if (request.Id.HasValue)
+        {
+            sql.AppendLine("WHERE [Id] = {0}");
+            parameters.Add(request.Id.Value);
+        }
+        else if (request.TopicId.HasValue)
         {
-            _changeCollector = changeCollector;
+            sql.AppendLine("WHERE [TopicId] = {0}");
+            parameters.Add(request.TopicId.Value);
         }
 
-        protected override async Task<IReadOnlyCollection<AuditRecord<Guid>>> Process(SessionHistoryQuery request, CancellationToken cancellationToken)
+        var entities = await DataContext.Sessions
+            .FromSqlRaw(sql.ToString(), parameters.ToArray())
+            .AsNoTracking()
+            .OrderBy(p => p.PeriodEnd)
+            .ProjectTo<SessionReadModel>(Mapper.ConfigurationProvider)
+            .ToListAsync(cancellationToken);
+
+        var historyList = new List<AuditRecord<Guid>>();
+
+        // group changes by id
+        foreach (var group in entities.GroupBy(p => p.Id))
         {
-            var parameters = new List<object>();
-
-            var sql = new StringBuilder();
-            sql.AppendLine("SELECT *");
-            sql.AppendLine("FROM [IQ].[Session]");
-            sql.AppendLine("FOR SYSTEM_TIME ALL");
-
-            if (request.Id.HasValue)
-            {
-                sql.AppendLine("WHERE [Id] = {0}");
-                parameters.Add(request.Id.Value);
-            }
-            else if (request.TopicId.HasValue)
-            {
-                sql.AppendLine("WHERE [TopicId] = {0}");
-                parameters.Add(request.TopicId.Value);
-            }
-
-            var entities = await DataContext.Sessions
-                .FromSqlRaw(sql.ToString(), parameters.ToArray())
-                .AsNoTracking()
+            var groupList = group
                 .OrderBy(p => p.PeriodEnd)
-                .ProjectTo<SessionReadModel>(Mapper.ConfigurationProvider)
-                .ToListAsync(cancellationToken);
+                .ToList();
 
-            var historyList = new List<AuditRecord<Guid>>();
+            var changeList = _changeCollector.CollectChanges(groupList, nameof(Session), SessionDescription);
+            historyList.AddRange(changeList);
+        }
 
-            // group changes by id
-            foreach (var group in entities.GroupBy(p => p.Id))
-            {
-                var groupList = group
-                    .OrderBy(p=> p.PeriodEnd)
-                    .ToList();
+        return historyList.ToList();
 
-                var changeList = _changeCollector.CollectChanges(groupList, nameof(Session), SessionDescription);
-                historyList.AddRange(changeList);
-            }
+    }
 
-            return historyList.ToList();
+    private static string SessionDescription(SessionReadModel model)
+    {
+        var builder = new StringBuilder();
+        builder.Append(model.TopicTitle);
 
+        if (model.GroupName.HasValue())
+        {
+            builder.Append(" - ");
+            builder.Append(model.GroupName);
         }
 
-        private static string SessionDescription(SessionReadModel model)
+        if (model.StartDate.HasValue)
         {
-            var builder = new StringBuilder();
-            builder.Append(model.TopicTitle);
-
-            if (model.GroupName.HasValue())
-            {
-                builder.Append(" - ");
-                builder.Append(model.GroupName);
-            }
-
-            if (model.StartDate.HasValue)
-            {
-                builder.Append(" - ");
-                builder.Append(model.StartDate.Value.ToString("MMM dd"));
-            }
-            if (model.StartTime.HasValue)
-            {
-                builder.Append(" ");
-                builder.Append(model.StartTime.Value.ToString(@"hh\:mm"));
-            }
-            if (model.EndTime.HasValue)
-            {
-                builder.Append("-");
-                builder.Append(model.EndTime.Value.ToString(@"hh\:mm"));
-            }
-
-            return builder.ToString();
+            builder.Append(" - ");
+            builder.Append(model.StartDate.Value.ToString("MMM dd"));
+        }
+        if (model.StartTime.HasValue)
+        {
+            builder.Append(" ");
+            builder.Append(model.StartTime.Value.ToString(@"hh\:mm"));
+        }
+        if (model.EndTime.HasValue)
+        {
+            builder.Append("-");
+            builder.Append(model.EndTime.Value.ToString(@"hh\:mm"));
         }
-    }
 
+        return builder.ToString();
+    }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Session/Handlers/SessionInstructorHistoryQueryHandler.cs b/service/src/InstructorIQ.Core/Domain/Session/Handlers/SessionInstructorHistoryQueryHandler.cs
index ed4c5cb1..55d6d579 100644
--- a/service/src/InstructorIQ.Core/Domain/Session/Handlers/SessionInstructorHistoryQueryHandler.cs
+++ b/service/src/InstructorIQ.Core/Domain/Session/Handlers/SessionInstructorHistoryQueryHandler.cs
@@ -1,76 +1,78 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+
 using AutoMapper;
 using AutoMapper.QueryableExtensions;
+
 using InstructorIQ.Core.Data;
 using InstructorIQ.Core.Data.Entities;
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Domain.Queries;
 using InstructorIQ.Core.Extensions;
+
 using MediatR.CommandQuery.Audit;
 using MediatR.CommandQuery.EntityFrameworkCore.Handlers;
+
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 
-namespace InstructorIQ.Core.Domain.Handlers
+namespace InstructorIQ.Core.Domain.Handlers;
+
+public class SessionInstructorHistoryQueryHandler : DataContextHandlerBase<InstructorIQContext, SessionInstructorHistoryQuery, IReadOnlyCollection<AuditRecord<Guid>>>
 {
-    public class SessionInstructorHistoryQueryHandler : DataContextHandlerBase<InstructorIQContext, SessionInstructorHistoryQuery, IReadOnlyCollection<AuditRecord<Guid>>>
+    private readonly IChangeCollector<Guid, SessionInstructorModel> _changeCollector;
+
+    public SessionInstructorHistoryQueryHandler(ILoggerFactory loggerFactory, InstructorIQContext dataContext, IMapper mapper, IChangeCollector<Guid, SessionInstructorModel> changeCollector) : base(loggerFactory, dataContext, mapper)
     {
-        private readonly IChangeCollector<Guid, SessionInstructorModel> _changeCollector;
+        _changeCollector = changeCollector;
+    }
+
+    protected override async Task<IReadOnlyCollection<AuditRecord<Guid>>> Process(SessionInstructorHistoryQuery request, CancellationToken cancellationToken)
+    {
+        var parameters = new List<object>();
+
+        var sql = new StringBuilder();
+        sql.AppendLine("SELECT S.*");
+        sql.AppendLine("FROM [IQ].[SessionInstructor]");
+        sql.AppendLine("FOR SYSTEM_TIME ALL AS S");
 
-        public SessionInstructorHistoryQueryHandler(ILoggerFactory loggerFactory, InstructorIQContext dataContext, IMapper mapper, IChangeCollector<Guid, SessionInstructorModel> changeCollector) : base(loggerFactory, dataContext, mapper)
+        if (request.SessionId.HasValue)
         {
-            _changeCollector = changeCollector;
+            sql.AppendLine("WHERE S.[SessionId] = {0}");
+            parameters.Add(request.SessionId.Value);
         }
-
-        protected override async Task<IReadOnlyCollection<AuditRecord<Guid>>> Process(SessionInstructorHistoryQuery request, CancellationToken cancellationToken)
+        else if (request.TopicId.HasValue)
         {
-            var parameters = new List<object>();
-
-            var sql = new StringBuilder();
-            sql.AppendLine("SELECT S.*");
-            sql.AppendLine("FROM [IQ].[SessionInstructor]");
-            sql.AppendLine("FOR SYSTEM_TIME ALL AS S");
-
-            if (request.SessionId.HasValue)
-            {
-                sql.AppendLine("WHERE S.[SessionId] = {0}");
-                parameters.Add(request.SessionId.Value);
-            }
-            else if (request.TopicId.HasValue)
-            {
-                sql.AppendLine("INNER JOIN [IQ].[Session] AS J ON J.[Id] = S.[SessionId]");
-                sql.AppendLine("WHERE J.[TopicId] = {0}");
-                parameters.Add(request.TopicId.Value);
-            }
-
-            var entities = await DataContext.SessionInstructors
-                .FromSqlRaw(sql.ToString(), parameters.ToArray())
-                .AsNoTracking()
-                .OrderBy(p => p.PeriodEnd)
-                .ProjectTo<SessionInstructorModel>(Mapper.ConfigurationProvider)
-                .ToListAsync(cancellationToken);
-
-            var historyList = new List<AuditRecord<Guid>>();
+            sql.AppendLine("INNER JOIN [IQ].[Session] AS J ON J.[Id] = S.[SessionId]");
+            sql.AppendLine("WHERE J.[TopicId] = {0}");
+            parameters.Add(request.TopicId.Value);
+        }
 
-            // group changes by id
-            foreach (var group in entities.GroupBy(p => p.Id))
-            {
-                var groupList = group
-                    .OrderBy(p => p.PeriodEnd)
-                    .ToList();
+        var entities = await DataContext.SessionInstructors
+            .FromSqlRaw(sql.ToString(), parameters.ToArray())
+            .AsNoTracking()
+            .OrderBy(p => p.PeriodEnd)
+            .ProjectTo<SessionInstructorModel>(Mapper.ConfigurationProvider)
+            .ToListAsync(cancellationToken);
 
-                var changeList = _changeCollector.CollectChanges(groupList, nameof(SessionInstructor), s => s.DisplayName);
-                historyList.AddRange(changeList);
-            }
+        var historyList = new List<AuditRecord<Guid>>();
 
-            return historyList.ToList();
+        // group changes by id
+        foreach (var group in entities.GroupBy(p => p.Id))
+        {
+            var groupList = group
+                .OrderBy(p => p.PeriodEnd)
+                .ToList();
 
+            var changeList = _changeCollector.CollectChanges(groupList, nameof(SessionInstructor), s => s.DisplayName);
+            historyList.AddRange(changeList);
         }
-    }
 
+        return historyList.ToList();
+
+    }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Session/Handlers/SessionInstructorQueryHandler.cs b/service/src/InstructorIQ.Core/Domain/Session/Handlers/SessionInstructorQueryHandler.cs
index d3931929..6a805409 100644
--- a/service/src/InstructorIQ.Core/Domain/Session/Handlers/SessionInstructorQueryHandler.cs
+++ b/service/src/InstructorIQ.Core/Domain/Session/Handlers/SessionInstructorQueryHandler.cs
@@ -1,45 +1,48 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+
 using AutoMapper;
+
 using InstructorIQ.Core.Data;
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Domain.Queries;
+
 using MediatR.CommandQuery.EntityFrameworkCore.Handlers;
+
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Handlers
+namespace InstructorIQ.Core.Domain.Handlers;
+
+public class SessionInstructorQueryHandler : DataContextHandlerBase<InstructorIQContext, SessionInstructorQuery, IReadOnlyCollection<SessionInstructorModel>>
 {
-    public class SessionInstructorQueryHandler : DataContextHandlerBase<InstructorIQContext, SessionInstructorQuery, IReadOnlyCollection<SessionInstructorModel>>
+    public SessionInstructorQueryHandler(ILoggerFactory loggerFactory, InstructorIQContext dataContext, IMapper mapper)
+        : base(loggerFactory, dataContext, mapper)
     {
-        public SessionInstructorQueryHandler(ILoggerFactory loggerFactory, InstructorIQContext dataContext, IMapper mapper)
-            : base(loggerFactory, dataContext, mapper)
-        {
-
-        }
-
-        protected override async Task<IReadOnlyCollection<SessionInstructorModel>> Process(SessionInstructorQuery request, CancellationToken cancellationToken)
-        {
-            var query = DataContext.SessionInstructors
-                .AsNoTracking()
-                .Where(s => s.SessionId == request.SessionId);
-
-            var result = await query
-                .Select(s => new SessionInstructorModel
-                {
-                    SessionId = s.SessionId,
-                    InstructorId = s.InstructorId,
-                    DisplayName = s.Instructor.DisplayName,
-                    FamilyName = s.Instructor.FamilyName,
-                    GivenName = s.Instructor.GivenName
-                })
-                .OrderBy(s => s.DisplayName)
-                .ToListAsync(cancellationToken);
-
-            return result;
-        }
+
+    }
+
+    protected override async Task<IReadOnlyCollection<SessionInstructorModel>> Process(SessionInstructorQuery request, CancellationToken cancellationToken)
+    {
+        var query = DataContext.SessionInstructors
+            .AsNoTracking()
+            .Where(s => s.SessionId == request.SessionId);
+
+        var result = await query
+            .Select(s => new SessionInstructorModel
+            {
+                SessionId = s.SessionId,
+                InstructorId = s.InstructorId,
+                DisplayName = s.Instructor.DisplayName,
+                FamilyName = s.Instructor.FamilyName,
+                GivenName = s.Instructor.GivenName
+            })
+            .OrderBy(s => s.DisplayName)
+            .ToListAsync(cancellationToken);
+
+        return result;
     }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.Core/Domain/Session/Handlers/SessionInstructorUpdateCommandHandler.cs b/service/src/InstructorIQ.Core/Domain/Session/Handlers/SessionInstructorUpdateCommandHandler.cs
index b11c0362..1e84d21f 100644
--- a/service/src/InstructorIQ.Core/Domain/Session/Handlers/SessionInstructorUpdateCommandHandler.cs
+++ b/service/src/InstructorIQ.Core/Domain/Session/Handlers/SessionInstructorUpdateCommandHandler.cs
@@ -1,105 +1,108 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net;
 using System.Threading;
 using System.Threading.Tasks;
+
 using AutoMapper;
+
 using InstructorIQ.Core.Data;
 using InstructorIQ.Core.Data.Entities;
 using InstructorIQ.Core.Domain.Commands;
+
 using MediatR.CommandQuery;
 using MediatR.CommandQuery.EntityFrameworkCore.Handlers;
 using MediatR.CommandQuery.Models;
+
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 
-namespace InstructorIQ.Core.Domain.Handlers
+namespace InstructorIQ.Core.Domain.Handlers;
+
+public class SessionInstructorUpdateCommandHandler : DataContextHandlerBase<InstructorIQContext, SessionInstructorUpdateCommand, CompleteModel>
 {
-    public class SessionInstructorUpdateCommandHandler : DataContextHandlerBase<InstructorIQContext, SessionInstructorUpdateCommand, CompleteModel>
+    public SessionInstructorUpdateCommandHandler(ILoggerFactory loggerFactory, InstructorIQContext dataContext, IMapper mapper)
+        : base(loggerFactory, dataContext, mapper)
     {
-        public SessionInstructorUpdateCommandHandler(ILoggerFactory loggerFactory, InstructorIQContext dataContext, IMapper mapper)
-            : base(loggerFactory, dataContext, mapper)
-        {
-        }
+    }
 
-        protected override async Task<CompleteModel> Process(SessionInstructorUpdateCommand request, CancellationToken cancellationToken)
-        {
-            var sessionId = request.SessionId;
-            var session = await DataContext.Sessions.FindAsync(sessionId);
-            if (session == null)
-                throw new DomainException(HttpStatusCode.NotFound, $"Session with id '{sessionId}' not found.");
+    protected override async Task<CompleteModel> Process(SessionInstructorUpdateCommand request, CancellationToken cancellationToken)
+    {
+        var sessionId = request.SessionId;
+        var session = await DataContext.Sessions.FindAsync(sessionId);
+        if (session == null)
+            throw new DomainException(HttpStatusCode.NotFound, $"Session with id '{sessionId}' not found.");
 
-            var identityName = request.Principal?.Identity?.Name;
+        var identityName = request.Principal?.Identity?.Name;
 
-            var existingInstructors = await DataContext.SessionInstructors
-                .Where(s => s.SessionId == sessionId)
-                .ToListAsync(cancellationToken);
+        var existingInstructors = await DataContext.SessionInstructors
+            .Where(s => s.SessionId == sessionId)
+            .ToListAsync(cancellationToken);
 
-            var updatedInstructors = request.Instructors ?? new List<Guid>();
+        var updatedInstructors = request.Instructors ?? new List<Guid>();
 
-            AddInstructors(existingInstructors, updatedInstructors, sessionId);
-            RemoveInstructors(existingInstructors, updatedInstructors, sessionId);
+        AddInstructors(existingInstructors, updatedInstructors, sessionId);
+        RemoveInstructors(existingInstructors, updatedInstructors, sessionId);
 
-            session.Updated = DateTimeOffset.UtcNow;
-            session.UpdatedBy = identityName;
+        session.Updated = DateTimeOffset.UtcNow;
+        session.UpdatedBy = identityName;
 
-            await DataContext.SaveChangesAsync(cancellationToken);
+        await DataContext.SaveChangesAsync(cancellationToken);
 
-            return new CompleteModel();
-        }
+        return new CompleteModel();
+    }
 
-        private void RemoveInstructors(IReadOnlyCollection<SessionInstructor> existingInstructors, IEnumerable<Guid> updated, Guid sessionId)
-        {
-            if (existingInstructors.Count == 0)
-                return;
+    private void RemoveInstructors(IReadOnlyCollection<SessionInstructor> existingInstructors, IEnumerable<Guid> updated, Guid sessionId)
+    {
+        if (existingInstructors.Count == 0)
+            return;
 
-            var existing = existingInstructors
-                .Select(i => i.InstructorId)
-                .ToList();
+        var existing = existingInstructors
+            .Select(i => i.InstructorId)
+            .ToList();
 
-            var remove = existing
-                .Except(updated)
-                .ToList();
+        var remove = existing
+            .Except(updated)
+            .ToList();
 
-            if (remove.Count == 0)
-                return;
+        if (remove.Count == 0)
+            return;
 
-            foreach (var instructorId in remove)
-            {
-                var sessionInstructor = existingInstructors
-                    .FirstOrDefault(s => s.SessionId == sessionId && s.InstructorId == instructorId);
+        foreach (var instructorId in remove)
+        {
+            var sessionInstructor = existingInstructors
+                .FirstOrDefault(s => s.SessionId == sessionId && s.InstructorId == instructorId);
 
-                if (sessionInstructor == null)
-                    continue;
+            if (sessionInstructor == null)
+                continue;
 
-                DataContext.SessionInstructors.Remove(sessionInstructor);
-            }
+            DataContext.SessionInstructors.Remove(sessionInstructor);
         }
+    }
 
-        private void AddInstructors(IReadOnlyCollection<SessionInstructor> existingInstructors, IEnumerable<Guid> updated, Guid sessionId)
-        {
-            var existing = existingInstructors
-                .Select(i => i.InstructorId)
-                .ToList();
+    private void AddInstructors(IReadOnlyCollection<SessionInstructor> existingInstructors, IEnumerable<Guid> updated, Guid sessionId)
+    {
+        var existing = existingInstructors
+            .Select(i => i.InstructorId)
+            .ToList();
 
-            var insert = updated
-                .Except(existing)
-                .ToList();
+        var insert = updated
+            .Except(existing)
+            .ToList();
 
-            if (insert.Count == 0)
-                return;
+        if (insert.Count == 0)
+            return;
 
-            foreach (var instructorId in insert)
+        foreach (var instructorId in insert)
+        {
+            var sessionInstructor = new SessionInstructor
             {
-                var sessionInstructor = new SessionInstructor
-                {
-                    SessionId = sessionId,
-                    InstructorId = instructorId
-                };
-
-                DataContext.SessionInstructors.Add(sessionInstructor);
-            }
+                SessionId = sessionId,
+                InstructorId = instructorId
+            };
+
+            DataContext.SessionInstructors.Add(sessionInstructor);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.Core/Domain/Session/Handlers/SessionMultipleUpdateCommandHandler.cs b/service/src/InstructorIQ.Core/Domain/Session/Handlers/SessionMultipleUpdateCommandHandler.cs
index a3c9fdb4..1b661b04 100644
--- a/service/src/InstructorIQ.Core/Domain/Session/Handlers/SessionMultipleUpdateCommandHandler.cs
+++ b/service/src/InstructorIQ.Core/Domain/Session/Handlers/SessionMultipleUpdateCommandHandler.cs
@@ -1,143 +1,146 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net;
 using System.Threading;
 using System.Threading.Tasks;
+
 using AutoMapper;
+
 using InstructorIQ.Core.Data;
 using InstructorIQ.Core.Data.Entities;
 using InstructorIQ.Core.Domain.Commands;
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Security;
+
 using MediatR.CommandQuery;
 using MediatR.CommandQuery.EntityFrameworkCore.Handlers;
 using MediatR.CommandQuery.Models;
+
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Handlers
+namespace InstructorIQ.Core.Domain.Handlers;
+
+public class SessionMultipleUpdateCommandHandler : DataContextHandlerBase<InstructorIQContext, SessionMultipleUpdateCommand, CompleteModel>
 {
-    public class SessionMultipleUpdateCommandHandler : DataContextHandlerBase<InstructorIQContext, SessionMultipleUpdateCommand, CompleteModel>
+    public SessionMultipleUpdateCommandHandler(ILoggerFactory loggerFactory, InstructorIQContext dataContext, IMapper mapper)
+        : base(loggerFactory, dataContext, mapper)
     {
-        public SessionMultipleUpdateCommandHandler(ILoggerFactory loggerFactory, InstructorIQContext dataContext, IMapper mapper)
-            : base(loggerFactory, dataContext, mapper)
-        {
-        }
+    }
 
-        protected override async Task<CompleteModel> Process(SessionMultipleUpdateCommand request, CancellationToken cancellationToken)
+    protected override async Task<CompleteModel> Process(SessionMultipleUpdateCommand request, CancellationToken cancellationToken)
+    {
+        foreach (var updateModel in request.Models)
         {
-            foreach (var updateModel in request.Models)
-            {
-                string userName = request.Principal?.Identity?.Name;
-
-                await UpdateSession(updateModel, userName);
-            }
+            string userName = request.Principal?.Identity?.Name;
 
-            return new CompleteModel();
+            await UpdateSession(updateModel, userName);
         }
 
-        private async Task UpdateSession(SessionMultipleUpdateModel updateModel, string identityName)
+        return new CompleteModel();
+    }
+
+    private async Task UpdateSession(SessionMultipleUpdateModel updateModel, string identityName)
+    {
+        var session = await DataContext.Sessions.FindAsync(updateModel.Id);
+        if (session == null)
         {
-            var session = await DataContext.Sessions.FindAsync(updateModel.Id);
-            if (session == null)
+            session = new Session
             {
-                session = new Session
-                {
-                    Id = updateModel.Id,
-                    TenantId = updateModel.TenantId,
-                    TopicId = updateModel.TopicId,
-                    Created = DateTimeOffset.UtcNow,
-                    CreatedBy = identityName,
-                };
-                await DataContext.Sessions.AddAsync(session);
-            }
-
-            session.StartDate = updateModel.StartDate;
-            session.StartTime = updateModel.StartTime;
-            session.EndDate = updateModel.EndDate;
-            session.EndTime = updateModel.EndTime;
-            session.LocationId = updateModel.LocationId;
-            session.GroupId = updateModel.GroupId;
-            session.LeadInstructorId = updateModel.LeadInstructorId;
-            session.Note = updateModel.Note;
-
-            session.Updated = DateTimeOffset.UtcNow;
-            session.UpdatedBy = identityName;
-
-            await DataContext.SaveChangesAsync();
-
-            // update instructors
-            var sessionId = session.Id;
-            var existingInstructors = await DataContext.SessionInstructors
-                .Where(s => s.SessionId == sessionId)
-                .ToListAsync();
-
-            var updatedInstructors = updateModel.AdditionalInstructors ?? new List<Guid>();
-
-            AddInstructors(existingInstructors, updatedInstructors, sessionId);
-            RemoveInstructors(existingInstructors, updatedInstructors, sessionId);
-
-            await DataContext.SaveChangesAsync();
+                Id = updateModel.Id,
+                TenantId = updateModel.TenantId,
+                TopicId = updateModel.TopicId,
+                Created = DateTimeOffset.UtcNow,
+                CreatedBy = identityName,
+            };
+            await DataContext.Sessions.AddAsync(session);
         }
 
+        session.StartDate = updateModel.StartDate;
+        session.StartTime = updateModel.StartTime;
+        session.EndDate = updateModel.EndDate;
+        session.EndTime = updateModel.EndTime;
+        session.LocationId = updateModel.LocationId;
+        session.GroupId = updateModel.GroupId;
+        session.LeadInstructorId = updateModel.LeadInstructorId;
+        session.Note = updateModel.Note;
 
-        private void RemoveInstructors(IReadOnlyCollection<SessionInstructor> existingInstructors, IEnumerable<Guid> updated, Guid sessionId)
-        {
-            if (existingInstructors.Count == 0)
-                return;
+        session.Updated = DateTimeOffset.UtcNow;
+        session.UpdatedBy = identityName;
 
-            var existing = existingInstructors
-                .Select(i => i.InstructorId)
-                .ToList();
+        await DataContext.SaveChangesAsync();
 
-            var remove = existing
-                .Except(updated)
-                .ToList();
+        // update instructors
+        var sessionId = session.Id;
+        var existingInstructors = await DataContext.SessionInstructors
+            .Where(s => s.SessionId == sessionId)
+            .ToListAsync();
 
-            if (remove.Count == 0)
-                return;
+        var updatedInstructors = updateModel.AdditionalInstructors ?? new List<Guid>();
 
-            foreach (var instructorId in remove)
-            {
-                var sessionInstructor = existingInstructors
-                    .FirstOrDefault(s => s.SessionId == sessionId && s.InstructorId == instructorId);
+        AddInstructors(existingInstructors, updatedInstructors, sessionId);
+        RemoveInstructors(existingInstructors, updatedInstructors, sessionId);
 
-                if (sessionInstructor == null)
-                    continue;
+        await DataContext.SaveChangesAsync();
+    }
 
-                DataContext.SessionInstructors.Remove(sessionInstructor);
-            }
-        }
 
-        private void AddInstructors(IReadOnlyCollection<SessionInstructor> existingInstructors, IEnumerable<Guid> updated, Guid sessionId)
+    private void RemoveInstructors(IReadOnlyCollection<SessionInstructor> existingInstructors, IEnumerable<Guid> updated, Guid sessionId)
+    {
+        if (existingInstructors.Count == 0)
+            return;
+
+        var existing = existingInstructors
+            .Select(i => i.InstructorId)
+            .ToList();
+
+        var remove = existing
+            .Except(updated)
+            .ToList();
+
+        if (remove.Count == 0)
+            return;
+
+        foreach (var instructorId in remove)
         {
-            if (updated == null)
-                return;
+            var sessionInstructor = existingInstructors
+                .FirstOrDefault(s => s.SessionId == sessionId && s.InstructorId == instructorId);
+
+            if (sessionInstructor == null)
+                continue;
+
+            DataContext.SessionInstructors.Remove(sessionInstructor);
+        }
+    }
+
+    private void AddInstructors(IReadOnlyCollection<SessionInstructor> existingInstructors, IEnumerable<Guid> updated, Guid sessionId)
+    {
+        if (updated == null)
+            return;
 
-            var existing = existingInstructors
-                .Select(i => i.InstructorId)
-                .ToList();
+        var existing = existingInstructors
+            .Select(i => i.InstructorId)
+            .ToList();
 
-            var insert = updated
-                .Except(existing)
-                .ToList();
+        var insert = updated
+            .Except(existing)
+            .ToList();
 
-            if (insert.Count == 0)
-                return;
+        if (insert.Count == 0)
+            return;
 
-            foreach (var instructorId in insert)
+        foreach (var instructorId in insert)
+        {
+            var sessionInstructor = new SessionInstructor
             {
-                var sessionInstructor = new SessionInstructor
-                {
-                    SessionId = sessionId,
-                    InstructorId = instructorId
-                };
-
-                DataContext.SessionInstructors.Add(sessionInstructor);
-            }
-        }
+                SessionId = sessionId,
+                InstructorId = instructorId
+            };
 
+            DataContext.SessionInstructors.Add(sessionInstructor);
+        }
     }
-}
\ No newline at end of file
+
+}
diff --git a/service/src/InstructorIQ.Core/Domain/Session/Handlers/SessionSequenceCreateCommandHandler.cs b/service/src/InstructorIQ.Core/Domain/Session/Handlers/SessionSequenceCreateCommandHandler.cs
index b211cd8d..385e9570 100644
--- a/service/src/InstructorIQ.Core/Domain/Session/Handlers/SessionSequenceCreateCommandHandler.cs
+++ b/service/src/InstructorIQ.Core/Domain/Session/Handlers/SessionSequenceCreateCommandHandler.cs
@@ -1,78 +1,82 @@
-using System;
+using System;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+
 using AutoMapper;
+
 using InstructorIQ.Core.Data;
 using InstructorIQ.Core.Data.Entities;
 using InstructorIQ.Core.Domain.Commands;
 using InstructorIQ.Core.Security;
+
 using MediatR.CommandQuery.EntityFrameworkCore.Handlers;
 using MediatR.CommandQuery.Models;
+
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
+
 using NaturalSort.Extension;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Handlers
+namespace InstructorIQ.Core.Domain.Handlers;
+
+public class SessionSequenceCreateCommandHandler : DataContextHandlerBase<InstructorIQContext, SessionSequenceCreateCommand, CompleteModel>
 {
-    public class SessionSequenceCreateCommandHandler : DataContextHandlerBase<InstructorIQContext, SessionSequenceCreateCommand, CompleteModel>
+    private readonly UserClaimManager _userClaimManager;
+
+    public SessionSequenceCreateCommandHandler(ILoggerFactory loggerFactory, InstructorIQContext dataContext, IMapper mapper, UserClaimManager userClaimManager)
+        : base(loggerFactory, dataContext, mapper)
     {
-        private readonly UserClaimManager _userClaimManager;
+        _userClaimManager = userClaimManager;
+    }
 
-        public SessionSequenceCreateCommandHandler(ILoggerFactory loggerFactory, InstructorIQContext dataContext, IMapper mapper, UserClaimManager userClaimManager)
-            : base(loggerFactory, dataContext, mapper)
-        {
-            _userClaimManager = userClaimManager;
-        }
+    protected override async Task<CompleteModel> Process(SessionSequenceCreateCommand request, CancellationToken cancellationToken)
+    {
+        var tenantId = _userClaimManager.GetRequiredTenantId(request.Principal);
+        var identityName = request.Principal?.Identity?.Name;
+
+        // load topic
+        var topics = await DataContext.Topics
+            .Where(g => g.TenantId == tenantId)
+            .Where(g => request.TopicIds.Contains(g.Id))
+            .ToListAsync(cancellationToken);
+
+        // load groups by sequence
+        var groups = await DataContext.Groups
+            .Where(g => g.TenantId == tenantId)
+            .Where(g => request.Sequences.Contains(g.Sequence))
+            .ToListAsync(cancellationToken);
 
-        protected override async Task<CompleteModel> Process(SessionSequenceCreateCommand request, CancellationToken cancellationToken)
+        var orderedGroups = groups
+            .OrderBy(g => g.Sequence)
+            .ThenBy(g => g.Name, StringComparer.OrdinalIgnoreCase.WithNaturalSort())
+            .ToList();
+
+        // create groups
+        foreach (var topic in topics)
         {
-            var tenantId = _userClaimManager.GetRequiredTenantId(request.Principal);
-            var identityName = request.Principal?.Identity?.Name;
-
-            // load topic
-            var topics = await DataContext.Topics
-                .Where(g => g.TenantId == tenantId)
-                .Where(g => request.TopicIds.Contains(g.Id))
-                .ToListAsync(cancellationToken);
-
-            // load groups by sequence
-            var groups = await DataContext.Groups
-                .Where(g => g.TenantId == tenantId)
-                .Where(g => request.Sequences.Contains(g.Sequence))
-                .ToListAsync(cancellationToken);
-
-            var orderedGroups = groups
-                .OrderBy(g => g.Sequence)
-                .ThenBy(g => g.Name, StringComparer.OrdinalIgnoreCase.WithNaturalSort())
-                .ToList();
-
-            // create groups
-            foreach (var topic in topics)
+            foreach (var group in orderedGroups)
             {
-                foreach (var group in orderedGroups)
+                var session = new Session
                 {
-                    var session = new Session
-                    {
-                        TopicId = topic.Id,
-                        LeadInstructorId = topic.LeadInstructorId,
-                        TenantId = topic.TenantId,
-                        GroupId = group.Id,
-                        Created = DateTimeOffset.UtcNow,
-                        CreatedBy = identityName,
-                        Updated = DateTimeOffset.UtcNow,
-                        UpdatedBy = identityName
-                    };
-
-                    DataContext.Sessions.Add(session);
-                }
-            }
+                    TopicId = topic.Id,
+                    LeadInstructorId = topic.LeadInstructorId,
+                    TenantId = topic.TenantId,
+                    GroupId = group.Id,
+                    Created = DateTimeOffset.UtcNow,
+                    CreatedBy = identityName,
+                    Updated = DateTimeOffset.UtcNow,
+                    UpdatedBy = identityName
+                };
 
-            await DataContext.SaveChangesAsync(cancellationToken);
-
-            return new CompleteModel();
+                DataContext.Sessions.Add(session);
+            }
         }
 
+        await DataContext.SaveChangesAsync(cancellationToken);
+
+        return new CompleteModel();
     }
-}
\ No newline at end of file
+
+}
diff --git a/service/src/InstructorIQ.Core/Domain/Session/Handlers/SessionTopicQueryHandler.cs b/service/src/InstructorIQ.Core/Domain/Session/Handlers/SessionTopicQueryHandler.cs
index 12613848..6dcdb976 100644
--- a/service/src/InstructorIQ.Core/Domain/Session/Handlers/SessionTopicQueryHandler.cs
+++ b/service/src/InstructorIQ.Core/Domain/Session/Handlers/SessionTopicQueryHandler.cs
@@ -1,37 +1,40 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+
 using AutoMapper;
 using AutoMapper.QueryableExtensions;
+
 using InstructorIQ.Core.Data;
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Domain.Queries;
+
 using MediatR.CommandQuery.EntityFrameworkCore.Handlers;
+
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Handlers
+namespace InstructorIQ.Core.Domain.Handlers;
+
+public class SessionTopicQueryHandler : DataContextHandlerBase<InstructorIQContext, SessionTopicQuery, IReadOnlyCollection<SessionCalendarModel>>
 {
-    public class SessionTopicQueryHandler : DataContextHandlerBase<InstructorIQContext, SessionTopicQuery, IReadOnlyCollection<SessionCalendarModel>>
+    public SessionTopicQueryHandler(ILoggerFactory loggerFactory, InstructorIQContext dataContext, IMapper mapper)
+        : base(loggerFactory, dataContext, mapper)
     {
-        public SessionTopicQueryHandler(ILoggerFactory loggerFactory, InstructorIQContext dataContext, IMapper mapper)
-            : base(loggerFactory, dataContext, mapper)
-        {
-        }
-
-        protected override async Task<IReadOnlyCollection<SessionCalendarModel>> Process(SessionTopicQuery request, CancellationToken cancellationToken)
-        {
-            var query = DataContext.Sessions
-                .AsNoTracking()
-                .Where(s => request.TopicIds.Contains(s.TopicId));
-
-            var result = await query
-                .ProjectTo<SessionCalendarModel>(Mapper.ConfigurationProvider)
-                .ToListAsync(cancellationToken);
-
-            return result;
-        }
+    }
+
+    protected override async Task<IReadOnlyCollection<SessionCalendarModel>> Process(SessionTopicQuery request, CancellationToken cancellationToken)
+    {
+        var query = DataContext.Sessions
+            .AsNoTracking()
+            .Where(s => request.TopicIds.Contains(s.TopicId));
+
+        var result = await query
+            .ProjectTo<SessionCalendarModel>(Mapper.ConfigurationProvider)
+            .ToListAsync(cancellationToken);
+
+        return result;
     }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Session/Mapping/SessionInstructorModelProfile.cs b/service/src/InstructorIQ.Core/Domain/Session/Mapping/SessionInstructorModelProfile.cs
index 1a17c2af..f38ff18f 100644
--- a/service/src/InstructorIQ.Core/Domain/Session/Mapping/SessionInstructorModelProfile.cs
+++ b/service/src/InstructorIQ.Core/Domain/Session/Mapping/SessionInstructorModelProfile.cs
@@ -1,27 +1,27 @@
-using EntityChange;
+using EntityChange;
+
 using InstructorIQ.Core.Domain.Models;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Mapping
-{
+namespace InstructorIQ.Core.Domain.Mapping;
 
-    public class SessionInstructorModelProfile : EntityProfile<SessionInstructorModel>
+
+public class SessionInstructorModelProfile : EntityProfile<SessionInstructorModel>
+{
+    public override void Configure()
     {
-        public override void Configure()
-        {
-            AutoMap();
+        AutoMap();
 
-            Property(p => p.SessionId).Ignore();
-            Property(p => p.InstructorId).Ignore();
+        Property(p => p.SessionId).Ignore();
+        Property(p => p.InstructorId).Ignore();
 
-            Property(p => p.Created).Ignore();
-            Property(p => p.CreatedBy).Ignore();
-            Property(p => p.Updated).Ignore();
-            Property(p => p.UpdatedBy).Ignore();
-            Property(p => p.RowVersion).Ignore();
+        Property(p => p.Created).Ignore();
+        Property(p => p.CreatedBy).Ignore();
+        Property(p => p.Updated).Ignore();
+        Property(p => p.UpdatedBy).Ignore();
+        Property(p => p.RowVersion).Ignore();
 
-            Property(p => p.PeriodStart).Ignore();
-            Property(p => p.PeriodEnd).Ignore();
-        }
+        Property(p => p.PeriodStart).Ignore();
+        Property(p => p.PeriodEnd).Ignore();
     }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.Core/Domain/Session/Mapping/SessionProfile.cs b/service/src/InstructorIQ.Core/Domain/Session/Mapping/SessionProfile.cs
index 5c1a4bf5..685efaa7 100644
--- a/service/src/InstructorIQ.Core/Domain/Session/Mapping/SessionProfile.cs
+++ b/service/src/InstructorIQ.Core/Domain/Session/Mapping/SessionProfile.cs
@@ -1,71 +1,72 @@
 using System;
 using System.Linq;
+
 using AutoMapper;
+
 using InstructorIQ.Core.Data.Entities;
 using InstructorIQ.Core.Domain.Models;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Mapping
+namespace InstructorIQ.Core.Domain.Mapping;
+
+/// <summary>
+/// Mapper class for entity <see cref="Session"/> .
+/// </summary>
+public class SessionProfile
+    : Profile
 {
     /// <summary>
-    /// Mapper class for entity <see cref="Session"/> .
+    /// Initializes a new instance of the <see cref="SessionProfile"/> class.
     /// </summary>
-    public class SessionProfile
-        : Profile
+    public SessionProfile()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SessionProfile"/> class.
-        /// </summary>
-        public SessionProfile()
-        {
-            CreateMap<SessionCreateModel, Session>();
+        CreateMap<SessionCreateModel, Session>();
 
-            CreateMap<SessionUpdateModel, Session>()
-                .ForMember(d => d.RowVersion, opt => opt.MapFrom(s => Convert.FromBase64String(s.RowVersion)));
+        CreateMap<SessionUpdateModel, Session>()
+            .ForMember(d => d.RowVersion, opt => opt.MapFrom(s => Convert.FromBase64String(s.RowVersion)));
 
-            CreateMap<Session, SessionReadModel>()
-                .ForMember(d => d.RowVersion, opt => opt.MapFrom(s => Convert.ToBase64String(s.RowVersion)))
-                .ForMember(d => d.TopicTitle, opt => opt.MapFrom(s => s.Topic.Title))
-                .ForMember(d => d.TopicSummary, opt => opt.MapFrom(s => s.Topic.Summary))
-                .ForMember(d => d.IsRequired, opt => opt.MapFrom(s => s.Topic.IsRequired))
-                .ForMember(d => d.TenantName, opt => opt.MapFrom(s => s.Tenant.Name))
-                .ForMember(d => d.TenantTimeZone, opt => opt.MapFrom(s => s.Tenant.TimeZone))
-                .ForMember(d => d.LocationName, opt => opt.MapFrom(s => s.Location.Name))
-                .ForMember(d => d.GroupName, opt => opt.MapFrom(s => s.Group.Name))
-                .ForMember(d => d.LeadInstructorName, opt => opt.MapFrom(s => s.LeadInstructor.DisplayName))
-                .ForMember(d => d.LeadInstructorEmail, opt => opt.MapFrom(s => s.LeadInstructor.Email))
-                .IncludeAllDerived();
+        CreateMap<Session, SessionReadModel>()
+            .ForMember(d => d.RowVersion, opt => opt.MapFrom(s => Convert.ToBase64String(s.RowVersion)))
+            .ForMember(d => d.TopicTitle, opt => opt.MapFrom(s => s.Topic.Title))
+            .ForMember(d => d.TopicSummary, opt => opt.MapFrom(s => s.Topic.Summary))
+            .ForMember(d => d.IsRequired, opt => opt.MapFrom(s => s.Topic.IsRequired))
+            .ForMember(d => d.TenantName, opt => opt.MapFrom(s => s.Tenant.Name))
+            .ForMember(d => d.TenantTimeZone, opt => opt.MapFrom(s => s.Tenant.TimeZone))
+            .ForMember(d => d.LocationName, opt => opt.MapFrom(s => s.Location.Name))
+            .ForMember(d => d.GroupName, opt => opt.MapFrom(s => s.Group.Name))
+            .ForMember(d => d.LeadInstructorName, opt => opt.MapFrom(s => s.LeadInstructor.DisplayName))
+            .ForMember(d => d.LeadInstructorEmail, opt => opt.MapFrom(s => s.LeadInstructor.Email))
+            .IncludeAllDerived();
 
-            CreateMap<Session, SessionCalendarModel>()
-                .ForMember(d => d.TopicDescription, opt => opt.MapFrom(s => s.Topic.Description))
-                .ForMember(d => d.LocationAddressLine1, opt => opt.MapFrom(s => s.Location.AddressLine1))
-                .ForMember(d => d.LocationCity, opt => opt.MapFrom(s => s.Location.City))
-                .ForMember(d => d.LocationStateProvince, opt => opt.MapFrom(s => s.Location.StateProvince))
-                .ForMember(d => d.LocationPostalCode, opt => opt.MapFrom(s => s.Location.PostalCode))
-                .ForMember(d => d.AdditionalInstructors, opt => opt.MapFrom(s => s.SessionInstructors.Select(i => new SessionInstructorModel
-                {
-                    SessionId = i.Id,
-                    InstructorId = i.InstructorId,
-                    DisplayName = i.Instructor.DisplayName,
-                    SortName = i.Instructor.SortName,
-                    FamilyName = i.Instructor.FamilyName,
-                    GivenName = i.Instructor.GivenName,
-                    Email = i.Instructor.Email
-                })));
+        CreateMap<Session, SessionCalendarModel>()
+            .ForMember(d => d.TopicDescription, opt => opt.MapFrom(s => s.Topic.Description))
+            .ForMember(d => d.LocationAddressLine1, opt => opt.MapFrom(s => s.Location.AddressLine1))
+            .ForMember(d => d.LocationCity, opt => opt.MapFrom(s => s.Location.City))
+            .ForMember(d => d.LocationStateProvince, opt => opt.MapFrom(s => s.Location.StateProvince))
+            .ForMember(d => d.LocationPostalCode, opt => opt.MapFrom(s => s.Location.PostalCode))
+            .ForMember(d => d.AdditionalInstructors, opt => opt.MapFrom(s => s.SessionInstructors.Select(i => new SessionInstructorModel
+            {
+                SessionId = i.Id,
+                InstructorId = i.InstructorId,
+                DisplayName = i.Instructor.DisplayName,
+                SortName = i.Instructor.SortName,
+                FamilyName = i.Instructor.FamilyName,
+                GivenName = i.Instructor.GivenName,
+                Email = i.Instructor.Email
+            })));
 
-            CreateMap<Session, SessionUpdateModel>()
-                .ForMember(d => d.RowVersion, opt => opt.MapFrom(s => Convert.ToBase64String(s.RowVersion)));
+        CreateMap<Session, SessionUpdateModel>()
+            .ForMember(d => d.RowVersion, opt => opt.MapFrom(s => Convert.ToBase64String(s.RowVersion)));
 
 
-            CreateMap<SessionInstructor, SessionInstructorModel>()
-                .ForMember(d => d.RowVersion, opt => opt.MapFrom(s => Convert.ToBase64String(s.RowVersion)))
-                .ForMember(d => d.DisplayName, opt => opt.MapFrom(s => s.Instructor.DisplayName))
-                .ForMember(d => d.SortName, opt => opt.MapFrom(s => s.Instructor.SortName))
-                .ForMember(d => d.GivenName, opt => opt.MapFrom(s => s.Instructor.GivenName))
-                .ForMember(d => d.FamilyName, opt => opt.MapFrom(s => s.Instructor.FamilyName))
-                .ForMember(d => d.Email, opt => opt.MapFrom(s => s.Instructor.Email));
-
-        }
+        CreateMap<SessionInstructor, SessionInstructorModel>()
+            .ForMember(d => d.RowVersion, opt => opt.MapFrom(s => Convert.ToBase64String(s.RowVersion)))
+            .ForMember(d => d.DisplayName, opt => opt.MapFrom(s => s.Instructor.DisplayName))
+            .ForMember(d => d.SortName, opt => opt.MapFrom(s => s.Instructor.SortName))
+            .ForMember(d => d.GivenName, opt => opt.MapFrom(s => s.Instructor.GivenName))
+            .ForMember(d => d.FamilyName, opt => opt.MapFrom(s => s.Instructor.FamilyName))
+            .ForMember(d => d.Email, opt => opt.MapFrom(s => s.Instructor.Email));
 
     }
+
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Session/Mapping/SessionReadModelProfile.cs b/service/src/InstructorIQ.Core/Domain/Session/Mapping/SessionReadModelProfile.cs
index df157989..ccd1962f 100644
--- a/service/src/InstructorIQ.Core/Domain/Session/Mapping/SessionReadModelProfile.cs
+++ b/service/src/InstructorIQ.Core/Domain/Session/Mapping/SessionReadModelProfile.cs
@@ -1,35 +1,35 @@
 using EntityChange;
+
 using InstructorIQ.Core.Domain.Models;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Mapping
+namespace InstructorIQ.Core.Domain.Mapping;
+
+public class SessionReadModelProfile : EntityProfile<SessionReadModel>
 {
-    public class SessionReadModelProfile : EntityProfile<SessionReadModel>
+    public override void Configure()
     {
-        public override void Configure()
-        {
-            AutoMap();
+        AutoMap();
 
-            Property(p => p.StartDate).Formatter(v => v?.ToString("d"));
-            Property(p => p.StartTime).Formatter(v => v?.ToString("t"));
-            Property(p => p.EndDate).Formatter(v => v?.ToString("d"));
-            Property(p => p.EndTime).Formatter(v => v?.ToString("t"));
+        Property(p => p.StartDate).Formatter(v => v?.ToString("d"));
+        Property(p => p.StartTime).Formatter(v => v?.ToString("t"));
+        Property(p => p.EndDate).Formatter(v => v?.ToString("d"));
+        Property(p => p.EndTime).Formatter(v => v?.ToString("t"));
 
-            Property(p => p.TenantId).Ignore();
-            Property(p => p.TopicId).Ignore();
-            Property(p => p.LocationId).Ignore();
-            Property(p => p.GroupId).Ignore();
-            Property(p => p.LeadInstructorId).Ignore();
-            Property(p => p.IsRequired).Ignore();
+        Property(p => p.TenantId).Ignore();
+        Property(p => p.TopicId).Ignore();
+        Property(p => p.LocationId).Ignore();
+        Property(p => p.GroupId).Ignore();
+        Property(p => p.LeadInstructorId).Ignore();
+        Property(p => p.IsRequired).Ignore();
 
-            Property(p => p.Created).Ignore();
-            Property(p => p.CreatedBy).Ignore();
-            Property(p => p.Updated).Ignore();
-            Property(p => p.UpdatedBy).Ignore();
-            Property(p => p.RowVersion).Ignore();
+        Property(p => p.Created).Ignore();
+        Property(p => p.CreatedBy).Ignore();
+        Property(p => p.Updated).Ignore();
+        Property(p => p.UpdatedBy).Ignore();
+        Property(p => p.RowVersion).Ignore();
 
-            Property(p => p.PeriodStart).Ignore();
-            Property(p => p.PeriodEnd).Ignore();
-        }
+        Property(p => p.PeriodStart).Ignore();
+        Property(p => p.PeriodEnd).Ignore();
     }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.Core/Domain/Session/Models/SessionCalendarModel.cs b/service/src/InstructorIQ.Core/Domain/Session/Models/SessionCalendarModel.cs
index 74093127..8d1d4ec1 100644
--- a/service/src/InstructorIQ.Core/Domain/Session/Models/SessionCalendarModel.cs
+++ b/service/src/InstructorIQ.Core/Domain/Session/Models/SessionCalendarModel.cs
@@ -1,21 +1,20 @@
 using System.Collections.Generic;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Models
+namespace InstructorIQ.Core.Domain.Models;
+
+public class SessionCalendarModel : SessionReadModel
 {
-    public class SessionCalendarModel : SessionReadModel
-    {
-        public string TopicDescription { get; set; }
+    public string TopicDescription { get; set; }
 
-        public string LocationAddressLine1 { get; set; }
+    public string LocationAddressLine1 { get; set; }
 
-        public string LocationCity { get; set; }
+    public string LocationCity { get; set; }
 
-        public string LocationStateProvince { get; set; }
+    public string LocationStateProvince { get; set; }
 
-        public string LocationPostalCode { get; set; }
+    public string LocationPostalCode { get; set; }
 
-        public List<SessionInstructorModel> AdditionalInstructors { get; set; } = new List<SessionInstructorModel>();
+    public List<SessionInstructorModel> AdditionalInstructors { get; set; } = new List<SessionInstructorModel>();
 
-    }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.Core/Domain/Session/Models/SessionCreateModel.cs b/service/src/InstructorIQ.Core/Domain/Session/Models/SessionCreateModel.cs
index ac5e8f2c..5ff70191 100644
--- a/service/src/InstructorIQ.Core/Domain/Session/Models/SessionCreateModel.cs
+++ b/service/src/InstructorIQ.Core/Domain/Session/Models/SessionCreateModel.cs
@@ -1,114 +1,114 @@
 using System;
+
 using MediatR.CommandQuery.Definitions;
 using MediatR.CommandQuery.Models;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Models
+namespace InstructorIQ.Core.Domain.Models;
+
+/// <summary>
+/// View Model class
+/// </summary>
+public class SessionCreateModel
+    : EntityCreateModel<Guid>, IHaveTenant<Guid>
 {
+    #region Generated Properties
+    /// <summary>
+    /// Gets or sets the property value for 'Note'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'Note'.
+    /// </value>
+    public string Note { get; set; }
+
     /// <summary>
-    /// View Model class
+    /// Gets or sets the property value for 'StartDate'.
     /// </summary>
-    public class SessionCreateModel
-        : EntityCreateModel<Guid>, IHaveTenant<Guid>
-    {
-        #region Generated Properties
-        /// <summary>
-        /// Gets or sets the property value for 'Note'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Note'.
-        /// </value>
-        public string Note { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'StartDate'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'StartDate'.
-        /// </value>
-        public DateTime? StartDate { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'StartTime'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'StartTime'.
-        /// </value>
-        public TimeSpan? StartTime { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'EndDate'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'EndDate'.
-        /// </value>
-        public DateTime? EndDate { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'EndTime'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'EndTime'.
-        /// </value>
-        public TimeSpan? EndTime { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'TenantId'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'TenantId'.
-        /// </value>
-        public Guid TenantId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'TopicId'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'TopicId'.
-        /// </value>
-        public Guid TopicId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'LocationId'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'LocationId'.
-        /// </value>
-        public Guid? LocationId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'GroupId'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'GroupId'.
-        /// </value>
-        public Guid? GroupId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'LeadInstructorId'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'LeadInstructorId'.
-        /// </value>
-        public Guid? LeadInstructorId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'PeriodStart'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'PeriodStart'.
-        /// </value>
-        public DateTime PeriodStart { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'PeriodEnd'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'PeriodEnd'.
-        /// </value>
-        public DateTime PeriodEnd { get; set; }
-
-        #endregion
-
-    }
+    /// <value>
+    /// The property value for 'StartDate'.
+    /// </value>
+    public DateTime? StartDate { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'StartTime'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'StartTime'.
+    /// </value>
+    public TimeSpan? StartTime { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'EndDate'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'EndDate'.
+    /// </value>
+    public DateTime? EndDate { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'EndTime'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'EndTime'.
+    /// </value>
+    public TimeSpan? EndTime { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'TenantId'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'TenantId'.
+    /// </value>
+    public Guid TenantId { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'TopicId'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'TopicId'.
+    /// </value>
+    public Guid TopicId { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'LocationId'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'LocationId'.
+    /// </value>
+    public Guid? LocationId { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'GroupId'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'GroupId'.
+    /// </value>
+    public Guid? GroupId { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'LeadInstructorId'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'LeadInstructorId'.
+    /// </value>
+    public Guid? LeadInstructorId { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'PeriodStart'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'PeriodStart'.
+    /// </value>
+    public DateTime PeriodStart { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'PeriodEnd'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'PeriodEnd'.
+    /// </value>
+    public DateTime PeriodEnd { get; set; }
+
+    #endregion
+
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Session/Models/SessionFrequentTimeModel.cs b/service/src/InstructorIQ.Core/Domain/Session/Models/SessionFrequentTimeModel.cs
index 289eb5ab..68a1df8a 100644
--- a/service/src/InstructorIQ.Core/Domain/Session/Models/SessionFrequentTimeModel.cs
+++ b/service/src/InstructorIQ.Core/Domain/Session/Models/SessionFrequentTimeModel.cs
@@ -1,11 +1,10 @@
-using System;
+using System;
 
-namespace InstructorIQ.Core.Domain.Models
+namespace InstructorIQ.Core.Domain.Models;
+
+public class SessionFrequentTimeModel
 {
-    public class SessionFrequentTimeModel
-    {
-        public TimeSpan StartTime { get; set; }
-        public TimeSpan EndTime { get; set; }
-        public int Count { get; set; }
-    }
+    public TimeSpan StartTime { get; set; }
+    public TimeSpan EndTime { get; set; }
+    public int Count { get; set; }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Session/Models/SessionInstructorModel.cs b/service/src/InstructorIQ.Core/Domain/Session/Models/SessionInstructorModel.cs
index 5267421b..6a0a3ab3 100644
--- a/service/src/InstructorIQ.Core/Domain/Session/Models/SessionInstructorModel.cs
+++ b/service/src/InstructorIQ.Core/Domain/Session/Models/SessionInstructorModel.cs
@@ -1,29 +1,29 @@
 using System;
+
 using MediatR.CommandQuery.Definitions;
 using MediatR.CommandQuery.Models;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Models
-{
-    public class SessionInstructorModel : EntityReadModel<Guid>, ITrackHistory
+namespace InstructorIQ.Core.Domain.Models;
 
-    {
-        public Guid SessionId { get; set; }
+public class SessionInstructorModel : EntityReadModel<Guid>, ITrackHistory
+
+{
+    public Guid SessionId { get; set; }
 
-        public Guid InstructorId { get; set; }
+    public Guid InstructorId { get; set; }
 
-        public string GivenName { get; set; }
+    public string GivenName { get; set; }
 
-        public string FamilyName { get; set; }
+    public string FamilyName { get; set; }
 
-        public string DisplayName { get; set; }
+    public string DisplayName { get; set; }
 
-        public string SortName { get; set; }
+    public string SortName { get; set; }
 
-        public string Email { get; set; }
+    public string Email { get; set; }
 
-        public DateTime PeriodStart { get; set; }
+    public DateTime PeriodStart { get; set; }
 
-        public DateTime PeriodEnd { get; set; }
-    }
-}
\ No newline at end of file
+    public DateTime PeriodEnd { get; set; }
+}
diff --git a/service/src/InstructorIQ.Core/Domain/Session/Models/SessionMultipleUpdateModel.cs b/service/src/InstructorIQ.Core/Domain/Session/Models/SessionMultipleUpdateModel.cs
index 1fc3d84b..ce8fb8f7 100644
--- a/service/src/InstructorIQ.Core/Domain/Session/Models/SessionMultipleUpdateModel.cs
+++ b/service/src/InstructorIQ.Core/Domain/Session/Models/SessionMultipleUpdateModel.cs
@@ -1,36 +1,36 @@
 using System;
 using System.Collections.Generic;
+
 using MediatR.CommandQuery.Definitions;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Models
+namespace InstructorIQ.Core.Domain.Models;
+
+public class SessionMultipleUpdateModel : IHaveIdentifier<Guid>
 {
-    public class SessionMultipleUpdateModel : IHaveIdentifier<Guid>
-    {
-        public Guid Id { get; set; }
+    public Guid Id { get; set; }
 
-        public Guid TenantId { get; set; }
+    public Guid TenantId { get; set; }
 
-        public DateTime? StartDate { get; set; }
+    public DateTime? StartDate { get; set; }
 
-        public TimeSpan? StartTime { get; set; }
+    public TimeSpan? StartTime { get; set; }
 
-        public DateTime? EndDate { get; set; }
+    public DateTime? EndDate { get; set; }
 
-        public TimeSpan? EndTime { get; set; }
+    public TimeSpan? EndTime { get; set; }
 
-        public Guid? LocationId { get; set; }
+    public Guid? LocationId { get; set; }
 
-        public Guid? GroupId { get; set; }
+    public Guid? GroupId { get; set; }
 
-        public Guid? LeadInstructorId { get; set; }
+    public Guid? LeadInstructorId { get; set; }
 
-        public Guid TopicId { get; set; }
+    public Guid TopicId { get; set; }
 
-        public string TopicTitle { get; set; }
+    public string TopicTitle { get; set; }
 
-        public string Note { get; set; }
+    public string Note { get; set; }
 
-        public List<Guid> AdditionalInstructors { get; set; }
-    }
-}
\ No newline at end of file
+    public List<Guid> AdditionalInstructors { get; set; }
+}
diff --git a/service/src/InstructorIQ.Core/Domain/Session/Models/SessionReadModel.cs b/service/src/InstructorIQ.Core/Domain/Session/Models/SessionReadModel.cs
index c2759bfc..090751a2 100644
--- a/service/src/InstructorIQ.Core/Domain/Session/Models/SessionReadModel.cs
+++ b/service/src/InstructorIQ.Core/Domain/Session/Models/SessionReadModel.cs
@@ -1,131 +1,131 @@
 using System;
+
 using MediatR.CommandQuery.Definitions;
 using MediatR.CommandQuery.Models;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Models
+namespace InstructorIQ.Core.Domain.Models;
+
+/// <summary>
+/// View Model class
+/// </summary>
+public class SessionReadModel
+    : EntityReadModel<Guid>, IHaveTenant<Guid>, ITrackHistory
 {
+    #region Generated Properties
+    /// <summary>
+    /// Gets or sets the property value for 'Note'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'Note'.
+    /// </value>
+    public string Note { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'StartDate'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'StartDate'.
+    /// </value>
+    public DateTime? StartDate { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'StartTime'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'StartTime'.
+    /// </value>
+    public TimeSpan? StartTime { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'EndDate'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'EndDate'.
+    /// </value>
+    public DateTime? EndDate { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'EndTime'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'EndTime'.
+    /// </value>
+    public TimeSpan? EndTime { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'TenantId'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'TenantId'.
+    /// </value>
+    public Guid TenantId { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'TopicId'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'TopicId'.
+    /// </value>
+    public Guid TopicId { get; set; }
+
     /// <summary>
-    /// View Model class
+    /// Gets or sets the property value for 'LocationId'.
     /// </summary>
-    public class SessionReadModel
-        : EntityReadModel<Guid>, IHaveTenant<Guid>, ITrackHistory
-    {
-        #region Generated Properties
-        /// <summary>
-        /// Gets or sets the property value for 'Note'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Note'.
-        /// </value>
-        public string Note { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'StartDate'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'StartDate'.
-        /// </value>
-        public DateTime? StartDate { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'StartTime'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'StartTime'.
-        /// </value>
-        public TimeSpan? StartTime { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'EndDate'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'EndDate'.
-        /// </value>
-        public DateTime? EndDate { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'EndTime'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'EndTime'.
-        /// </value>
-        public TimeSpan? EndTime { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'TenantId'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'TenantId'.
-        /// </value>
-        public Guid TenantId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'TopicId'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'TopicId'.
-        /// </value>
-        public Guid TopicId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'LocationId'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'LocationId'.
-        /// </value>
-        public Guid? LocationId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'GroupId'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'GroupId'.
-        /// </value>
-        public Guid? GroupId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'LeadInstructorId'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'LeadInstructorId'.
-        /// </value>
-        public Guid? LeadInstructorId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'PeriodStart'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'PeriodStart'.
-        /// </value>
-        public DateTime PeriodStart { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'PeriodEnd'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'PeriodEnd'.
-        /// </value>
-        public DateTime PeriodEnd { get; set; }
-
-        #endregion
-
-        public string TenantName { get; set; }
-
-        public string TenantTimeZone { get; set; }
-
-        public string LocationName { get; set; }
-
-        public string GroupName { get; set; }
-
-        public string LeadInstructorName { get; set; }
-
-        public string LeadInstructorEmail { get; set; }
-
-        public string TopicTitle { get; set; }
-
-        public string TopicSummary { get; set; }
-
-        public bool IsRequired { get; set; }
-    }
+    /// <value>
+    /// The property value for 'LocationId'.
+    /// </value>
+    public Guid? LocationId { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'GroupId'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'GroupId'.
+    /// </value>
+    public Guid? GroupId { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'LeadInstructorId'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'LeadInstructorId'.
+    /// </value>
+    public Guid? LeadInstructorId { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'PeriodStart'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'PeriodStart'.
+    /// </value>
+    public DateTime PeriodStart { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'PeriodEnd'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'PeriodEnd'.
+    /// </value>
+    public DateTime PeriodEnd { get; set; }
+
+    #endregion
+
+    public string TenantName { get; set; }
+
+    public string TenantTimeZone { get; set; }
+
+    public string LocationName { get; set; }
+
+    public string GroupName { get; set; }
+
+    public string LeadInstructorName { get; set; }
+
+    public string LeadInstructorEmail { get; set; }
+
+    public string TopicTitle { get; set; }
+
+    public string TopicSummary { get; set; }
+
+    public bool IsRequired { get; set; }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Session/Models/SessionUpdateModel.cs b/service/src/InstructorIQ.Core/Domain/Session/Models/SessionUpdateModel.cs
index 807c9512..cf8f676b 100644
--- a/service/src/InstructorIQ.Core/Domain/Session/Models/SessionUpdateModel.cs
+++ b/service/src/InstructorIQ.Core/Domain/Session/Models/SessionUpdateModel.cs
@@ -1,114 +1,114 @@
 using System;
+
 using MediatR.CommandQuery.Definitions;
 using MediatR.CommandQuery.Models;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Models
+namespace InstructorIQ.Core.Domain.Models;
+
+/// <summary>
+/// View Model class
+/// </summary>
+public class SessionUpdateModel
+    : EntityUpdateModel, IHaveTenant<Guid>
 {
+    #region Generated Properties
+    /// <summary>
+    /// Gets or sets the property value for 'Note'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'Note'.
+    /// </value>
+    public string Note { get; set; }
+
     /// <summary>
-    /// View Model class
+    /// Gets or sets the property value for 'StartDate'.
     /// </summary>
-    public class SessionUpdateModel
-        : EntityUpdateModel, IHaveTenant<Guid>
-    {
-        #region Generated Properties
-        /// <summary>
-        /// Gets or sets the property value for 'Note'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Note'.
-        /// </value>
-        public string Note { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'StartDate'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'StartDate'.
-        /// </value>
-        public DateTime? StartDate { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'StartTime'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'StartTime'.
-        /// </value>
-        public TimeSpan? StartTime { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'EndDate'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'EndDate'.
-        /// </value>
-        public DateTime? EndDate { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'EndTime'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'EndTime'.
-        /// </value>
-        public TimeSpan? EndTime { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'TenantId'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'TenantId'.
-        /// </value>
-        public Guid TenantId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'TopicId'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'TopicId'.
-        /// </value>
-        public Guid TopicId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'LocationId'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'LocationId'.
-        /// </value>
-        public Guid? LocationId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'GroupId'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'GroupId'.
-        /// </value>
-        public Guid? GroupId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'LeadInstructorId'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'LeadInstructorId'.
-        /// </value>
-        public Guid? LeadInstructorId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'PeriodStart'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'PeriodStart'.
-        /// </value>
-        public DateTime PeriodStart { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'PeriodEnd'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'PeriodEnd'.
-        /// </value>
-        public DateTime PeriodEnd { get; set; }
-
-        #endregion
-
-    }
+    /// <value>
+    /// The property value for 'StartDate'.
+    /// </value>
+    public DateTime? StartDate { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'StartTime'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'StartTime'.
+    /// </value>
+    public TimeSpan? StartTime { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'EndDate'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'EndDate'.
+    /// </value>
+    public DateTime? EndDate { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'EndTime'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'EndTime'.
+    /// </value>
+    public TimeSpan? EndTime { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'TenantId'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'TenantId'.
+    /// </value>
+    public Guid TenantId { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'TopicId'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'TopicId'.
+    /// </value>
+    public Guid TopicId { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'LocationId'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'LocationId'.
+    /// </value>
+    public Guid? LocationId { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'GroupId'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'GroupId'.
+    /// </value>
+    public Guid? GroupId { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'LeadInstructorId'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'LeadInstructorId'.
+    /// </value>
+    public Guid? LeadInstructorId { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'PeriodStart'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'PeriodStart'.
+    /// </value>
+    public DateTime PeriodStart { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'PeriodEnd'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'PeriodEnd'.
+    /// </value>
+    public DateTime PeriodEnd { get; set; }
+
+    #endregion
+
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Session/Queries/SessionCalendarQuery.cs b/service/src/InstructorIQ.Core/Domain/Session/Queries/SessionCalendarQuery.cs
index 9ba0b16e..069c2c01 100644
--- a/service/src/InstructorIQ.Core/Domain/Session/Queries/SessionCalendarQuery.cs
+++ b/service/src/InstructorIQ.Core/Domain/Session/Queries/SessionCalendarQuery.cs
@@ -1,46 +1,47 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Security.Principal;
+
 using InstructorIQ.Core.Domain.Models;
+
 using MediatR.CommandQuery.Queries;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Queries
+namespace InstructorIQ.Core.Domain.Queries;
+
+public class SessionCalendarQuery : PrincipalQueryBase<IReadOnlyCollection<SessionCalendarModel>>
 {
-    public class SessionCalendarQuery : PrincipalQueryBase<IReadOnlyCollection<SessionCalendarModel>>
+    public SessionCalendarQuery(IPrincipal principal, Guid tenantId, int year)
+        : base(principal)
     {
-        public SessionCalendarQuery(IPrincipal principal, Guid tenantId, int year)
-            : base(principal)
-        {
-            TenantId = tenantId;
+        TenantId = tenantId;
 
-            StartDate = new DateTime(year, 1, 1);
-            EndDate = StartDate.AddYears(1);
-        }
+        StartDate = new DateTime(year, 1, 1);
+        EndDate = StartDate.AddYears(1);
+    }
 
-        public SessionCalendarQuery(IPrincipal principal, Guid tenantId, int year, int month)
-            : base(principal)
-        {
-            TenantId = tenantId;
+    public SessionCalendarQuery(IPrincipal principal, Guid tenantId, int year, int month)
+        : base(principal)
+    {
+        TenantId = tenantId;
 
-            StartDate = new DateTime(year, month, 1);
-            EndDate = StartDate.AddMonths(1);
-        }
+        StartDate = new DateTime(year, month, 1);
+        EndDate = StartDate.AddMonths(1);
+    }
 
-        public SessionCalendarQuery(IPrincipal principal, Guid tenantId, DateTime startDate, DateTime endDate)
-            : base(principal)
-        {
-            TenantId = tenantId;
+    public SessionCalendarQuery(IPrincipal principal, Guid tenantId, DateTime startDate, DateTime endDate)
+        : base(principal)
+    {
+        TenantId = tenantId;
 
-            StartDate = startDate;
-            EndDate = endDate;
-        }
+        StartDate = startDate;
+        EndDate = endDate;
+    }
 
 
-        public Guid TenantId { get; set; }
+    public Guid TenantId { get; set; }
 
-        public DateTime StartDate { get; set; }
+    public DateTime StartDate { get; set; }
 
-        public DateTime EndDate { get; set; }
-    }
-}
\ No newline at end of file
+    public DateTime EndDate { get; set; }
+}
diff --git a/service/src/InstructorIQ.Core/Domain/Session/Queries/SessionFrequentTimeQuery.cs b/service/src/InstructorIQ.Core/Domain/Session/Queries/SessionFrequentTimeQuery.cs
index 1d97f7b8..7d2d0f45 100644
--- a/service/src/InstructorIQ.Core/Domain/Session/Queries/SessionFrequentTimeQuery.cs
+++ b/service/src/InstructorIQ.Core/Domain/Session/Queries/SessionFrequentTimeQuery.cs
@@ -1,18 +1,19 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Security.Principal;
+
 using InstructorIQ.Core.Domain.Models;
+
 using MediatR.CommandQuery.Queries;
 
-namespace InstructorIQ.Core.Domain.Queries
+namespace InstructorIQ.Core.Domain.Queries;
+
+public class SessionFrequentTimeQuery : PrincipalQueryBase<IReadOnlyCollection<SessionFrequentTimeModel>>
 {
-    public class SessionFrequentTimeQuery : PrincipalQueryBase<IReadOnlyCollection<SessionFrequentTimeModel>>
+    public SessionFrequentTimeQuery(IPrincipal principal, Guid tenantId) : base(principal)
     {
-        public SessionFrequentTimeQuery(IPrincipal principal, Guid tenantId) : base(principal)
-        {
-            TenantId = tenantId;
-        }
-
-        public Guid TenantId { get; }
+        TenantId = tenantId;
     }
+
+    public Guid TenantId { get; }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Session/Queries/SessionHistoryQuery.cs b/service/src/InstructorIQ.Core/Domain/Session/Queries/SessionHistoryQuery.cs
index 599f1f1c..a597a11f 100644
--- a/service/src/InstructorIQ.Core/Domain/Session/Queries/SessionHistoryQuery.cs
+++ b/service/src/InstructorIQ.Core/Domain/Session/Queries/SessionHistoryQuery.cs
@@ -1,27 +1,26 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Security.Principal;
+
 using MediatR.CommandQuery.Audit;
 using MediatR.CommandQuery.Queries;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Queries
+namespace InstructorIQ.Core.Domain.Queries;
+
+public class SessionHistoryQuery : CacheableQueryBase<IReadOnlyCollection<AuditRecord<Guid>>>
 {
-    public class SessionHistoryQuery : CacheableQueryBase<IReadOnlyCollection<AuditRecord<Guid>>>
+    public SessionHistoryQuery(IPrincipal principal) : base(principal)
     {
-        public SessionHistoryQuery(IPrincipal principal) : base(principal)
-        {
-        }
+    }
 
-        public Guid? Id { get; set; }
+    public Guid? Id { get; set; }
 
-        public Guid? TopicId { get; set; }
+    public Guid? TopicId { get; set; }
 
-        public override string GetCacheKey()
-        {
-            var hash = HashCode.Combine(Id, TopicId);
-            return $"{nameof(SessionHistoryQuery)}-{hash}";
-        }
+    public override string GetCacheKey()
+    {
+        var hash = HashCode.Combine(Id, TopicId);
+        return $"{nameof(SessionHistoryQuery)}-{hash}";
     }
-
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Session/Queries/SessionInstructorHistoryQuery.cs b/service/src/InstructorIQ.Core/Domain/Session/Queries/SessionInstructorHistoryQuery.cs
index 66facc5d..279d36a4 100644
--- a/service/src/InstructorIQ.Core/Domain/Session/Queries/SessionInstructorHistoryQuery.cs
+++ b/service/src/InstructorIQ.Core/Domain/Session/Queries/SessionInstructorHistoryQuery.cs
@@ -1,27 +1,26 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Security.Principal;
+
 using MediatR.CommandQuery.Audit;
 using MediatR.CommandQuery.Queries;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Queries
+namespace InstructorIQ.Core.Domain.Queries;
+
+public class SessionInstructorHistoryQuery : CacheableQueryBase<IReadOnlyCollection<AuditRecord<Guid>>>
 {
-    public class SessionInstructorHistoryQuery : CacheableQueryBase<IReadOnlyCollection<AuditRecord<Guid>>>
+    public SessionInstructorHistoryQuery(IPrincipal principal) : base(principal)
     {
-        public SessionInstructorHistoryQuery(IPrincipal principal) : base(principal)
-        {
-        }
+    }
 
-        public Guid? SessionId { get; set; }
+    public Guid? SessionId { get; set; }
 
-        public Guid? TopicId { get; set; }
+    public Guid? TopicId { get; set; }
 
-        public override string GetCacheKey()
-        {
-            var hash = HashCode.Combine(SessionId, TopicId);
-            return $"{nameof(SessionHistoryQuery)}-{hash}";
-        }
+    public override string GetCacheKey()
+    {
+        var hash = HashCode.Combine(SessionId, TopicId);
+        return $"{nameof(SessionHistoryQuery)}-{hash}";
     }
-
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Session/Queries/SessionInstructorQuery.cs b/service/src/InstructorIQ.Core/Domain/Session/Queries/SessionInstructorQuery.cs
index a19439cf..08293628 100644
--- a/service/src/InstructorIQ.Core/Domain/Session/Queries/SessionInstructorQuery.cs
+++ b/service/src/InstructorIQ.Core/Domain/Session/Queries/SessionInstructorQuery.cs
@@ -1,19 +1,20 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Security.Principal;
-using MediatR.CommandQuery.Queries;
+
 using InstructorIQ.Core.Domain.Models;
 
+using MediatR.CommandQuery.Queries;
+
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Queries
+namespace InstructorIQ.Core.Domain.Queries;
+
+public class SessionInstructorQuery : PrincipalQueryBase<IReadOnlyCollection<SessionInstructorModel>>
 {
-    public class SessionInstructorQuery : PrincipalQueryBase<IReadOnlyCollection<SessionInstructorModel>>
+    public SessionInstructorQuery(IPrincipal principal, Guid sessionId) : base(principal)
     {
-        public SessionInstructorQuery(IPrincipal principal, Guid sessionId) : base(principal)
-        {
-            SessionId = sessionId;
-        }
-
-        public Guid SessionId { get;  }
+        SessionId = sessionId;
     }
-}
\ No newline at end of file
+
+    public Guid SessionId { get; }
+}
diff --git a/service/src/InstructorIQ.Core/Domain/Session/Queries/SessionTopicQuery.cs b/service/src/InstructorIQ.Core/Domain/Session/Queries/SessionTopicQuery.cs
index 5bae1a12..d91e8e80 100644
--- a/service/src/InstructorIQ.Core/Domain/Session/Queries/SessionTopicQuery.cs
+++ b/service/src/InstructorIQ.Core/Domain/Session/Queries/SessionTopicQuery.cs
@@ -1,26 +1,27 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Security.Principal;
-using MediatR.CommandQuery.Queries;
+
 using InstructorIQ.Core.Domain.Models;
 
+using MediatR.CommandQuery.Queries;
+
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Queries
-{
-    public class SessionTopicQuery : PrincipalQueryBase<IReadOnlyCollection<SessionCalendarModel>>
-    {
+namespace InstructorIQ.Core.Domain.Queries;
 
-        public SessionTopicQuery(IPrincipal principal, Guid topicId) : base(principal)
-        {
-            TopicIds = new List<Guid> { topicId };
-        }
+public class SessionTopicQuery : PrincipalQueryBase<IReadOnlyCollection<SessionCalendarModel>>
+{
 
-        public SessionTopicQuery(IPrincipal principal, IEnumerable<Guid> topicIds) : base(principal)
-        {
-            TopicIds = topicIds.ToList();
-        }
+    public SessionTopicQuery(IPrincipal principal, Guid topicId) : base(principal)
+    {
+        TopicIds = new List<Guid> { topicId };
+    }
 
-        public IReadOnlyCollection<Guid> TopicIds { get; set; }
+    public SessionTopicQuery(IPrincipal principal, IEnumerable<Guid> topicIds) : base(principal)
+    {
+        TopicIds = topicIds.ToList();
     }
+
+    public IReadOnlyCollection<Guid> TopicIds { get; set; }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Session/SessionServiceRegistration.cs b/service/src/InstructorIQ.Core/Domain/Session/SessionServiceRegistration.cs
index 6694d3fa..8a5c64d3 100644
--- a/service/src/InstructorIQ.Core/Domain/Session/SessionServiceRegistration.cs
+++ b/service/src/InstructorIQ.Core/Domain/Session/SessionServiceRegistration.cs
@@ -17,26 +17,25 @@
 using Microsoft.Extensions.DependencyInjection.Extensions;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain
+namespace InstructorIQ.Core.Domain;
+
+public class SessionServiceRegistration : DomainServiceRegistrationBase
 {
-    public class SessionServiceRegistration : DomainServiceRegistrationBase
+
+    [RegisterServices]
+    public override void Register(IServiceCollection services)
     {
+        RegisterEntityQuery<Guid, Session, SessionReadModel>(services);
+        RegisterEntityCommand<Guid, Session, SessionReadModel, SessionCreateModel, SessionUpdateModel>(services);
 
-        [RegisterServices]
-        public override void Register(IServiceCollection services)
-        {
-            RegisterEntityQuery<Guid, Session, SessionReadModel>(services);
-            RegisterEntityCommand<Guid, Session, SessionReadModel, SessionCreateModel, SessionUpdateModel>(services);
-
-            services.TryAddTransient<IRequestHandler<SessionTopicQuery, IReadOnlyCollection<SessionCalendarModel>>, SessionTopicQueryHandler>();
-            services.TryAddTransient<IRequestHandler<SessionCalendarQuery, IReadOnlyCollection<SessionCalendarModel>>, SessionCalendarQueryHandler>();
-            services.TryAddTransient<IRequestHandler<SessionInstructorQuery, IReadOnlyCollection<SessionInstructorModel>>, SessionInstructorQueryHandler>();
-            services.TryAddTransient<IRequestHandler<SessionMultipleUpdateCommand, CompleteModel>, SessionMultipleUpdateCommandHandler>();
-            services.TryAddTransient<IRequestHandler<SessionSequenceCreateCommand, CompleteModel>, SessionSequenceCreateCommandHandler>();
-            services.TryAddTransient<IRequestHandler<SessionInstructorUpdateCommand, CompleteModel>, SessionInstructorUpdateCommandHandler>();
-            services.TryAddTransient<IRequestHandler<SessionHistoryQuery, IReadOnlyCollection<AuditRecord<Guid>>>, SessionHistoryQueryHandler>();
-            services.TryAddTransient<IRequestHandler<SessionInstructorHistoryQuery, IReadOnlyCollection<AuditRecord<Guid>>>, SessionInstructorHistoryQueryHandler>();
-            services.TryAddTransient<IRequestHandler<SessionFrequentTimeQuery, IReadOnlyCollection<SessionFrequentTimeModel>>, SessionFrequentTimeHandler>();
-        }
+        services.TryAddTransient<IRequestHandler<SessionTopicQuery, IReadOnlyCollection<SessionCalendarModel>>, SessionTopicQueryHandler>();
+        services.TryAddTransient<IRequestHandler<SessionCalendarQuery, IReadOnlyCollection<SessionCalendarModel>>, SessionCalendarQueryHandler>();
+        services.TryAddTransient<IRequestHandler<SessionInstructorQuery, IReadOnlyCollection<SessionInstructorModel>>, SessionInstructorQueryHandler>();
+        services.TryAddTransient<IRequestHandler<SessionMultipleUpdateCommand, CompleteModel>, SessionMultipleUpdateCommandHandler>();
+        services.TryAddTransient<IRequestHandler<SessionSequenceCreateCommand, CompleteModel>, SessionSequenceCreateCommandHandler>();
+        services.TryAddTransient<IRequestHandler<SessionInstructorUpdateCommand, CompleteModel>, SessionInstructorUpdateCommandHandler>();
+        services.TryAddTransient<IRequestHandler<SessionHistoryQuery, IReadOnlyCollection<AuditRecord<Guid>>>, SessionHistoryQueryHandler>();
+        services.TryAddTransient<IRequestHandler<SessionInstructorHistoryQuery, IReadOnlyCollection<AuditRecord<Guid>>>, SessionInstructorHistoryQueryHandler>();
+        services.TryAddTransient<IRequestHandler<SessionFrequentTimeQuery, IReadOnlyCollection<SessionFrequentTimeModel>>, SessionFrequentTimeHandler>();
     }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Session/Validation/SessionCreateModelValidator.cs b/service/src/InstructorIQ.Core/Domain/Session/Validation/SessionCreateModelValidator.cs
index ef241c39..7d47da37 100644
--- a/service/src/InstructorIQ.Core/Domain/Session/Validation/SessionCreateModelValidator.cs
+++ b/service/src/InstructorIQ.Core/Domain/Session/Validation/SessionCreateModelValidator.cs
@@ -1,24 +1,25 @@
 using System;
+
 using FluentValidation;
+
 using InstructorIQ.Core.Domain.Models;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Validation
+namespace InstructorIQ.Core.Domain.Validation;
+
+/// <summary>
+/// Validator class for <see cref="SessionCreateModel"/> .
+/// </summary>
+public class SessionCreateModelValidator
+    : AbstractValidator<SessionCreateModel>
 {
     /// <summary>
-    /// Validator class for <see cref="SessionCreateModel"/> .
+    /// Initializes a new instance of the <see cref="SessionCreateModelValidator"/> class.
     /// </summary>
-    public class SessionCreateModelValidator
-        : AbstractValidator<SessionCreateModel>
+    public SessionCreateModelValidator()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SessionCreateModelValidator"/> class.
-        /// </summary>
-        public SessionCreateModelValidator()
-        {
-            #region Generated Constructor
-            #endregion
-        }
-
+        #region Generated Constructor
+        #endregion
     }
+
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Session/Validation/SessionUpdateModelValidator.cs b/service/src/InstructorIQ.Core/Domain/Session/Validation/SessionUpdateModelValidator.cs
index ee5fb77e..c8b7608a 100644
--- a/service/src/InstructorIQ.Core/Domain/Session/Validation/SessionUpdateModelValidator.cs
+++ b/service/src/InstructorIQ.Core/Domain/Session/Validation/SessionUpdateModelValidator.cs
@@ -1,24 +1,25 @@
 using System;
+
 using FluentValidation;
+
 using InstructorIQ.Core.Domain.Models;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Validation
+namespace InstructorIQ.Core.Domain.Validation;
+
+/// <summary>
+/// Validator class for <see cref="SessionUpdateModel"/> .
+/// </summary>
+public class SessionUpdateModelValidator
+    : AbstractValidator<SessionUpdateModel>
 {
     /// <summary>
-    /// Validator class for <see cref="SessionUpdateModel"/> .
+    /// Initializes a new instance of the <see cref="SessionUpdateModelValidator"/> class.
     /// </summary>
-    public class SessionUpdateModelValidator
-        : AbstractValidator<SessionUpdateModel>
+    public SessionUpdateModelValidator()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SessionUpdateModelValidator"/> class.
-        /// </summary>
-        public SessionUpdateModelValidator()
-        {
-            #region Generated Constructor
-            #endregion
-        }
-
+        #region Generated Constructor
+        #endregion
     }
+
 }
diff --git a/service/src/InstructorIQ.Core/Domain/SessionInstructor/Mapping/SessionInstructorProfile.cs b/service/src/InstructorIQ.Core/Domain/SessionInstructor/Mapping/SessionInstructorProfile.cs
index 43e9363a..20aa8986 100644
--- a/service/src/InstructorIQ.Core/Domain/SessionInstructor/Mapping/SessionInstructorProfile.cs
+++ b/service/src/InstructorIQ.Core/Domain/SessionInstructor/Mapping/SessionInstructorProfile.cs
@@ -1,32 +1,33 @@
 using System;
+
 using AutoMapper;
+
 using InstructorIQ.Core.Data.Entities;
 using InstructorIQ.Core.Domain.Models;
 
-namespace InstructorIQ.Core.Domain.Mapping
+namespace InstructorIQ.Core.Domain.Mapping;
+
+/// <summary>
+/// Mapper class for entity <see cref="SessionInstructor"/> .
+/// </summary>
+public partial class SessionInstructorProfile
+    : Profile
 {
     /// <summary>
-    /// Mapper class for entity <see cref="SessionInstructor"/> .
+    /// Initializes a new instance of the <see cref="SessionInstructorProfile"/> class.
     /// </summary>
-    public partial class SessionInstructorProfile
-        : Profile
+    public SessionInstructorProfile()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SessionInstructorProfile"/> class.
-        /// </summary>
-        public SessionInstructorProfile()
-        {
-            CreateMap<InstructorIQ.Core.Data.Entities.SessionInstructor, InstructorIQ.Core.Domain.Models.SessionInstructorReadModel>();
+        CreateMap<InstructorIQ.Core.Data.Entities.SessionInstructor, InstructorIQ.Core.Domain.Models.SessionInstructorReadModel>();
 
-            CreateMap<InstructorIQ.Core.Domain.Models.SessionInstructorCreateModel, InstructorIQ.Core.Data.Entities.SessionInstructor>();
+        CreateMap<InstructorIQ.Core.Domain.Models.SessionInstructorCreateModel, InstructorIQ.Core.Data.Entities.SessionInstructor>();
 
-            CreateMap<InstructorIQ.Core.Data.Entities.SessionInstructor, InstructorIQ.Core.Domain.Models.SessionInstructorUpdateModel>();
+        CreateMap<InstructorIQ.Core.Data.Entities.SessionInstructor, InstructorIQ.Core.Domain.Models.SessionInstructorUpdateModel>();
 
-            CreateMap<InstructorIQ.Core.Domain.Models.SessionInstructorUpdateModel, InstructorIQ.Core.Data.Entities.SessionInstructor>();
+        CreateMap<InstructorIQ.Core.Domain.Models.SessionInstructorUpdateModel, InstructorIQ.Core.Data.Entities.SessionInstructor>();
 
-            CreateMap<InstructorIQ.Core.Domain.Models.SessionInstructorReadModel, InstructorIQ.Core.Domain.Models.SessionInstructorUpdateModel>();
-
-        }
+        CreateMap<InstructorIQ.Core.Domain.Models.SessionInstructorReadModel, InstructorIQ.Core.Domain.Models.SessionInstructorUpdateModel>();
 
     }
+
 }
diff --git a/service/src/InstructorIQ.Core/Domain/SessionInstructor/Models/SessionInstructorCreateModel.cs b/service/src/InstructorIQ.Core/Domain/SessionInstructor/Models/SessionInstructorCreateModel.cs
index 7387f7f4..cfe33cb2 100644
--- a/service/src/InstructorIQ.Core/Domain/SessionInstructor/Models/SessionInstructorCreateModel.cs
+++ b/service/src/InstructorIQ.Core/Domain/SessionInstructor/Models/SessionInstructorCreateModel.cs
@@ -1,57 +1,57 @@
 using System;
 using System.Collections.Generic;
+
 using MediatR.CommandQuery.Models;
 
-namespace InstructorIQ.Core.Domain.Models
+namespace InstructorIQ.Core.Domain.Models;
+
+/// <summary>
+/// View Model class
+/// </summary>
+public partial class SessionInstructorCreateModel
+    : EntityCreateModel<Guid>
 {
+    #region Generated Properties
+    /// <summary>
+    /// Gets or sets the property value for 'SessionId'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'SessionId'.
+    /// </value>
+    public Guid SessionId { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'InstructorId'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'InstructorId'.
+    /// </value>
+    public Guid InstructorId { get; set; }
+
     /// <summary>
-    /// View Model class
+    /// Gets or sets the property value for 'InstructorRoleId'.
     /// </summary>
-    public partial class SessionInstructorCreateModel
-        : EntityCreateModel<Guid>
-    {
-        #region Generated Properties
-        /// <summary>
-        /// Gets or sets the property value for 'SessionId'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'SessionId'.
-        /// </value>
-        public Guid SessionId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'InstructorId'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'InstructorId'.
-        /// </value>
-        public Guid InstructorId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'InstructorRoleId'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'InstructorRoleId'.
-        /// </value>
-        public Guid? InstructorRoleId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'PeriodStart'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'PeriodStart'.
-        /// </value>
-        public DateTime PeriodStart { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'PeriodEnd'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'PeriodEnd'.
-        /// </value>
-        public DateTime PeriodEnd { get; set; }
-
-        #endregion
-
-    }
+    /// <value>
+    /// The property value for 'InstructorRoleId'.
+    /// </value>
+    public Guid? InstructorRoleId { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'PeriodStart'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'PeriodStart'.
+    /// </value>
+    public DateTime PeriodStart { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'PeriodEnd'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'PeriodEnd'.
+    /// </value>
+    public DateTime PeriodEnd { get; set; }
+
+    #endregion
+
 }
diff --git a/service/src/InstructorIQ.Core/Domain/SessionInstructor/Models/SessionInstructorReadModel.cs b/service/src/InstructorIQ.Core/Domain/SessionInstructor/Models/SessionInstructorReadModel.cs
index bc870873..11f9b344 100644
--- a/service/src/InstructorIQ.Core/Domain/SessionInstructor/Models/SessionInstructorReadModel.cs
+++ b/service/src/InstructorIQ.Core/Domain/SessionInstructor/Models/SessionInstructorReadModel.cs
@@ -1,57 +1,57 @@
 using System;
 using System.Collections.Generic;
+
 using MediatR.CommandQuery.Models;
 
-namespace InstructorIQ.Core.Domain.Models
+namespace InstructorIQ.Core.Domain.Models;
+
+/// <summary>
+/// View Model class
+/// </summary>
+public partial class SessionInstructorReadModel
+    : EntityReadModel<Guid>
 {
+    #region Generated Properties
+    /// <summary>
+    /// Gets or sets the property value for 'SessionId'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'SessionId'.
+    /// </value>
+    public Guid SessionId { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'InstructorId'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'InstructorId'.
+    /// </value>
+    public Guid InstructorId { get; set; }
+
     /// <summary>
-    /// View Model class
+    /// Gets or sets the property value for 'InstructorRoleId'.
     /// </summary>
-    public partial class SessionInstructorReadModel
-        : EntityReadModel<Guid>
-    {
-        #region Generated Properties
-        /// <summary>
-        /// Gets or sets the property value for 'SessionId'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'SessionId'.
-        /// </value>
-        public Guid SessionId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'InstructorId'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'InstructorId'.
-        /// </value>
-        public Guid InstructorId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'InstructorRoleId'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'InstructorRoleId'.
-        /// </value>
-        public Guid? InstructorRoleId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'PeriodStart'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'PeriodStart'.
-        /// </value>
-        public DateTime PeriodStart { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'PeriodEnd'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'PeriodEnd'.
-        /// </value>
-        public DateTime PeriodEnd { get; set; }
-
-        #endregion
-
-    }
+    /// <value>
+    /// The property value for 'InstructorRoleId'.
+    /// </value>
+    public Guid? InstructorRoleId { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'PeriodStart'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'PeriodStart'.
+    /// </value>
+    public DateTime PeriodStart { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'PeriodEnd'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'PeriodEnd'.
+    /// </value>
+    public DateTime PeriodEnd { get; set; }
+
+    #endregion
+
 }
diff --git a/service/src/InstructorIQ.Core/Domain/SessionInstructor/Models/SessionInstructorUpdateModel.cs b/service/src/InstructorIQ.Core/Domain/SessionInstructor/Models/SessionInstructorUpdateModel.cs
index 73769d5f..37175acd 100644
--- a/service/src/InstructorIQ.Core/Domain/SessionInstructor/Models/SessionInstructorUpdateModel.cs
+++ b/service/src/InstructorIQ.Core/Domain/SessionInstructor/Models/SessionInstructorUpdateModel.cs
@@ -1,57 +1,57 @@
 using System;
 using System.Collections.Generic;
+
 using MediatR.CommandQuery.Models;
 
-namespace InstructorIQ.Core.Domain.Models
+namespace InstructorIQ.Core.Domain.Models;
+
+/// <summary>
+/// View Model class
+/// </summary>
+public partial class SessionInstructorUpdateModel
+    : EntityUpdateModel
 {
+    #region Generated Properties
+    /// <summary>
+    /// Gets or sets the property value for 'SessionId'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'SessionId'.
+    /// </value>
+    public Guid SessionId { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'InstructorId'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'InstructorId'.
+    /// </value>
+    public Guid InstructorId { get; set; }
+
     /// <summary>
-    /// View Model class
+    /// Gets or sets the property value for 'InstructorRoleId'.
     /// </summary>
-    public partial class SessionInstructorUpdateModel
-        : EntityUpdateModel
-    {
-        #region Generated Properties
-        /// <summary>
-        /// Gets or sets the property value for 'SessionId'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'SessionId'.
-        /// </value>
-        public Guid SessionId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'InstructorId'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'InstructorId'.
-        /// </value>
-        public Guid InstructorId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'InstructorRoleId'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'InstructorRoleId'.
-        /// </value>
-        public Guid? InstructorRoleId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'PeriodStart'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'PeriodStart'.
-        /// </value>
-        public DateTime PeriodStart { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'PeriodEnd'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'PeriodEnd'.
-        /// </value>
-        public DateTime PeriodEnd { get; set; }
-
-        #endregion
-
-    }
+    /// <value>
+    /// The property value for 'InstructorRoleId'.
+    /// </value>
+    public Guid? InstructorRoleId { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'PeriodStart'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'PeriodStart'.
+    /// </value>
+    public DateTime PeriodStart { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'PeriodEnd'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'PeriodEnd'.
+    /// </value>
+    public DateTime PeriodEnd { get; set; }
+
+    #endregion
+
 }
diff --git a/service/src/InstructorIQ.Core/Domain/SessionInstructor/SessionInstructorServiceRegistration.cs b/service/src/InstructorIQ.Core/Domain/SessionInstructor/SessionInstructorServiceRegistration.cs
index 4c541ddd..346c1861 100644
--- a/service/src/InstructorIQ.Core/Domain/SessionInstructor/SessionInstructorServiceRegistration.cs
+++ b/service/src/InstructorIQ.Core/Domain/SessionInstructor/SessionInstructorServiceRegistration.cs
@@ -7,19 +7,18 @@
 using Microsoft.Extensions.DependencyInjection;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain
-{
-    public class SessionInstructorServiceRegistration : DomainServiceRegistrationBase
-    {
+namespace InstructorIQ.Core.Domain;
 
-        [RegisterServices]
-        public override void Register(IServiceCollection services)
-        {
-            RegisterEntityQuery<Guid, InstructorIQ.Core.Data.Entities.SessionInstructor, SessionInstructorReadModel>(services);
+public class SessionInstructorServiceRegistration : DomainServiceRegistrationBase
+{
 
-            RegisterEntityCommand<Guid, InstructorIQ.Core.Data.Entities.SessionInstructor, SessionInstructorReadModel, SessionInstructorCreateModel, SessionInstructorUpdateModel>(services);
+    [RegisterServices]
+    public override void Register(IServiceCollection services)
+    {
+        RegisterEntityQuery<Guid, InstructorIQ.Core.Data.Entities.SessionInstructor, SessionInstructorReadModel>(services);
 
-        }
+        RegisterEntityCommand<Guid, InstructorIQ.Core.Data.Entities.SessionInstructor, SessionInstructorReadModel, SessionInstructorCreateModel, SessionInstructorUpdateModel>(services);
 
     }
+
 }
diff --git a/service/src/InstructorIQ.Core/Domain/SessionInstructor/Validation/SessionInstructorCreateModelValidator.cs b/service/src/InstructorIQ.Core/Domain/SessionInstructor/Validation/SessionInstructorCreateModelValidator.cs
index 0e2893f6..8edd40e4 100644
--- a/service/src/InstructorIQ.Core/Domain/SessionInstructor/Validation/SessionInstructorCreateModelValidator.cs
+++ b/service/src/InstructorIQ.Core/Domain/SessionInstructor/Validation/SessionInstructorCreateModelValidator.cs
@@ -1,23 +1,24 @@
 using System;
+
 using FluentValidation;
+
 using InstructorIQ.Core.Domain.Models;
 
-namespace InstructorIQ.Core.Domain.Validation
+namespace InstructorIQ.Core.Domain.Validation;
+
+/// <summary>
+/// Validator class for <see cref="SessionInstructorCreateModel"/> .
+/// </summary>
+public partial class SessionInstructorCreateModelValidator
+    : AbstractValidator<SessionInstructorCreateModel>
 {
     /// <summary>
-    /// Validator class for <see cref="SessionInstructorCreateModel"/> .
+    /// Initializes a new instance of the <see cref="SessionInstructorCreateModelValidator"/> class.
     /// </summary>
-    public partial class SessionInstructorCreateModelValidator
-        : AbstractValidator<SessionInstructorCreateModel>
+    public SessionInstructorCreateModelValidator()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SessionInstructorCreateModelValidator"/> class.
-        /// </summary>
-        public SessionInstructorCreateModelValidator()
-        {
-            #region Generated Constructor
-            #endregion
-        }
-
+        #region Generated Constructor
+        #endregion
     }
+
 }
diff --git a/service/src/InstructorIQ.Core/Domain/SessionInstructor/Validation/SessionInstructorUpdateModelValidator.cs b/service/src/InstructorIQ.Core/Domain/SessionInstructor/Validation/SessionInstructorUpdateModelValidator.cs
index 6b0136db..e4f60887 100644
--- a/service/src/InstructorIQ.Core/Domain/SessionInstructor/Validation/SessionInstructorUpdateModelValidator.cs
+++ b/service/src/InstructorIQ.Core/Domain/SessionInstructor/Validation/SessionInstructorUpdateModelValidator.cs
@@ -1,23 +1,24 @@
 using System;
+
 using FluentValidation;
+
 using InstructorIQ.Core.Domain.Models;
 
-namespace InstructorIQ.Core.Domain.Validation
+namespace InstructorIQ.Core.Domain.Validation;
+
+/// <summary>
+/// Validator class for <see cref="SessionInstructorUpdateModel"/> .
+/// </summary>
+public partial class SessionInstructorUpdateModelValidator
+    : AbstractValidator<SessionInstructorUpdateModel>
 {
     /// <summary>
-    /// Validator class for <see cref="SessionInstructorUpdateModel"/> .
+    /// Initializes a new instance of the <see cref="SessionInstructorUpdateModelValidator"/> class.
     /// </summary>
-    public partial class SessionInstructorUpdateModelValidator
-        : AbstractValidator<SessionInstructorUpdateModel>
+    public SessionInstructorUpdateModelValidator()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SessionInstructorUpdateModelValidator"/> class.
-        /// </summary>
-        public SessionInstructorUpdateModelValidator()
-        {
-            #region Generated Constructor
-            #endregion
-        }
-
+        #region Generated Constructor
+        #endregion
     }
+
 }
diff --git a/service/src/InstructorIQ.Core/Domain/SignUp/Commands/SignUpCommand.cs b/service/src/InstructorIQ.Core/Domain/SignUp/Commands/SignUpCommand.cs
index c0cff568..5d603e72 100644
--- a/service/src/InstructorIQ.Core/Domain/SignUp/Commands/SignUpCommand.cs
+++ b/service/src/InstructorIQ.Core/Domain/SignUp/Commands/SignUpCommand.cs
@@ -1,27 +1,28 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Security.Principal;
+
 using InstructorIQ.Core.Domain.Models;
+
 using MediatR.CommandQuery.Commands;
 using MediatR.CommandQuery.Models;
 
-namespace InstructorIQ.Core.Domain.Commands
+namespace InstructorIQ.Core.Domain.Commands;
+
+public class SignUpCommand : PrincipalCommandBase<CompleteModel>
 {
-    public class SignUpCommand : PrincipalCommandBase<CompleteModel>
+    public SignUpCommand(IPrincipal principal, Guid id, SignUpUpdateModel instructorSignUp, IEnumerable<SignUpTopicUpdateModel> instructorSignUpTopics)
+        : base(principal)
     {
-        public SignUpCommand(IPrincipal principal, Guid id, SignUpUpdateModel instructorSignUp, IEnumerable<SignUpTopicUpdateModel> instructorSignUpTopics)
-            : base(principal)
-        {
-            InstructorSignUp = instructorSignUp;
-            InstructorSignUpTopics = instructorSignUpTopics.ToList();
-            Id = id;
-        }
+        InstructorSignUp = instructorSignUp;
+        InstructorSignUpTopics = instructorSignUpTopics.ToList();
+        Id = id;
+    }
 
-        public Guid Id { get; }
+    public Guid Id { get; }
 
-        public SignUpUpdateModel InstructorSignUp { get; }
+    public SignUpUpdateModel InstructorSignUp { get; }
 
-        public List<SignUpTopicUpdateModel> InstructorSignUpTopics { get; }
-    }
+    public List<SignUpTopicUpdateModel> InstructorSignUpTopics { get; }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/SignUp/Handlers/SignUpCommandHandler.cs b/service/src/InstructorIQ.Core/Domain/SignUp/Handlers/SignUpCommandHandler.cs
index 031383a8..7db49eac 100644
--- a/service/src/InstructorIQ.Core/Domain/SignUp/Handlers/SignUpCommandHandler.cs
+++ b/service/src/InstructorIQ.Core/Domain/SignUp/Handlers/SignUpCommandHandler.cs
@@ -1,53 +1,56 @@
-using System;
+using System;
 using System.Threading;
 using System.Threading.Tasks;
+
 using AutoMapper;
+
 using InstructorIQ.Core.Data;
 using InstructorIQ.Core.Domain.Commands;
 using InstructorIQ.Core.Domain.Models;
+
 using MediatR;
 using MediatR.CommandQuery.Commands;
 using MediatR.CommandQuery.EntityFrameworkCore.Handlers;
 using MediatR.CommandQuery.Models;
 using MediatR.CommandQuery.Queries;
+
 using Microsoft.Extensions.Logging;
 
-namespace InstructorIQ.Core.Domain.Handlers
-{
-    public class SignUpCommandHandler : DataContextHandlerBase<InstructorIQContext, SignUpCommand, CompleteModel>
-    {
-        private readonly IMediator _mediator;
+namespace InstructorIQ.Core.Domain.Handlers;
 
-        public SignUpCommandHandler(ILoggerFactory loggerFactory, InstructorIQContext dataContext, IMapper mapper, IMediator mediator)
-            : base(loggerFactory, dataContext, mapper)
-        {
-            _mediator = mediator;
-        }
+public class SignUpCommandHandler : DataContextHandlerBase<InstructorIQContext, SignUpCommand, CompleteModel>
+{
+    private readonly IMediator _mediator;
 
-        protected override async Task<CompleteModel> Process(SignUpCommand request, CancellationToken cancellationToken)
-        {
-            var principal = request.Principal;
+    public SignUpCommandHandler(ILoggerFactory loggerFactory, InstructorIQContext dataContext, IMapper mapper, IMediator mediator)
+        : base(loggerFactory, dataContext, mapper)
+    {
+        _mediator = mediator;
+    }
 
-            var updateCommand = new EntityUpsertCommand<Guid, SignUpUpdateModel, SignUpReadModel>(principal, request.Id, request.InstructorSignUp);
-            var updateModel = await _mediator.Send(updateCommand, cancellationToken);
+    protected override async Task<CompleteModel> Process(SignUpCommand request, CancellationToken cancellationToken)
+    {
+        var principal = request.Principal;
 
-            foreach (var signupTopic in request.InstructorSignUpTopics)
-            {
-                var signupTopicCommand = new EntityUpsertCommand<Guid, SignUpTopicUpdateModel, SignUpTopicReadModel>(principal, signupTopic.Id, signupTopic);
-                var signupTopicModel = await _mediator.Send(signupTopicCommand, cancellationToken);
+        var updateCommand = new EntityUpsertCommand<Guid, SignUpUpdateModel, SignUpReadModel>(principal, request.Id, request.InstructorSignUp);
+        var updateModel = await _mediator.Send(updateCommand, cancellationToken);
 
-                var topicId = signupTopicModel.TopicId;
+        foreach (var signupTopic in request.InstructorSignUpTopics)
+        {
+            var signupTopicCommand = new EntityUpsertCommand<Guid, SignUpTopicUpdateModel, SignUpTopicReadModel>(principal, signupTopic.Id, signupTopic);
+            var signupTopicModel = await _mediator.Send(signupTopicCommand, cancellationToken);
 
-                var topicReadCommand = new EntityIdentifierQuery<Guid, TopicUpdateModel>(principal, topicId);
-                var topicModel = await _mediator.Send(topicReadCommand, cancellationToken);
+            var topicId = signupTopicModel.TopicId;
 
-                topicModel.InstructorSlots = signupTopic.TopicInstructorSlots;
+            var topicReadCommand = new EntityIdentifierQuery<Guid, TopicUpdateModel>(principal, topicId);
+            var topicModel = await _mediator.Send(topicReadCommand, cancellationToken);
 
-                var topicUpdateCommand = new EntityUpdateCommand<Guid, TopicUpdateModel, TopicReadModel>(principal, topicId, topicModel);
-                var updatedModel = await _mediator.Send(topicUpdateCommand, cancellationToken);
-            }
+            topicModel.InstructorSlots = signupTopic.TopicInstructorSlots;
 
-            return new CompleteModel();
+            var topicUpdateCommand = new EntityUpdateCommand<Guid, TopicUpdateModel, TopicReadModel>(principal, topicId, topicModel);
+            var updatedModel = await _mediator.Send(topicUpdateCommand, cancellationToken);
         }
+
+        return new CompleteModel();
     }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/SignUp/Mapping/SignUpProfile.cs b/service/src/InstructorIQ.Core/Domain/SignUp/Mapping/SignUpProfile.cs
index de8897c7..77250c91 100644
--- a/service/src/InstructorIQ.Core/Domain/SignUp/Mapping/SignUpProfile.cs
+++ b/service/src/InstructorIQ.Core/Domain/SignUp/Mapping/SignUpProfile.cs
@@ -1,35 +1,36 @@
 using System;
+
 using AutoMapper;
+
 using InstructorIQ.Core.Data.Entities;
 using InstructorIQ.Core.Domain.Models;
 
-namespace InstructorIQ.Core.Domain.Mapping
+namespace InstructorIQ.Core.Domain.Mapping;
+
+/// <summary>
+/// Mapper class for entity <see cref="SignUp"/> .
+/// </summary>
+public partial class SignUpProfile
+    : Profile
 {
     /// <summary>
-    /// Mapper class for entity <see cref="SignUp"/> .
+    /// Initializes a new instance of the <see cref="SignUpProfile"/> class.
     /// </summary>
-    public partial class SignUpProfile
-        : Profile
+    public SignUpProfile()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SignUpProfile"/> class.
-        /// </summary>
-        public SignUpProfile()
-        {
-            CreateMap<SignUp, SignUpReadModel>()
-                .ForMember(d => d.RowVersion, opt => opt.MapFrom(s => Convert.ToBase64String(s.RowVersion)));
+        CreateMap<SignUp, SignUpReadModel>()
+            .ForMember(d => d.RowVersion, opt => opt.MapFrom(s => Convert.ToBase64String(s.RowVersion)));
 
-            CreateMap<SignUpCreateModel, SignUp>();
+        CreateMap<SignUpCreateModel, SignUp>();
 
-            CreateMap<SignUp, SignUpUpdateModel>()
-                .ForMember(d => d.RowVersion, opt => opt.MapFrom(s => Convert.ToBase64String(s.RowVersion)));
+        CreateMap<SignUp, SignUpUpdateModel>()
+            .ForMember(d => d.RowVersion, opt => opt.MapFrom(s => Convert.ToBase64String(s.RowVersion)));
 
-            CreateMap<SignUpUpdateModel, SignUp>()
-                .ForMember(d => d.RowVersion, opt => opt.MapFrom(s => Convert.FromBase64String(s.RowVersion)));
+        CreateMap<SignUpUpdateModel, SignUp>()
+            .ForMember(d => d.RowVersion, opt => opt.MapFrom(s => Convert.FromBase64String(s.RowVersion)));
 
-            CreateMap<SignUpReadModel, SignUpUpdateModel>();
-
-        }
+        CreateMap<SignUpReadModel, SignUpUpdateModel>();
 
     }
+
 }
diff --git a/service/src/InstructorIQ.Core/Domain/SignUp/Models/SignUpCreateModel.cs b/service/src/InstructorIQ.Core/Domain/SignUp/Models/SignUpCreateModel.cs
index f62c6a65..364ee75d 100644
--- a/service/src/InstructorIQ.Core/Domain/SignUp/Models/SignUpCreateModel.cs
+++ b/service/src/InstructorIQ.Core/Domain/SignUp/Models/SignUpCreateModel.cs
@@ -1,42 +1,42 @@
 using System;
 using System.Collections.Generic;
+
 using MediatR.CommandQuery.Definitions;
 using MediatR.CommandQuery.Models;
 
-namespace InstructorIQ.Core.Domain.Models
+namespace InstructorIQ.Core.Domain.Models;
+
+/// <summary>
+/// View Model class
+/// </summary>
+public partial class SignUpCreateModel
+    : EntityCreateModel<Guid>, IHaveTenant<Guid>
 {
+    #region Generated Properties
     /// <summary>
-    /// View Model class
+    /// Gets or sets the property value for 'Name'.
     /// </summary>
-    public partial class SignUpCreateModel
-        : EntityCreateModel<Guid>, IHaveTenant<Guid>
-    {
-        #region Generated Properties
-        /// <summary>
-        /// Gets or sets the property value for 'Name'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Name'.
-        /// </value>
-        public string Name { get; set; }
+    /// <value>
+    /// The property value for 'Name'.
+    /// </value>
+    public string Name { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'Description'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Description'.
-        /// </value>
-        public string Description { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'Description'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'Description'.
+    /// </value>
+    public string Description { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'TenantId'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'TenantId'.
-        /// </value>
-        public Guid TenantId { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'TenantId'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'TenantId'.
+    /// </value>
+    public Guid TenantId { get; set; }
 
-        #endregion
+    #endregion
 
-    }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/SignUp/Models/SignUpReadModel.cs b/service/src/InstructorIQ.Core/Domain/SignUp/Models/SignUpReadModel.cs
index cbda9953..104823e7 100644
--- a/service/src/InstructorIQ.Core/Domain/SignUp/Models/SignUpReadModel.cs
+++ b/service/src/InstructorIQ.Core/Domain/SignUp/Models/SignUpReadModel.cs
@@ -1,42 +1,42 @@
 using System;
 using System.Collections.Generic;
+
 using MediatR.CommandQuery.Definitions;
 using MediatR.CommandQuery.Models;
 
-namespace InstructorIQ.Core.Domain.Models
+namespace InstructorIQ.Core.Domain.Models;
+
+/// <summary>
+/// View Model class
+/// </summary>
+public partial class SignUpReadModel
+    : EntityReadModel<Guid>, IHaveTenant<Guid>
 {
+    #region Generated Properties
     /// <summary>
-    /// View Model class
+    /// Gets or sets the property value for 'Name'.
     /// </summary>
-    public partial class SignUpReadModel
-        : EntityReadModel<Guid>, IHaveTenant<Guid>
-    {
-        #region Generated Properties
-        /// <summary>
-        /// Gets or sets the property value for 'Name'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Name'.
-        /// </value>
-        public string Name { get; set; }
+    /// <value>
+    /// The property value for 'Name'.
+    /// </value>
+    public string Name { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'Description'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Description'.
-        /// </value>
-        public string Description { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'Description'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'Description'.
+    /// </value>
+    public string Description { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'TenantId'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'TenantId'.
-        /// </value>
-        public Guid TenantId { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'TenantId'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'TenantId'.
+    /// </value>
+    public Guid TenantId { get; set; }
 
-        #endregion
+    #endregion
 
-    }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/SignUp/Models/SignUpUpdateModel.cs b/service/src/InstructorIQ.Core/Domain/SignUp/Models/SignUpUpdateModel.cs
index 4539039a..17601352 100644
--- a/service/src/InstructorIQ.Core/Domain/SignUp/Models/SignUpUpdateModel.cs
+++ b/service/src/InstructorIQ.Core/Domain/SignUp/Models/SignUpUpdateModel.cs
@@ -1,41 +1,41 @@
 using System;
 using System.Collections.Generic;
+
 using MediatR.CommandQuery.Definitions;
 using MediatR.CommandQuery.Models;
 
-namespace InstructorIQ.Core.Domain.Models
+namespace InstructorIQ.Core.Domain.Models;
+
+/// <summary>
+/// View Model class
+/// </summary>
+public partial class SignUpUpdateModel
+    : EntityUpdateModel, IHaveTenant<Guid>
 {
+    #region Generated Properties
     /// <summary>
-    /// View Model class
+    /// Gets or sets the property value for 'Name'.
     /// </summary>
-    public partial class SignUpUpdateModel
-        : EntityUpdateModel, IHaveTenant<Guid>
-    {
-        #region Generated Properties
-        /// <summary>
-        /// Gets or sets the property value for 'Name'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Name'.
-        /// </value>
-        public string Name { get; set; }
+    /// <value>
+    /// The property value for 'Name'.
+    /// </value>
+    public string Name { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'Description'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Description'.
-        /// </value>
-        public string Description { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'Description'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'Description'.
+    /// </value>
+    public string Description { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'TenantId'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'TenantId'.
-        /// </value>
-        public Guid TenantId { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'TenantId'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'TenantId'.
+    /// </value>
+    public Guid TenantId { get; set; }
 
-        #endregion
-    }
+    #endregion
 }
diff --git a/service/src/InstructorIQ.Core/Domain/SignUp/SignUpServiceRegistration.cs b/service/src/InstructorIQ.Core/Domain/SignUp/SignUpServiceRegistration.cs
index d2b5d775..4c844016 100644
--- a/service/src/InstructorIQ.Core/Domain/SignUp/SignUpServiceRegistration.cs
+++ b/service/src/InstructorIQ.Core/Domain/SignUp/SignUpServiceRegistration.cs
@@ -13,19 +13,18 @@
 using Microsoft.Extensions.DependencyInjection.Extensions;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain
-{
-    public class SignUpServiceRegistration : DomainServiceRegistrationBase
-    {
+namespace InstructorIQ.Core.Domain;
 
-        [RegisterServices]
-        public override void Register(IServiceCollection services)
-        {
-            RegisterEntityQuery<Guid, Data.Entities.SignUp, SignUpReadModel>(services);
-            RegisterEntityCommand<Guid, Data.Entities.SignUp, SignUpReadModel, SignUpCreateModel, SignUpUpdateModel>(services);
+public class SignUpServiceRegistration : DomainServiceRegistrationBase
+{
 
-            services.TryAddTransient<IRequestHandler<SignUpCommand, CompleteModel>, SignUpCommandHandler>();
-        }
+    [RegisterServices]
+    public override void Register(IServiceCollection services)
+    {
+        RegisterEntityQuery<Guid, Data.Entities.SignUp, SignUpReadModel>(services);
+        RegisterEntityCommand<Guid, Data.Entities.SignUp, SignUpReadModel, SignUpCreateModel, SignUpUpdateModel>(services);
 
+        services.TryAddTransient<IRequestHandler<SignUpCommand, CompleteModel>, SignUpCommandHandler>();
     }
+
 }
diff --git a/service/src/InstructorIQ.Core/Domain/SignUp/Validation/SignUpCreateModelValidator.cs b/service/src/InstructorIQ.Core/Domain/SignUp/Validation/SignUpCreateModelValidator.cs
index e1f8742e..6c40eb91 100644
--- a/service/src/InstructorIQ.Core/Domain/SignUp/Validation/SignUpCreateModelValidator.cs
+++ b/service/src/InstructorIQ.Core/Domain/SignUp/Validation/SignUpCreateModelValidator.cs
@@ -1,25 +1,26 @@
 using System;
+
 using FluentValidation;
+
 using InstructorIQ.Core.Domain.Models;
 
-namespace InstructorIQ.Core.Domain.Validation
+namespace InstructorIQ.Core.Domain.Validation;
+
+/// <summary>
+/// Validator class for <see cref="SignUpCreateModel"/> .
+/// </summary>
+public partial class SignUpCreateModelValidator
+    : AbstractValidator<SignUpCreateModel>
 {
     /// <summary>
-    /// Validator class for <see cref="SignUpCreateModel"/> .
+    /// Initializes a new instance of the <see cref="SignUpCreateModelValidator"/> class.
     /// </summary>
-    public partial class SignUpCreateModelValidator
-        : AbstractValidator<SignUpCreateModel>
+    public SignUpCreateModelValidator()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SignUpCreateModelValidator"/> class.
-        /// </summary>
-        public SignUpCreateModelValidator()
-        {
-            #region Generated Constructor
-            RuleFor(p => p.Name).NotEmpty();
-            RuleFor(p => p.Name).MaximumLength(100);
-            #endregion
-        }
-
+        #region Generated Constructor
+        RuleFor(p => p.Name).NotEmpty();
+        RuleFor(p => p.Name).MaximumLength(100);
+        #endregion
     }
+
 }
diff --git a/service/src/InstructorIQ.Core/Domain/SignUp/Validation/SignUpUpdateModelValidator.cs b/service/src/InstructorIQ.Core/Domain/SignUp/Validation/SignUpUpdateModelValidator.cs
index 926a22c8..f9a47065 100644
--- a/service/src/InstructorIQ.Core/Domain/SignUp/Validation/SignUpUpdateModelValidator.cs
+++ b/service/src/InstructorIQ.Core/Domain/SignUp/Validation/SignUpUpdateModelValidator.cs
@@ -1,25 +1,26 @@
 using System;
+
 using FluentValidation;
+
 using InstructorIQ.Core.Domain.Models;
 
-namespace InstructorIQ.Core.Domain.Validation
+namespace InstructorIQ.Core.Domain.Validation;
+
+/// <summary>
+/// Validator class for <see cref="SignUpUpdateModel"/> .
+/// </summary>
+public partial class SignUpUpdateModelValidator
+    : AbstractValidator<SignUpUpdateModel>
 {
     /// <summary>
-    /// Validator class for <see cref="SignUpUpdateModel"/> .
+    /// Initializes a new instance of the <see cref="SignUpUpdateModelValidator"/> class.
     /// </summary>
-    public partial class SignUpUpdateModelValidator
-        : AbstractValidator<SignUpUpdateModel>
+    public SignUpUpdateModelValidator()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SignUpUpdateModelValidator"/> class.
-        /// </summary>
-        public SignUpUpdateModelValidator()
-        {
-            #region Generated Constructor
-            RuleFor(p => p.Name).NotEmpty();
-            RuleFor(p => p.Name).MaximumLength(100);
-            #endregion
-        }
-
+        #region Generated Constructor
+        RuleFor(p => p.Name).NotEmpty();
+        RuleFor(p => p.Name).MaximumLength(100);
+        #endregion
     }
+
 }
diff --git a/service/src/InstructorIQ.Core/Domain/SignUpTopic/Mapping/SignUpTopicProfile.cs b/service/src/InstructorIQ.Core/Domain/SignUpTopic/Mapping/SignUpTopicProfile.cs
index d2a38877..f7e71b2a 100644
--- a/service/src/InstructorIQ.Core/Domain/SignUpTopic/Mapping/SignUpTopicProfile.cs
+++ b/service/src/InstructorIQ.Core/Domain/SignUpTopic/Mapping/SignUpTopicProfile.cs
@@ -1,62 +1,63 @@
 using System;
 using System.Linq;
+
 using AutoMapper;
+
 using InstructorIQ.Core.Data.Entities;
 using InstructorIQ.Core.Domain.Models;
 
-namespace InstructorIQ.Core.Domain.Mapping
+namespace InstructorIQ.Core.Domain.Mapping;
+
+/// <summary>
+/// Mapper class for entity <see cref="SignUpTopic"/> .
+/// </summary>
+public partial class SignUpTopicProfile
+    : Profile
 {
     /// <summary>
-    /// Mapper class for entity <see cref="SignUpTopic"/> .
+    /// Initializes a new instance of the <see cref="SignUpTopicProfile"/> class.
     /// </summary>
-    public partial class SignUpTopicProfile
-        : Profile
+    public SignUpTopicProfile()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SignUpTopicProfile"/> class.
-        /// </summary>
-        public SignUpTopicProfile()
-        {
-            CreateMap<SignUpTopic, SignUpTopicReadModel>()
-                .ForMember(d => d.RowVersion, opt => opt.MapFrom(s => Convert.ToBase64String(s.RowVersion)))
-                .ForMember(d => d.TopicTitle, opt => opt.MapFrom(s => s.Topic.Title))
-                .ForMember(d => d.TopicCalendarYear, opt => opt.MapFrom(s => s.Topic.CalendarYear))
-                .ForMember(d => d.TopicTargetMonth, opt => opt.MapFrom(s => s.Topic.TargetMonth))
-                .ForMember(d => d.TopicInstructorSlots, opt => opt.MapFrom(s => s.Topic.InstructorSlots))
-                .ForMember(d => d.TopicInstructors, opt => opt.MapFrom(s => s.Topic.TopicInstructors.Select(i => new TopicInstructorReadModel
-                {
-                    Id = i.Id,
-                    InstructorId = i.InstructorId,
-                    TopicId = i.TopicId,
-                    InstructorRoleId = i.InstructorRoleId,
-                    Created = i.Created,
-                    CreatedBy = i.CreatedBy,
-                    Updated = i.Updated,
-                    UpdatedBy = i.UpdatedBy,
-                    PeriodStart = i.PeriodStart,
-                    PeriodEnd = i.PeriodEnd,
-                    InstructorDisplayName = i.Instructor.DisplayName,
-                    InstructorSortName = i.Instructor.SortName,
-                    InstructorGivenName = i.Instructor.GivenName,
-                    InstructorFamilyName = i.Instructor.FamilyName,
-                    InstructorEmailAddress = i.Instructor.Email
-                })));
-
-            CreateMap<SignUpTopicCreateModel, SignUpTopic>();
-
-            CreateMap<SignUpTopic, SignUpTopicUpdateModel>()
-                .ForMember(d => d.RowVersion, opt => opt.MapFrom(s => Convert.ToBase64String(s.RowVersion)))
-                .ForMember(d => d.TopicTitle, opt => opt.MapFrom(s => s.Topic.Title))
-                .ForMember(d => d.TopicCalendarYear, opt => opt.MapFrom(s => s.Topic.CalendarYear))
-                .ForMember(d => d.TopicTargetMonth, opt => opt.MapFrom(s => s.Topic.TargetMonth))
-                .ForMember(d => d.TopicInstructorSlots, opt => opt.MapFrom(s => s.Topic.InstructorSlots));
-
-            CreateMap<SignUpTopicUpdateModel, SignUpTopic>()
-                .ForMember(d => d.RowVersion, opt => opt.MapFrom(s => Convert.FromBase64String(s.RowVersion)));
-
-            CreateMap<SignUpTopicReadModel, SignUpTopicUpdateModel>();
-
-        }
+        CreateMap<SignUpTopic, SignUpTopicReadModel>()
+            .ForMember(d => d.RowVersion, opt => opt.MapFrom(s => Convert.ToBase64String(s.RowVersion)))
+            .ForMember(d => d.TopicTitle, opt => opt.MapFrom(s => s.Topic.Title))
+            .ForMember(d => d.TopicCalendarYear, opt => opt.MapFrom(s => s.Topic.CalendarYear))
+            .ForMember(d => d.TopicTargetMonth, opt => opt.MapFrom(s => s.Topic.TargetMonth))
+            .ForMember(d => d.TopicInstructorSlots, opt => opt.MapFrom(s => s.Topic.InstructorSlots))
+            .ForMember(d => d.TopicInstructors, opt => opt.MapFrom(s => s.Topic.TopicInstructors.Select(i => new TopicInstructorReadModel
+            {
+                Id = i.Id,
+                InstructorId = i.InstructorId,
+                TopicId = i.TopicId,
+                InstructorRoleId = i.InstructorRoleId,
+                Created = i.Created,
+                CreatedBy = i.CreatedBy,
+                Updated = i.Updated,
+                UpdatedBy = i.UpdatedBy,
+                PeriodStart = i.PeriodStart,
+                PeriodEnd = i.PeriodEnd,
+                InstructorDisplayName = i.Instructor.DisplayName,
+                InstructorSortName = i.Instructor.SortName,
+                InstructorGivenName = i.Instructor.GivenName,
+                InstructorFamilyName = i.Instructor.FamilyName,
+                InstructorEmailAddress = i.Instructor.Email
+            })));
+
+        CreateMap<SignUpTopicCreateModel, SignUpTopic>();
+
+        CreateMap<SignUpTopic, SignUpTopicUpdateModel>()
+            .ForMember(d => d.RowVersion, opt => opt.MapFrom(s => Convert.ToBase64String(s.RowVersion)))
+            .ForMember(d => d.TopicTitle, opt => opt.MapFrom(s => s.Topic.Title))
+            .ForMember(d => d.TopicCalendarYear, opt => opt.MapFrom(s => s.Topic.CalendarYear))
+            .ForMember(d => d.TopicTargetMonth, opt => opt.MapFrom(s => s.Topic.TargetMonth))
+            .ForMember(d => d.TopicInstructorSlots, opt => opt.MapFrom(s => s.Topic.InstructorSlots));
+
+        CreateMap<SignUpTopicUpdateModel, SignUpTopic>()
+            .ForMember(d => d.RowVersion, opt => opt.MapFrom(s => Convert.FromBase64String(s.RowVersion)));
+
+        CreateMap<SignUpTopicReadModel, SignUpTopicUpdateModel>();
 
     }
+
 }
diff --git a/service/src/InstructorIQ.Core/Domain/SignUpTopic/Models/SignUpTopicCreateModel.cs b/service/src/InstructorIQ.Core/Domain/SignUpTopic/Models/SignUpTopicCreateModel.cs
index efd23e01..6cd255b6 100644
--- a/service/src/InstructorIQ.Core/Domain/SignUpTopic/Models/SignUpTopicCreateModel.cs
+++ b/service/src/InstructorIQ.Core/Domain/SignUpTopic/Models/SignUpTopicCreateModel.cs
@@ -1,33 +1,33 @@
 using System;
 using System.Collections.Generic;
+
 using MediatR.CommandQuery.Models;
 
-namespace InstructorIQ.Core.Domain.Models
+namespace InstructorIQ.Core.Domain.Models;
+
+/// <summary>
+/// View Model class
+/// </summary>
+public partial class SignUpTopicCreateModel
+    : EntityCreateModel<Guid>
 {
+    #region Generated Properties
     /// <summary>
-    /// View Model class
+    /// Gets or sets the property value for 'SignUpId'.
     /// </summary>
-    public partial class SignUpTopicCreateModel
-        : EntityCreateModel<Guid>
-    {
-        #region Generated Properties
-        /// <summary>
-        /// Gets or sets the property value for 'SignUpId'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'SignUpId'.
-        /// </value>
-        public Guid SignUpId { get; set; }
+    /// <value>
+    /// The property value for 'SignUpId'.
+    /// </value>
+    public Guid SignUpId { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'TopicId'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'TopicId'.
-        /// </value>
-        public Guid TopicId { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'TopicId'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'TopicId'.
+    /// </value>
+    public Guid TopicId { get; set; }
 
-        #endregion
+    #endregion
 
-    }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/SignUpTopic/Models/SignUpTopicReadModel.cs b/service/src/InstructorIQ.Core/Domain/SignUpTopic/Models/SignUpTopicReadModel.cs
index 95c55302..f9cff622 100644
--- a/service/src/InstructorIQ.Core/Domain/SignUpTopic/Models/SignUpTopicReadModel.cs
+++ b/service/src/InstructorIQ.Core/Domain/SignUpTopic/Models/SignUpTopicReadModel.cs
@@ -1,42 +1,42 @@
 using System;
 using System.Collections.Generic;
+
 using MediatR.CommandQuery.Models;
 
-namespace InstructorIQ.Core.Domain.Models
+namespace InstructorIQ.Core.Domain.Models;
+
+/// <summary>
+/// View Model class
+/// </summary>
+public partial class SignUpTopicReadModel
+    : EntityReadModel<Guid>
 {
+    #region Generated Properties
+    /// <summary>
+    /// Gets or sets the property value for 'SignUpId'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'SignUpId'.
+    /// </value>
+    public Guid SignUpId { get; set; }
+
     /// <summary>
-    /// View Model class
+    /// Gets or sets the property value for 'TopicId'.
     /// </summary>
-    public partial class SignUpTopicReadModel
-        : EntityReadModel<Guid>
-    {
-        #region Generated Properties
-        /// <summary>
-        /// Gets or sets the property value for 'SignUpId'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'SignUpId'.
-        /// </value>
-        public Guid SignUpId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'TopicId'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'TopicId'.
-        /// </value>
-        public Guid TopicId { get; set; }
-
-        #endregion
-
-        public string TopicTitle { get; set; }
-
-        public short TopicCalendarYear { get; set; }
-
-        public short? TopicTargetMonth { get; set; }
-
-        public int? TopicInstructorSlots { get; set; }
-
-        public List<TopicInstructorReadModel> TopicInstructors { get; set;}
-    }
+    /// <value>
+    /// The property value for 'TopicId'.
+    /// </value>
+    public Guid TopicId { get; set; }
+
+    #endregion
+
+    public string TopicTitle { get; set; }
+
+    public short TopicCalendarYear { get; set; }
+
+    public short? TopicTargetMonth { get; set; }
+
+    public int? TopicInstructorSlots { get; set; }
+
+    public List<TopicInstructorReadModel> TopicInstructors { get; set; }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/SignUpTopic/Models/SignUpTopicUpdateModel.cs b/service/src/InstructorIQ.Core/Domain/SignUpTopic/Models/SignUpTopicUpdateModel.cs
index eca62da7..48f4440d 100644
--- a/service/src/InstructorIQ.Core/Domain/SignUpTopic/Models/SignUpTopicUpdateModel.cs
+++ b/service/src/InstructorIQ.Core/Domain/SignUpTopic/Models/SignUpTopicUpdateModel.cs
@@ -1,39 +1,39 @@
 using System;
+
 using MediatR.CommandQuery.Models;
 
-namespace InstructorIQ.Core.Domain.Models
+namespace InstructorIQ.Core.Domain.Models;
+
+/// <summary>
+/// View Model class
+/// </summary>
+public partial class SignUpTopicUpdateModel
+    : EntityReadModel<Guid>
 {
+    #region Generated Properties
+    /// <summary>
+    /// Gets or sets the property value for 'SignUpId'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'SignUpId'.
+    /// </value>
+    public Guid SignUpId { get; set; }
+
     /// <summary>
-    /// View Model class
+    /// Gets or sets the property value for 'TopicId'.
     /// </summary>
-    public partial class SignUpTopicUpdateModel
-        : EntityReadModel<Guid>
-    {
-        #region Generated Properties
-        /// <summary>
-        /// Gets or sets the property value for 'SignUpId'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'SignUpId'.
-        /// </value>
-        public Guid SignUpId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'TopicId'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'TopicId'.
-        /// </value>
-        public Guid TopicId { get; set; }
-
-        #endregion
-
-        public string TopicTitle { get; set; }
-
-        public short TopicCalendarYear { get; set; }
-
-        public short? TopicTargetMonth { get; set; }
-
-        public int? TopicInstructorSlots { get; set; }
-    }
+    /// <value>
+    /// The property value for 'TopicId'.
+    /// </value>
+    public Guid TopicId { get; set; }
+
+    #endregion
+
+    public string TopicTitle { get; set; }
+
+    public short TopicCalendarYear { get; set; }
+
+    public short? TopicTargetMonth { get; set; }
+
+    public int? TopicInstructorSlots { get; set; }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/SignUpTopic/SignUpTopicServiceRegistration.cs b/service/src/InstructorIQ.Core/Domain/SignUpTopic/SignUpTopicServiceRegistration.cs
index f3e7c6db..c7e66de3 100644
--- a/service/src/InstructorIQ.Core/Domain/SignUpTopic/SignUpTopicServiceRegistration.cs
+++ b/service/src/InstructorIQ.Core/Domain/SignUpTopic/SignUpTopicServiceRegistration.cs
@@ -7,20 +7,19 @@
 using Microsoft.Extensions.DependencyInjection;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain
-{
-    public class SignUpTopicServiceRegistration : DomainServiceRegistrationBase
-    {
+namespace InstructorIQ.Core.Domain;
 
-        [RegisterServices]
-        public override void Register(IServiceCollection services)
-        {
-            RegisterEntityQuery<Guid, Data.Entities.SignUpTopic, SignUpTopicReadModel>(services);
-            RegisterEntityQuery<Guid, Data.Entities.SignUpTopic, SignUpTopicUpdateModel>(services);
+public class SignUpTopicServiceRegistration : DomainServiceRegistrationBase
+{
 
-            RegisterEntityCommand<Guid, Data.Entities.SignUpTopic, SignUpTopicReadModel, SignUpTopicCreateModel, SignUpTopicUpdateModel>(services);
+    [RegisterServices]
+    public override void Register(IServiceCollection services)
+    {
+        RegisterEntityQuery<Guid, Data.Entities.SignUpTopic, SignUpTopicReadModel>(services);
+        RegisterEntityQuery<Guid, Data.Entities.SignUpTopic, SignUpTopicUpdateModel>(services);
 
-        }
+        RegisterEntityCommand<Guid, Data.Entities.SignUpTopic, SignUpTopicReadModel, SignUpTopicCreateModel, SignUpTopicUpdateModel>(services);
 
     }
+
 }
diff --git a/service/src/InstructorIQ.Core/Domain/SignUpTopic/Validation/SignUpTopicCreateModelValidator.cs b/service/src/InstructorIQ.Core/Domain/SignUpTopic/Validation/SignUpTopicCreateModelValidator.cs
index 56fa87c1..4c1cbaab 100644
--- a/service/src/InstructorIQ.Core/Domain/SignUpTopic/Validation/SignUpTopicCreateModelValidator.cs
+++ b/service/src/InstructorIQ.Core/Domain/SignUpTopic/Validation/SignUpTopicCreateModelValidator.cs
@@ -1,23 +1,24 @@
 using System;
+
 using FluentValidation;
+
 using InstructorIQ.Core.Domain.Models;
 
-namespace InstructorIQ.Core.Domain.Validation
+namespace InstructorIQ.Core.Domain.Validation;
+
+/// <summary>
+/// Validator class for <see cref="SignUpTopicCreateModel"/> .
+/// </summary>
+public partial class SignUpTopicCreateModelValidator
+    : AbstractValidator<SignUpTopicCreateModel>
 {
     /// <summary>
-    /// Validator class for <see cref="SignUpTopicCreateModel"/> .
+    /// Initializes a new instance of the <see cref="SignUpTopicCreateModelValidator"/> class.
     /// </summary>
-    public partial class SignUpTopicCreateModelValidator
-        : AbstractValidator<SignUpTopicCreateModel>
+    public SignUpTopicCreateModelValidator()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SignUpTopicCreateModelValidator"/> class.
-        /// </summary>
-        public SignUpTopicCreateModelValidator()
-        {
-            #region Generated Constructor
-            #endregion
-        }
-
+        #region Generated Constructor
+        #endregion
     }
+
 }
diff --git a/service/src/InstructorIQ.Core/Domain/SignUpTopic/Validation/SignUpTopicUpdateModelValidator.cs b/service/src/InstructorIQ.Core/Domain/SignUpTopic/Validation/SignUpTopicUpdateModelValidator.cs
index 196ab67e..9574aa07 100644
--- a/service/src/InstructorIQ.Core/Domain/SignUpTopic/Validation/SignUpTopicUpdateModelValidator.cs
+++ b/service/src/InstructorIQ.Core/Domain/SignUpTopic/Validation/SignUpTopicUpdateModelValidator.cs
@@ -1,23 +1,24 @@
 using System;
+
 using FluentValidation;
+
 using InstructorIQ.Core.Domain.Models;
 
-namespace InstructorIQ.Core.Domain.Validation
+namespace InstructorIQ.Core.Domain.Validation;
+
+/// <summary>
+/// Validator class for <see cref="SignUpTopicUpdateModel"/> .
+/// </summary>
+public partial class SignUpTopicUpdateModelValidator
+    : AbstractValidator<SignUpTopicUpdateModel>
 {
     /// <summary>
-    /// Validator class for <see cref="SignUpTopicUpdateModel"/> .
+    /// Initializes a new instance of the <see cref="SignUpTopicUpdateModelValidator"/> class.
     /// </summary>
-    public partial class SignUpTopicUpdateModelValidator
-        : AbstractValidator<SignUpTopicUpdateModel>
+    public SignUpTopicUpdateModelValidator()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SignUpTopicUpdateModelValidator"/> class.
-        /// </summary>
-        public SignUpTopicUpdateModelValidator()
-        {
-            #region Generated Constructor
-            #endregion
-        }
-
+        #region Generated Constructor
+        #endregion
     }
+
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Template/Handlers/TemplateDropdownQueryHandler.cs b/service/src/InstructorIQ.Core/Domain/Template/Handlers/TemplateDropdownQueryHandler.cs
index f74734ea..afddaa36 100644
--- a/service/src/InstructorIQ.Core/Domain/Template/Handlers/TemplateDropdownQueryHandler.cs
+++ b/service/src/InstructorIQ.Core/Domain/Template/Handlers/TemplateDropdownQueryHandler.cs
@@ -1,48 +1,51 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+
 using AutoMapper;
 using AutoMapper.QueryableExtensions;
+
 using InstructorIQ.Core.Data;
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Domain.Queries;
 using InstructorIQ.Core.Extensions;
 using InstructorIQ.Core.Security;
+
 using MediatR.CommandQuery.EntityFrameworkCore.Handlers;
+
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Handlers
+namespace InstructorIQ.Core.Domain.Handlers;
+
+public class TemplateDropdownQueryHandler : DataContextHandlerBase<InstructorIQContext, TemplateDropdownQuery, IReadOnlyCollection<TemplateDropdownModel>>
 {
-    public class TemplateDropdownQueryHandler : DataContextHandlerBase<InstructorIQContext, TemplateDropdownQuery, IReadOnlyCollection<TemplateDropdownModel>>
-    {
-        private readonly UserClaimManager _userClaimManager;
+    private readonly UserClaimManager _userClaimManager;
 
-        public TemplateDropdownQueryHandler(ILoggerFactory loggerFactory, InstructorIQContext dataContext, IMapper mapper, UserClaimManager userClaimManager)
-            : base(loggerFactory, dataContext, mapper)
-        {
-            _userClaimManager = userClaimManager;
-        }
+    public TemplateDropdownQueryHandler(ILoggerFactory loggerFactory, InstructorIQContext dataContext, IMapper mapper, UserClaimManager userClaimManager)
+        : base(loggerFactory, dataContext, mapper)
+    {
+        _userClaimManager = userClaimManager;
+    }
 
-        protected override async Task<IReadOnlyCollection<TemplateDropdownModel>> Process(TemplateDropdownQuery request, CancellationToken cancellationToken)
-        {
-            var tenantId = _userClaimManager.GetRequiredTenantId(request.Principal);
+    protected override async Task<IReadOnlyCollection<TemplateDropdownModel>> Process(TemplateDropdownQuery request, CancellationToken cancellationToken)
+    {
+        var tenantId = _userClaimManager.GetRequiredTenantId(request.Principal);
 
-            var query = DataContext.Templates
-                .AsNoTracking()
-                .Where(q => q.TenantId == tenantId);
+        var query = DataContext.Templates
+            .AsNoTracking()
+            .Where(q => q.TenantId == tenantId);
 
-            if (request.TemplateType.HasValue())
-                query = query.Where(q => q.TemplateType == request.TemplateType);
+        if (request.TemplateType.HasValue())
+            query = query.Where(q => q.TemplateType == request.TemplateType);
 
-            var result = await query
-                .OrderBy(q => q.Name)
-                .ProjectTo<TemplateDropdownModel>(Mapper.ConfigurationProvider)
-                .ToListAsync(cancellationToken);
+        var result = await query
+            .OrderBy(q => q.Name)
+            .ProjectTo<TemplateDropdownModel>(Mapper.ConfigurationProvider)
+            .ToListAsync(cancellationToken);
 
-            return result;
-        }
+        return result;
     }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.Core/Domain/Template/Mapping/TemplateProfile.cs b/service/src/InstructorIQ.Core/Domain/Template/Mapping/TemplateProfile.cs
index 59c8527d..450db367 100644
--- a/service/src/InstructorIQ.Core/Domain/Template/Mapping/TemplateProfile.cs
+++ b/service/src/InstructorIQ.Core/Domain/Template/Mapping/TemplateProfile.cs
@@ -1,44 +1,45 @@
 using System;
+
 using AutoMapper;
+
 using InstructorIQ.Core.Data.Entities;
 using InstructorIQ.Core.Domain.Models;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Mapping
+namespace InstructorIQ.Core.Domain.Mapping;
+
+/// <summary>
+/// Mapper class for entity <see cref="Template"/> .
+/// </summary>
+public partial class TemplateProfile
+    : Profile
 {
     /// <summary>
-    /// Mapper class for entity <see cref="Template"/> .
+    /// Initializes a new instance of the <see cref="TemplateProfile"/> class.
     /// </summary>
-    public partial class TemplateProfile
-        : Profile
+    public TemplateProfile()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TemplateProfile"/> class.
-        /// </summary>
-        public TemplateProfile()
-        {
-            CreateMap<TemplateCreateModel, Template>();
-
-            CreateMap<TemplateUpdateModel, Template>()
-                .ForMember(d => d.RowVersion, opt => opt.MapFrom(s => Convert.FromBase64String(s.RowVersion)));
-
-            CreateMap<Template, TemplateReadModel>()
-                .ForMember(d => d.RowVersion, opt => opt.MapFrom(s => Convert.ToBase64String(s.RowVersion)));
-
-            CreateMap<Template, TemplateUpdateModel>()
-                .ForMember(d => d.RowVersion, opt => opt.MapFrom(s => Convert.ToBase64String(s.RowVersion)));
-
-            CreateMap<Template, TemplateDropdownModel>()
-                .ForMember(d => d.Value, opt => opt.MapFrom(s => s.Id))
-                .ForMember(d => d.Text, opt => opt.MapFrom(s => s.Name));
-
-            CreateMap<Template, TemplateEditorModel>()
-                .ForMember(d => d.Id, opt => opt.MapFrom(s => s.Id))
-                .ForMember(d => d.TenantId, opt => opt.MapFrom(s => s.TenantId))
-                .ForMember(d => d.Title, opt => opt.MapFrom(s => s.Name ?? string.Empty))
-                .ForMember(d => d.Description, opt => opt.MapFrom(s => s.Description ?? string.Empty))
-                .ForMember(d => d.Content, opt => opt.MapFrom(s => s.TemplateBody ?? string.Empty));
-        }
+        CreateMap<TemplateCreateModel, Template>();
+
+        CreateMap<TemplateUpdateModel, Template>()
+            .ForMember(d => d.RowVersion, opt => opt.MapFrom(s => Convert.FromBase64String(s.RowVersion)));
 
+        CreateMap<Template, TemplateReadModel>()
+            .ForMember(d => d.RowVersion, opt => opt.MapFrom(s => Convert.ToBase64String(s.RowVersion)));
+
+        CreateMap<Template, TemplateUpdateModel>()
+            .ForMember(d => d.RowVersion, opt => opt.MapFrom(s => Convert.ToBase64String(s.RowVersion)));
+
+        CreateMap<Template, TemplateDropdownModel>()
+            .ForMember(d => d.Value, opt => opt.MapFrom(s => s.Id))
+            .ForMember(d => d.Text, opt => opt.MapFrom(s => s.Name));
+
+        CreateMap<Template, TemplateEditorModel>()
+            .ForMember(d => d.Id, opt => opt.MapFrom(s => s.Id))
+            .ForMember(d => d.TenantId, opt => opt.MapFrom(s => s.TenantId))
+            .ForMember(d => d.Title, opt => opt.MapFrom(s => s.Name ?? string.Empty))
+            .ForMember(d => d.Description, opt => opt.MapFrom(s => s.Description ?? string.Empty))
+            .ForMember(d => d.Content, opt => opt.MapFrom(s => s.TemplateBody ?? string.Empty));
     }
+
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Template/Models/TemplateCreateModel.cs b/service/src/InstructorIQ.Core/Domain/Template/Models/TemplateCreateModel.cs
index caf2f70b..95a54eff 100644
--- a/service/src/InstructorIQ.Core/Domain/Template/Models/TemplateCreateModel.cs
+++ b/service/src/InstructorIQ.Core/Domain/Template/Models/TemplateCreateModel.cs
@@ -1,75 +1,75 @@
 using System;
 using System.Collections.Generic;
+
 using MediatR.CommandQuery.Definitions;
 using MediatR.CommandQuery.Models;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Models
+namespace InstructorIQ.Core.Domain.Models;
+
+/// <summary>
+/// View Model class
+/// </summary>
+public class TemplateCreateModel
+    : EntityCreateModel<Guid>, IHaveTenant<Guid>
 {
+    #region Generated Properties
     /// <summary>
-    /// View Model class
+    /// Gets or sets the property value for 'Name'.
     /// </summary>
-    public class TemplateCreateModel
-        : EntityCreateModel<Guid>, IHaveTenant<Guid>
-    {
-        #region Generated Properties
-        /// <summary>
-        /// Gets or sets the property value for 'Name'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Name'.
-        /// </value>
-        public string Name { get; set; }
+    /// <value>
+    /// The property value for 'Name'.
+    /// </value>
+    public string Name { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'Description'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Description'.
-        /// </value>
-        public string Description { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'Description'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'Description'.
+    /// </value>
+    public string Description { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'TemplateBody'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'TemplateBody'.
-        /// </value>
-        public string TemplateBody { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'TemplateBody'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'TemplateBody'.
+    /// </value>
+    public string TemplateBody { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'TemplateType'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'TemplateType'.
-        /// </value>
-        public string TemplateType { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'TemplateType'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'TemplateType'.
+    /// </value>
+    public string TemplateType { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'TenantId'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'TenantId'.
-        /// </value>
-        public Guid TenantId { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'TenantId'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'TenantId'.
+    /// </value>
+    public Guid TenantId { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'PeriodStart'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'PeriodStart'.
-        /// </value>
-        public DateTime PeriodStart { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'PeriodStart'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'PeriodStart'.
+    /// </value>
+    public DateTime PeriodStart { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'PeriodEnd'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'PeriodEnd'.
-        /// </value>
-        public DateTime PeriodEnd { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'PeriodEnd'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'PeriodEnd'.
+    /// </value>
+    public DateTime PeriodEnd { get; set; }
 
-        #endregion
+    #endregion
 
-    }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Template/Models/TemplateDropdownModel.cs b/service/src/InstructorIQ.Core/Domain/Template/Models/TemplateDropdownModel.cs
index 6e45e9a2..22b27851 100644
--- a/service/src/InstructorIQ.Core/Domain/Template/Models/TemplateDropdownModel.cs
+++ b/service/src/InstructorIQ.Core/Domain/Template/Models/TemplateDropdownModel.cs
@@ -1,10 +1,10 @@
 using System;
+
 using Microsoft.AspNetCore.Mvc.Rendering;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Models
+namespace InstructorIQ.Core.Domain.Models;
+
+public class TemplateDropdownModel : SelectListItem
 {
-    public class TemplateDropdownModel : SelectListItem
-    {
-    }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.Core/Domain/Template/Models/TemplateEditorModel.cs b/service/src/InstructorIQ.Core/Domain/Template/Models/TemplateEditorModel.cs
index 3d00d715..64994cdc 100644
--- a/service/src/InstructorIQ.Core/Domain/Template/Models/TemplateEditorModel.cs
+++ b/service/src/InstructorIQ.Core/Domain/Template/Models/TemplateEditorModel.cs
@@ -1,20 +1,20 @@
-using System;
+using System;
+
 using MediatR.CommandQuery.Definitions;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Models
-{
-    public class TemplateEditorModel : IHaveIdentifier<Guid>, IHaveTenant<Guid>
+namespace InstructorIQ.Core.Domain.Models;
 
-    {
-        public Guid Id { get; set; }
+public class TemplateEditorModel : IHaveIdentifier<Guid>, IHaveTenant<Guid>
+
+{
+    public Guid Id { get; set; }
 
-        public string Title { get; set; }
+    public string Title { get; set; }
 
-        public string Description { get; set; }
+    public string Description { get; set; }
 
-        public string Content { get; set; }
+    public string Content { get; set; }
 
-        public Guid TenantId { get; set; }
-    }
+    public Guid TenantId { get; set; }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Template/Models/TemplateReadModel.cs b/service/src/InstructorIQ.Core/Domain/Template/Models/TemplateReadModel.cs
index 3c4c1e40..3e523f2e 100644
--- a/service/src/InstructorIQ.Core/Domain/Template/Models/TemplateReadModel.cs
+++ b/service/src/InstructorIQ.Core/Domain/Template/Models/TemplateReadModel.cs
@@ -1,74 +1,74 @@
 using System;
+
 using MediatR.CommandQuery.Definitions;
 using MediatR.CommandQuery.Models;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Models
+namespace InstructorIQ.Core.Domain.Models;
+
+/// <summary>
+/// View Model class
+/// </summary>
+public class TemplateReadModel
+    : EntityReadModel<Guid>, IHaveTenant<Guid>, ITrackHistory
 {
+    #region Generated Properties
     /// <summary>
-    /// View Model class
+    /// Gets or sets the property value for 'Name'.
     /// </summary>
-    public class TemplateReadModel
-        : EntityReadModel<Guid>, IHaveTenant<Guid>, ITrackHistory
-    {
-        #region Generated Properties
-        /// <summary>
-        /// Gets or sets the property value for 'Name'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Name'.
-        /// </value>
-        public string Name { get; set; }
+    /// <value>
+    /// The property value for 'Name'.
+    /// </value>
+    public string Name { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'Description'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Description'.
-        /// </value>
-        public string Description { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'Description'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'Description'.
+    /// </value>
+    public string Description { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'TemplateBody'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'TemplateBody'.
-        /// </value>
-        public string TemplateBody { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'TemplateBody'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'TemplateBody'.
+    /// </value>
+    public string TemplateBody { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'TemplateType'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'TemplateType'.
-        /// </value>
-        public string TemplateType { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'TemplateType'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'TemplateType'.
+    /// </value>
+    public string TemplateType { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'TenantId'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'TenantId'.
-        /// </value>
-        public Guid TenantId { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'TenantId'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'TenantId'.
+    /// </value>
+    public Guid TenantId { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'PeriodStart'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'PeriodStart'.
-        /// </value>
-        public DateTime PeriodStart { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'PeriodStart'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'PeriodStart'.
+    /// </value>
+    public DateTime PeriodStart { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'PeriodEnd'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'PeriodEnd'.
-        /// </value>
-        public DateTime PeriodEnd { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'PeriodEnd'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'PeriodEnd'.
+    /// </value>
+    public DateTime PeriodEnd { get; set; }
 
-        #endregion
+    #endregion
 
-    }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Template/Models/TemplateUpdateModel.cs b/service/src/InstructorIQ.Core/Domain/Template/Models/TemplateUpdateModel.cs
index 9a1e4f1e..2809de21 100644
--- a/service/src/InstructorIQ.Core/Domain/Template/Models/TemplateUpdateModel.cs
+++ b/service/src/InstructorIQ.Core/Domain/Template/Models/TemplateUpdateModel.cs
@@ -1,74 +1,74 @@
 using System;
+
 using MediatR.CommandQuery.Definitions;
 using MediatR.CommandQuery.Models;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Models
+namespace InstructorIQ.Core.Domain.Models;
+
+/// <summary>
+/// View Model class
+/// </summary>
+public class TemplateUpdateModel
+    : EntityUpdateModel, IHaveTenant<Guid>
 {
+    #region Generated Properties
     /// <summary>
-    /// View Model class
+    /// Gets or sets the property value for 'Name'.
     /// </summary>
-    public class TemplateUpdateModel
-        : EntityUpdateModel, IHaveTenant<Guid>
-    {
-        #region Generated Properties
-        /// <summary>
-        /// Gets or sets the property value for 'Name'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Name'.
-        /// </value>
-        public string Name { get; set; }
+    /// <value>
+    /// The property value for 'Name'.
+    /// </value>
+    public string Name { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'Description'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Description'.
-        /// </value>
-        public string Description { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'Description'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'Description'.
+    /// </value>
+    public string Description { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'TemplateBody'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'TemplateBody'.
-        /// </value>
-        public string TemplateBody { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'TemplateBody'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'TemplateBody'.
+    /// </value>
+    public string TemplateBody { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'TemplateType'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'TemplateType'.
-        /// </value>
-        public string TemplateType { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'TemplateType'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'TemplateType'.
+    /// </value>
+    public string TemplateType { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'TenantId'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'TenantId'.
-        /// </value>
-        public Guid TenantId { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'TenantId'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'TenantId'.
+    /// </value>
+    public Guid TenantId { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'PeriodStart'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'PeriodStart'.
-        /// </value>
-        public DateTime PeriodStart { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'PeriodStart'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'PeriodStart'.
+    /// </value>
+    public DateTime PeriodStart { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'PeriodEnd'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'PeriodEnd'.
-        /// </value>
-        public DateTime PeriodEnd { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'PeriodEnd'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'PeriodEnd'.
+    /// </value>
+    public DateTime PeriodEnd { get; set; }
 
-        #endregion
+    #endregion
 
-    }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Template/Queries/TemplateDropdownQuery.cs b/service/src/InstructorIQ.Core/Domain/Template/Queries/TemplateDropdownQuery.cs
index a856ed7e..30f3757f 100644
--- a/service/src/InstructorIQ.Core/Domain/Template/Queries/TemplateDropdownQuery.cs
+++ b/service/src/InstructorIQ.Core/Domain/Template/Queries/TemplateDropdownQuery.cs
@@ -1,19 +1,20 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Security.Principal;
-using MediatR.CommandQuery.Queries;
+
 using InstructorIQ.Core.Domain.Models;
 
+using MediatR.CommandQuery.Queries;
+
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Queries
+namespace InstructorIQ.Core.Domain.Queries;
+
+public class TemplateDropdownQuery : PrincipalQueryBase<IReadOnlyCollection<TemplateDropdownModel>>
 {
-    public class TemplateDropdownQuery : PrincipalQueryBase<IReadOnlyCollection<TemplateDropdownModel>>
+    public TemplateDropdownQuery(IPrincipal principal, string templateType) : base(principal)
     {
-        public TemplateDropdownQuery(IPrincipal principal, string templateType) : base(principal)
-        {
-            TemplateType = templateType;
-        }
-
-        public string TemplateType { get; set; }
+        TemplateType = templateType;
     }
-}
\ No newline at end of file
+
+    public string TemplateType { get; set; }
+}
diff --git a/service/src/InstructorIQ.Core/Domain/Template/TemplateServiceRegistration.cs b/service/src/InstructorIQ.Core/Domain/Template/TemplateServiceRegistration.cs
index ff56a80b..69b2abc8 100644
--- a/service/src/InstructorIQ.Core/Domain/Template/TemplateServiceRegistration.cs
+++ b/service/src/InstructorIQ.Core/Domain/Template/TemplateServiceRegistration.cs
@@ -16,20 +16,19 @@
 using Microsoft.Extensions.DependencyInjection.Extensions;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain
+namespace InstructorIQ.Core.Domain;
+
+public class TemplateServiceRegistration : DomainServiceRegistrationBase
 {
-    public class TemplateServiceRegistration : DomainServiceRegistrationBase
-    {
 
-        [RegisterServices]
-        public override void Register(IServiceCollection services)
-        {
-            RegisterEntityQuery<Guid, Template, TemplateReadModel>(services);
-            RegisterEntityCommand<Guid, Template, TemplateReadModel, TemplateCreateModel, TemplateUpdateModel>(services);
+    [RegisterServices]
+    public override void Register(IServiceCollection services)
+    {
+        RegisterEntityQuery<Guid, Template, TemplateReadModel>(services);
+        RegisterEntityCommand<Guid, Template, TemplateReadModel, TemplateCreateModel, TemplateUpdateModel>(services);
 
-            services.TryAddTransient<IRequestHandler<TemplateDropdownQuery, IReadOnlyCollection<TemplateDropdownModel>>, TemplateDropdownQueryHandler>();
+        services.TryAddTransient<IRequestHandler<TemplateDropdownQuery, IReadOnlyCollection<TemplateDropdownModel>>, TemplateDropdownQueryHandler>();
 
-            services.AddEntityQueries<InstructorIQContext, Template, Guid, TemplateEditorModel>();
-        }
+        services.AddEntityQueries<InstructorIQContext, Template, Guid, TemplateEditorModel>();
     }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Template/Validation/TemplateCreateModelValidator.cs b/service/src/InstructorIQ.Core/Domain/Template/Validation/TemplateCreateModelValidator.cs
index 0b9bc26d..a067be06 100644
--- a/service/src/InstructorIQ.Core/Domain/Template/Validation/TemplateCreateModelValidator.cs
+++ b/service/src/InstructorIQ.Core/Domain/Template/Validation/TemplateCreateModelValidator.cs
@@ -1,28 +1,29 @@
 using System;
+
 using FluentValidation;
+
 using InstructorIQ.Core.Domain.Models;
 
-namespace InstructorIQ.Core.Domain.Validation
+namespace InstructorIQ.Core.Domain.Validation;
+
+/// <summary>
+/// Validator class for <see cref="TemplateCreateModel"/> .
+/// </summary>
+public partial class TemplateCreateModelValidator
+    : AbstractValidator<TemplateCreateModel>
 {
     /// <summary>
-    /// Validator class for <see cref="TemplateCreateModel"/> .
+    /// Initializes a new instance of the <see cref="TemplateCreateModelValidator"/> class.
     /// </summary>
-    public partial class TemplateCreateModelValidator
-        : AbstractValidator<TemplateCreateModel>
+    public TemplateCreateModelValidator()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TemplateCreateModelValidator"/> class.
-        /// </summary>
-        public TemplateCreateModelValidator()
-        {
-            #region Generated Constructor
-            RuleFor(p => p.Name).NotEmpty();
-            RuleFor(p => p.Name).MaximumLength(100);
-            RuleFor(p => p.Description).MaximumLength(255);
-            RuleFor(p => p.TemplateType).NotEmpty();
-            RuleFor(p => p.TemplateType).MaximumLength(100);
-            #endregion
-        }
-
+        #region Generated Constructor
+        RuleFor(p => p.Name).NotEmpty();
+        RuleFor(p => p.Name).MaximumLength(100);
+        RuleFor(p => p.Description).MaximumLength(255);
+        RuleFor(p => p.TemplateType).NotEmpty();
+        RuleFor(p => p.TemplateType).MaximumLength(100);
+        #endregion
     }
+
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Template/Validation/TemplateUpdateModelValidator.cs b/service/src/InstructorIQ.Core/Domain/Template/Validation/TemplateUpdateModelValidator.cs
index 5e274579..110b54ff 100644
--- a/service/src/InstructorIQ.Core/Domain/Template/Validation/TemplateUpdateModelValidator.cs
+++ b/service/src/InstructorIQ.Core/Domain/Template/Validation/TemplateUpdateModelValidator.cs
@@ -1,28 +1,29 @@
 using System;
+
 using FluentValidation;
+
 using InstructorIQ.Core.Domain.Models;
 
-namespace InstructorIQ.Core.Domain.Validation
+namespace InstructorIQ.Core.Domain.Validation;
+
+/// <summary>
+/// Validator class for <see cref="TemplateUpdateModel"/> .
+/// </summary>
+public partial class TemplateUpdateModelValidator
+    : AbstractValidator<TemplateUpdateModel>
 {
     /// <summary>
-    /// Validator class for <see cref="TemplateUpdateModel"/> .
+    /// Initializes a new instance of the <see cref="TemplateUpdateModelValidator"/> class.
     /// </summary>
-    public partial class TemplateUpdateModelValidator
-        : AbstractValidator<TemplateUpdateModel>
+    public TemplateUpdateModelValidator()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TemplateUpdateModelValidator"/> class.
-        /// </summary>
-        public TemplateUpdateModelValidator()
-        {
-            #region Generated Constructor
-            RuleFor(p => p.Name).NotEmpty();
-            RuleFor(p => p.Name).MaximumLength(100);
-            RuleFor(p => p.Description).MaximumLength(255);
-            RuleFor(p => p.TemplateType).NotEmpty();
-            RuleFor(p => p.TemplateType).MaximumLength(100);
-            #endregion
-        }
-
+        #region Generated Constructor
+        RuleFor(p => p.Name).NotEmpty();
+        RuleFor(p => p.Name).MaximumLength(100);
+        RuleFor(p => p.Description).MaximumLength(255);
+        RuleFor(p => p.TemplateType).NotEmpty();
+        RuleFor(p => p.TemplateType).MaximumLength(100);
+        #endregion
     }
+
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Tenant/Commands/TenantUserResolveCommand.cs b/service/src/InstructorIQ.Core/Domain/Tenant/Commands/TenantUserResolveCommand.cs
index 0eeae3c2..a9fd9dd3 100644
--- a/service/src/InstructorIQ.Core/Domain/Tenant/Commands/TenantUserResolveCommand.cs
+++ b/service/src/InstructorIQ.Core/Domain/Tenant/Commands/TenantUserResolveCommand.cs
@@ -1,18 +1,19 @@
-using System.Security.Principal;
-using MediatR.CommandQuery.Commands;
+using System.Security.Principal;
+
 using InstructorIQ.Core.Data.Entities;
 using InstructorIQ.Core.Domain.Models;
 
+using MediatR.CommandQuery.Commands;
+
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Commands
+namespace InstructorIQ.Core.Domain.Commands;
+
+public class TenantUserResolveCommand : PrincipalCommandBase<TenantUserModel>
 {
-    public class TenantUserResolveCommand : PrincipalCommandBase<TenantUserModel>
+    public TenantUserResolveCommand(IPrincipal principal, User user) : base(principal)
     {
-        public TenantUserResolveCommand(IPrincipal principal, User user) : base(principal)
-        {
-            User = user;
-        }
-
-        public User User { get; set; }
+        User = user;
     }
+
+    public User User { get; set; }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Tenant/Handlers/TenantDropdownQueryHandler.cs b/service/src/InstructorIQ.Core/Domain/Tenant/Handlers/TenantDropdownQueryHandler.cs
index 5449de09..67652647 100644
--- a/service/src/InstructorIQ.Core/Domain/Tenant/Handlers/TenantDropdownQueryHandler.cs
+++ b/service/src/InstructorIQ.Core/Domain/Tenant/Handlers/TenantDropdownQueryHandler.cs
@@ -1,35 +1,38 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+
 using AutoMapper;
 using AutoMapper.QueryableExtensions;
+
 using InstructorIQ.Core.Data;
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Domain.Queries;
+
 using MediatR.CommandQuery.EntityFrameworkCore.Handlers;
+
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Handlers
+namespace InstructorIQ.Core.Domain.Handlers;
+
+public class TenantDropdownQueryHandler : DataContextHandlerBase<InstructorIQContext, TenantDropdownQuery, IReadOnlyCollection<TenantDropdownModel>>
 {
-    public class TenantDropdownQueryHandler : DataContextHandlerBase<InstructorIQContext, TenantDropdownQuery, IReadOnlyCollection<TenantDropdownModel>>
+    public TenantDropdownQueryHandler(ILoggerFactory loggerFactory, InstructorIQContext dataContext, IMapper mapper)
+        : base(loggerFactory, dataContext, mapper)
     {
-        public TenantDropdownQueryHandler(ILoggerFactory loggerFactory, InstructorIQContext dataContext, IMapper mapper)
-            : base(loggerFactory, dataContext, mapper)
-        {
-        }
-
-        protected override async Task<IReadOnlyCollection<TenantDropdownModel>> Process(TenantDropdownQuery request, CancellationToken cancellationToken)
-        {
-            var result = await DataContext.Tenants
-                .AsNoTracking()
-                .OrderBy(q => q.Name)
-                .ProjectTo<TenantDropdownModel>(Mapper.ConfigurationProvider)
-                .ToListAsync(cancellationToken);
-
-            return result;
-        }
+    }
+
+    protected override async Task<IReadOnlyCollection<TenantDropdownModel>> Process(TenantDropdownQuery request, CancellationToken cancellationToken)
+    {
+        var result = await DataContext.Tenants
+            .AsNoTracking()
+            .OrderBy(q => q.Name)
+            .ProjectTo<TenantDropdownModel>(Mapper.ConfigurationProvider)
+            .ToListAsync(cancellationToken);
+
+        return result;
     }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Tenant/Handlers/TenantMembershipCommandHandler.cs b/service/src/InstructorIQ.Core/Domain/Tenant/Handlers/TenantMembershipCommandHandler.cs
index 4ed0bed3..2235db8e 100644
--- a/service/src/InstructorIQ.Core/Domain/Tenant/Handlers/TenantMembershipCommandHandler.cs
+++ b/service/src/InstructorIQ.Core/Domain/Tenant/Handlers/TenantMembershipCommandHandler.cs
@@ -1,65 +1,68 @@
-using System;
+using System;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+
 using AutoMapper;
+
 using InstructorIQ.Core.Data;
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Domain.Queries;
+
 using MediatR.CommandQuery.EntityFrameworkCore.Handlers;
+
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Handlers
+namespace InstructorIQ.Core.Domain.Handlers;
+
+public class TenantMembershipCommandHandler : DataContextHandlerBase<InstructorIQContext, TenantMembershipCommand, TenantMembershipModel>
 {
-    public class TenantMembershipCommandHandler : DataContextHandlerBase<InstructorIQContext, TenantMembershipCommand, TenantMembershipModel>
+    public TenantMembershipCommandHandler(ILoggerFactory loggerFactory, InstructorIQContext dataContext, IMapper mapper)
+        : base(loggerFactory, dataContext, mapper)
     {
-        public TenantMembershipCommandHandler(ILoggerFactory loggerFactory, InstructorIQContext dataContext, IMapper mapper)
-            : base(loggerFactory, dataContext, mapper)
-        {
-        }
+    }
 
-        protected override async Task<TenantMembershipModel> Process(TenantMembershipCommand request, CancellationToken cancellationToken)
-        {
-            var membership = request.Membership;
-            var tenantId = membership.TenantId;
-            var userId = membership.UserId;
+    protected override async Task<TenantMembershipModel> Process(TenantMembershipCommand request, CancellationToken cancellationToken)
+    {
+        var membership = request.Membership;
+        var tenantId = membership.TenantId;
+        var userId = membership.UserId;
 
-            var roles = await DataContext.TenantUserRoles
-                .Where(q => q.TenantId == membership.TenantId && q.UserId == membership.UserId)
-                .ToListAsync(cancellationToken);
+        var roles = await DataContext.TenantUserRoles
+            .Where(q => q.TenantId == membership.TenantId && q.UserId == membership.UserId)
+            .ToListAsync(cancellationToken);
 
-            // remove all to reset
-            foreach (var role in roles)
-                DataContext.TenantUserRoles.Remove(role);
+        // remove all to reset
+        foreach (var role in roles)
+            DataContext.TenantUserRoles.Remove(role);
 
-            if (membership.IsMember)
-                AddRole(tenantId, userId, Data.Constants.Role.Member);
+        if (membership.IsMember)
+            AddRole(tenantId, userId, Data.Constants.Role.Member);
 
-            if (membership.IsAttendee)
-                AddRole(tenantId, userId, Data.Constants.Role.Attendee);
+        if (membership.IsAttendee)
+            AddRole(tenantId, userId, Data.Constants.Role.Attendee);
 
-            if (membership.IsInstructor)
-                AddRole(tenantId, userId, Data.Constants.Role.Instructor);
+        if (membership.IsInstructor)
+            AddRole(tenantId, userId, Data.Constants.Role.Instructor);
 
-            if (membership.IsAdministrator)
-                AddRole(tenantId, userId, Data.Constants.Role.Administrator);
+        if (membership.IsAdministrator)
+            AddRole(tenantId, userId, Data.Constants.Role.Administrator);
 
-            await DataContext.SaveChangesAsync(cancellationToken);
+        await DataContext.SaveChangesAsync(cancellationToken);
 
-            return membership;
-        }
+        return membership;
+    }
 
-        private void AddRole(Guid tenantId, Guid userId, Guid roleId)
+    private void AddRole(Guid tenantId, Guid userId, Guid roleId)
+    {
+        var entity = new Data.Entities.TenantUserRole
         {
-            var entity = new Data.Entities.TenantUserRole
-            {
-                TenantId = tenantId,
-                UserId = userId,
-                RoleId = roleId
-            };
-            DataContext.TenantUserRoles.Add(entity);
-        }
+            TenantId = tenantId,
+            UserId = userId,
+            RoleId = roleId
+        };
+        DataContext.TenantUserRoles.Add(entity);
     }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Tenant/Handlers/TenantMembershipQueryHandler.cs b/service/src/InstructorIQ.Core/Domain/Tenant/Handlers/TenantMembershipQueryHandler.cs
index 12f0e70f..690e16f8 100644
--- a/service/src/InstructorIQ.Core/Domain/Tenant/Handlers/TenantMembershipQueryHandler.cs
+++ b/service/src/InstructorIQ.Core/Domain/Tenant/Handlers/TenantMembershipQueryHandler.cs
@@ -1,47 +1,50 @@
-using System.Linq;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+
 using AutoMapper;
+
 using InstructorIQ.Core.Data;
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Domain.Queries;
+
 using MediatR.CommandQuery.EntityFrameworkCore.Handlers;
+
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Handlers
+namespace InstructorIQ.Core.Domain.Handlers;
+
+public class TenantMembershipQueryHandler : DataContextHandlerBase<InstructorIQContext, TenantMembershipQuery, TenantMembershipModel>
 {
-    public class TenantMembershipQueryHandler : DataContextHandlerBase<InstructorIQContext, TenantMembershipQuery, TenantMembershipModel>
+    public TenantMembershipQueryHandler(ILoggerFactory loggerFactory, InstructorIQContext dataContext, IMapper mapper)
+        : base(loggerFactory, dataContext, mapper)
     {
-        public TenantMembershipQueryHandler(ILoggerFactory loggerFactory, InstructorIQContext dataContext, IMapper mapper)
-            : base(loggerFactory, dataContext, mapper)
-        {
-        }
+    }
 
-        protected override async Task<TenantMembershipModel> Process(TenantMembershipQuery request, CancellationToken cancellationToken)
+    protected override async Task<TenantMembershipModel> Process(TenantMembershipQuery request, CancellationToken cancellationToken)
+    {
+        var membership = new TenantMembershipModel
         {
-            var membership = new TenantMembershipModel
-            {
-                TenantId = request.TenantId,
-                UserId = request.UserId
-            };
-
-            var roles = await DataContext.TenantUserRoles
-                .AsNoTracking()
-                .Where(q => q.TenantId == request.TenantId && q.UserId == request.UserId)
-                .Select(q => q.RoleId)
-                .ToListAsync(cancellationToken);
-
-            if (roles.Count == 0)
-                return membership;
-
-            membership.IsMember = roles.Contains(Data.Constants.Role.Member);
-            membership.IsAttendee = roles.Contains(Data.Constants.Role.Attendee);
-            membership.IsInstructor = roles.Contains(Data.Constants.Role.Instructor);
-            membership.IsAdministrator = roles.Contains(Data.Constants.Role.Administrator);
+            TenantId = request.TenantId,
+            UserId = request.UserId
+        };
+
+        var roles = await DataContext.TenantUserRoles
+            .AsNoTracking()
+            .Where(q => q.TenantId == request.TenantId && q.UserId == request.UserId)
+            .Select(q => q.RoleId)
+            .ToListAsync(cancellationToken);
 
+        if (roles.Count == 0)
             return membership;
-        }
+
+        membership.IsMember = roles.Contains(Data.Constants.Role.Member);
+        membership.IsAttendee = roles.Contains(Data.Constants.Role.Attendee);
+        membership.IsInstructor = roles.Contains(Data.Constants.Role.Instructor);
+        membership.IsAdministrator = roles.Contains(Data.Constants.Role.Administrator);
+
+        return membership;
     }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Tenant/Handlers/TenantPagedQueryHandler.cs b/service/src/InstructorIQ.Core/Domain/Tenant/Handlers/TenantPagedQueryHandler.cs
index f84a11fd..6cf92340 100644
--- a/service/src/InstructorIQ.Core/Domain/Tenant/Handlers/TenantPagedQueryHandler.cs
+++ b/service/src/InstructorIQ.Core/Domain/Tenant/Handlers/TenantPagedQueryHandler.cs
@@ -1,78 +1,81 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Dynamic.Core;
 using System.Threading;
 using System.Threading.Tasks;
+
 using AutoMapper;
 using AutoMapper.QueryableExtensions;
+
 using InstructorIQ.Core.Data;
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Domain.Queries;
+
 using MediatR.CommandQuery.EntityFrameworkCore.Handlers;
 using MediatR.CommandQuery.Extensions;
 using MediatR.CommandQuery.Queries;
+
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 
-namespace InstructorIQ.Core.Domain.Handlers
+namespace InstructorIQ.Core.Domain.Handlers;
+
+public class TenantPagedQueryHandler : DataContextHandlerBase<InstructorIQContext, TenantPagedQuery, EntityPagedResult<TenantReadModel>>
 {
-    public class TenantPagedQueryHandler : DataContextHandlerBase<InstructorIQContext, TenantPagedQuery, EntityPagedResult<TenantReadModel>>
+    public TenantPagedQueryHandler(ILoggerFactory loggerFactory, InstructorIQContext dataContext, IMapper mapper) : base(loggerFactory, dataContext, mapper)
     {
-        public TenantPagedQueryHandler(ILoggerFactory loggerFactory, InstructorIQContext dataContext, IMapper mapper) : base(loggerFactory, dataContext, mapper)
-        {
-        }
+    }
 
-        protected override async Task<EntityPagedResult<TenantReadModel>> Process(TenantPagedQuery request, CancellationToken cancellationToken)
-        {
-            var entityQuery = request.Query;
-            var userName = request.Principal.Identity.Name;
-            bool isGlobalAdministrator = request.Principal.IsInRole(Data.Constants.Role.GlobalAdministrator);
+    protected override async Task<EntityPagedResult<TenantReadModel>> Process(TenantPagedQuery request, CancellationToken cancellationToken)
+    {
+        var entityQuery = request.Query;
+        var userName = request.Principal.Identity.Name;
+        bool isGlobalAdministrator = request.Principal.IsInRole(Data.Constants.Role.GlobalAdministrator);
 
-            // tenants that current user are members for
-            var query = isGlobalAdministrator
-                ? DataContext.Tenants
-                : from t in DataContext.Tenants
-                  where
-                  (
-                      from r in DataContext.TenantUserRoles
-                      where r.User.UserName == userName
-                      select r.TenantId
-                  ).Contains(t.Id)
-                  select t;
+        // tenants that current user are members for
+        var query = isGlobalAdministrator
+            ? DataContext.Tenants
+            : from t in DataContext.Tenants
+              where
+              (
+                  from r in DataContext.TenantUserRoles
+                  where r.User.UserName == userName
+                  select r.TenantId
+              ).Contains(t.Id)
+              select t;
 
 
-            // build query from filter
-            query = query
-                .AsNoTracking()
-                .Filter(entityQuery.Filter);
+        // build query from filter
+        query = query
+            .AsNoTracking()
+            .Filter(entityQuery.Filter);
 
-            // add raw query
-            if (!string.IsNullOrEmpty(entityQuery.Query))
-                query = query.Where(entityQuery.Query);
+        // add raw query
+        if (!string.IsNullOrEmpty(entityQuery.Query))
+            query = query.Where(entityQuery.Query);
 
-            // get total for query
-            var total = await query
-                .CountAsync(cancellationToken)
-                .ConfigureAwait(false);
+        // get total for query
+        var total = await query
+            .CountAsync(cancellationToken)
+            .ConfigureAwait(false);
 
-            // short circuit if total is zero
-            if (total == 0)
-                return new EntityPagedResult<TenantReadModel> { Data = new List<TenantReadModel>() };
+        // short circuit if total is zero
+        if (total == 0)
+            return new EntityPagedResult<TenantReadModel> { Data = new List<TenantReadModel>() };
 
-            // page the query and convert to read model
-            var result = await query
-                .Sort(entityQuery.Sort)
-                .Page(entityQuery.Page, entityQuery.PageSize)
-                .ProjectTo<TenantReadModel>(Mapper.ConfigurationProvider)
-                .ToListAsync(cancellationToken)
-                .ConfigureAwait(false);
+        // page the query and convert to read model
+        var result = await query
+            .Sort(entityQuery.Sort)
+            .Page(entityQuery.Page, entityQuery.PageSize)
+            .ProjectTo<TenantReadModel>(Mapper.ConfigurationProvider)
+            .ToListAsync(cancellationToken)
+            .ConfigureAwait(false);
 
-            return new EntityPagedResult<TenantReadModel>
-            {
-                Total = total,
-                Data = result.AsReadOnly()
-            };
-        }
+        return new EntityPagedResult<TenantReadModel>
+        {
+            Total = total,
+            Data = result.AsReadOnly()
+        };
     }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Tenant/Handlers/TenantSlugQueryHandler.cs b/service/src/InstructorIQ.Core/Domain/Tenant/Handlers/TenantSlugQueryHandler.cs
index 7fc66682..7715e8aa 100644
--- a/service/src/InstructorIQ.Core/Domain/Tenant/Handlers/TenantSlugQueryHandler.cs
+++ b/service/src/InstructorIQ.Core/Domain/Tenant/Handlers/TenantSlugQueryHandler.cs
@@ -1,34 +1,37 @@
-using System.Linq;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+
 using AutoMapper;
 using AutoMapper.QueryableExtensions;
+
 using InstructorIQ.Core.Data;
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Domain.Queries;
+
 using MediatR.CommandQuery.EntityFrameworkCore.Handlers;
+
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Handlers
+namespace InstructorIQ.Core.Domain.Handlers;
+
+public class TenantSlugQueryHandler : DataContextHandlerBase<InstructorIQContext, TenantSlugQuery, TenantReadModel>
 {
-    public class TenantSlugQueryHandler : DataContextHandlerBase<InstructorIQContext, TenantSlugQuery, TenantReadModel>
+    public TenantSlugQueryHandler(ILoggerFactory loggerFactory, InstructorIQContext dataContext, IMapper mapper)
+        : base(loggerFactory, dataContext, mapper)
     {
-        public TenantSlugQueryHandler(ILoggerFactory loggerFactory, InstructorIQContext dataContext, IMapper mapper)
-            : base(loggerFactory, dataContext, mapper)
-        {
-        }
-
-        protected override async Task<TenantReadModel> Process(TenantSlugQuery request, CancellationToken cancellationToken)
-        {
-            var result = await DataContext.Tenants
-                .AsNoTracking()
-                .Where(q => q.Slug == request.Slug)
-                .ProjectTo<TenantReadModel>(Mapper.ConfigurationProvider)
-                .FirstOrDefaultAsync(cancellationToken);
-
-            return result;
-        }
+    }
+
+    protected override async Task<TenantReadModel> Process(TenantSlugQuery request, CancellationToken cancellationToken)
+    {
+        var result = await DataContext.Tenants
+            .AsNoTracking()
+            .Where(q => q.Slug == request.Slug)
+            .ProjectTo<TenantReadModel>(Mapper.ConfigurationProvider)
+            .FirstOrDefaultAsync(cancellationToken);
+
+        return result;
     }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Tenant/Handlers/TenantUserResolveCommandHandler.cs b/service/src/InstructorIQ.Core/Domain/Tenant/Handlers/TenantUserResolveCommandHandler.cs
index b0a71082..59b125f2 100644
--- a/service/src/InstructorIQ.Core/Domain/Tenant/Handlers/TenantUserResolveCommandHandler.cs
+++ b/service/src/InstructorIQ.Core/Domain/Tenant/Handlers/TenantUserResolveCommandHandler.cs
@@ -1,135 +1,138 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net.Mail;
 using System.Threading;
 using System.Threading.Tasks;
+
 using AutoMapper;
 using AutoMapper.QueryableExtensions;
+
 using InstructorIQ.Core.Data;
 using InstructorIQ.Core.Data.Entities;
 using InstructorIQ.Core.Domain.Commands;
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Extensions;
+
 using MediatR.CommandQuery.EntityFrameworkCore.Handlers;
+
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Handlers
+namespace InstructorIQ.Core.Domain.Handlers;
+
+public class TenantUserResolveCommandHandler : DataContextHandlerBase<InstructorIQContext, TenantUserResolveCommand, TenantUserModel>
 {
-    public class TenantUserResolveCommandHandler : DataContextHandlerBase<InstructorIQContext, TenantUserResolveCommand, TenantUserModel>
+    public TenantUserResolveCommandHandler(ILoggerFactory loggerFactory, InstructorIQContext dataContext, IMapper mapper)
+        : base(loggerFactory, dataContext, mapper)
     {
-        public TenantUserResolveCommandHandler(ILoggerFactory loggerFactory, InstructorIQContext dataContext, IMapper mapper)
-            : base(loggerFactory, dataContext, mapper)
-        {
-        }
+    }
 
-        protected override async Task<TenantUserModel> Process(TenantUserResolveCommand request, CancellationToken cancellationToken)
-        {
-            var user = request.User;
-            var tenant = await GetTenant(user, cancellationToken);
-            var roles = await GetRoles(user, tenant, cancellationToken);
+    protected override async Task<TenantUserModel> Process(TenantUserResolveCommand request, CancellationToken cancellationToken)
+    {
+        var user = request.User;
+        var tenant = await GetTenant(user, cancellationToken);
+        var roles = await GetRoles(user, tenant, cancellationToken);
 
-            await UpdateUser(user, tenant, cancellationToken);
+        await UpdateUser(user, tenant, cancellationToken);
 
-            var model = new TenantUserModel { User = user, Tenant = tenant, Roles = roles };
+        var model = new TenantUserModel { User = user, Tenant = tenant, Roles = roles };
 
-            return model;
-        }
+        return model;
+    }
 
-        private async Task UpdateUser(User user, TenantReadModel tenant, CancellationToken cancellationToken)
-        {
-            if (tenant == null || user.LastTenantId == tenant.Id)
-                return;
+    private async Task UpdateUser(User user, TenantReadModel tenant, CancellationToken cancellationToken)
+    {
+        if (tenant == null || user.LastTenantId == tenant.Id)
+            return;
 
-            var currentUser = await DataContext.Users
-                .FindAsync(user.Id);
+        var currentUser = await DataContext.Users
+            .FindAsync(user.Id);
 
-            currentUser.LastTenantId = tenant.Id;
-            user.LastTenantId = tenant.Id;
+        currentUser.LastTenantId = tenant.Id;
+        user.LastTenantId = tenant.Id;
 
-            await DataContext.SaveChangesAsync(cancellationToken);
-        }
+        await DataContext.SaveChangesAsync(cancellationToken);
+    }
+
+    private async Task<List<string>> GetRoles(User user, TenantReadModel tenant, CancellationToken cancellationToken)
+    {
+        if (user == null || tenant == null)
+            return null;
+
+        var roles = await DataContext.TenantUserRoles
+            .AsNoTracking()
+            .Where(u => u.TenantId == tenant.Id && u.UserId == user.Id)
+            .Select(o => o.Role.Name)
+            .ToListAsync(cancellationToken)
+            .ConfigureAwait(false);
 
-        private async Task<List<string>> GetRoles(User user, TenantReadModel tenant, CancellationToken cancellationToken)
+        return roles;
+    }
+
+    private async Task<TenantReadModel> GetTenant(User user, CancellationToken cancellationToken, Guid? id = null)
+    {
+        TenantReadModel tenant;
+
+        // first try by id
+        if (id.HasValue)
         {
-            if (user == null || tenant == null)
-                return null;
+            tenant = await DataContext.Tenants
+                .AsNoTracking()
+                .Where(t => t.Id == id.Value)
+                .ProjectTo<TenantReadModel>(Mapper.ConfigurationProvider)
+                .FirstOrDefaultAsync(cancellationToken)
+                .ConfigureAwait(false);
+
+            if (tenant != null && !tenant.IsDeleted)
+                return tenant;
+        }
+
+        if (user == null)
+            return null;
 
-            var roles = await DataContext.TenantUserRoles
+        // next try last tenant
+        if (user.LastTenantId.HasValue)
+        {
+            tenant = await DataContext.Tenants
                 .AsNoTracking()
-                .Where(u => u.TenantId == tenant.Id && u.UserId == user.Id)
-                .Select(o => o.Role.Name)
-                .ToListAsync(cancellationToken)
+                .Where(t => t.Id == user.LastTenantId.Value)
+                .ProjectTo<TenantReadModel>(Mapper.ConfigurationProvider)
+                .FirstOrDefaultAsync(cancellationToken)
                 .ConfigureAwait(false);
 
-            return roles;
+            if (tenant != null && !tenant.IsDeleted)
+                return tenant;
         }
 
-        private async Task<TenantReadModel> GetTenant(User user, CancellationToken cancellationToken, Guid? id = null)
+        // next try match email domain to tenant domain
+        if (user.Email.HasValue())
         {
-            TenantReadModel tenant;
-
-            // first try by id
-            if (id.HasValue)
-            {
-                tenant = await DataContext.Tenants
-                    .AsNoTracking()
-                    .Where(t => t.Id == id.Value)
-                    .ProjectTo<TenantReadModel>(Mapper.ConfigurationProvider)
-                    .FirstOrDefaultAsync(cancellationToken)
-                    .ConfigureAwait(false);
-
-                if (tenant != null && !tenant.IsDeleted)
-                    return tenant;
-            }
-
-            if (user == null)
-                return null;
-
-            // next try last tenant
-            if (user.LastTenantId.HasValue)
-            {
-                tenant = await DataContext.Tenants
-                    .AsNoTracking()
-                    .Where(t => t.Id == user.LastTenantId.Value)
-                    .ProjectTo<TenantReadModel>(Mapper.ConfigurationProvider)
-                    .FirstOrDefaultAsync(cancellationToken)
-                    .ConfigureAwait(false);
-
-                if (tenant != null && !tenant.IsDeleted)
-                    return tenant;
-            }
-
-            // next try match email domain to tenant domain
-            if (user.Email.HasValue())
-            {
-                var address = new MailAddress(user.Email);
-                var domain = address.Host.Trim();
-
-                tenant = await DataContext.Tenants
-                    .AsNoTracking()
-                    .Where(t => t.DomainName != null && t.DomainName == domain)
-                    .ProjectTo<TenantReadModel>(Mapper.ConfigurationProvider)
-                    .FirstOrDefaultAsync(cancellationToken)
-                    .ConfigureAwait(false);
-
-                if (tenant != null && !tenant.IsDeleted)
-                    return tenant;
-
-            }
-
-            // finally try first tenant that user has membership for
-            tenant = await DataContext.TenantUserRoles
+            var address = new MailAddress(user.Email);
+            var domain = address.Host.Trim();
+
+            tenant = await DataContext.Tenants
                 .AsNoTracking()
-                .Where(u => u.UserId == user.Id)
-                .Select(o => o.Tenant)
+                .Where(t => t.DomainName != null && t.DomainName == domain)
                 .ProjectTo<TenantReadModel>(Mapper.ConfigurationProvider)
                 .FirstOrDefaultAsync(cancellationToken)
                 .ConfigureAwait(false);
 
-            return tenant;
+            if (tenant != null && !tenant.IsDeleted)
+                return tenant;
+
         }
+
+        // finally try first tenant that user has membership for
+        tenant = await DataContext.TenantUserRoles
+            .AsNoTracking()
+            .Where(u => u.UserId == user.Id)
+            .Select(o => o.Tenant)
+            .ProjectTo<TenantReadModel>(Mapper.ConfigurationProvider)
+            .FirstOrDefaultAsync(cancellationToken)
+            .ConfigureAwait(false);
+
+        return tenant;
     }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.Core/Domain/Tenant/Mapping/TenantProfile.cs b/service/src/InstructorIQ.Core/Domain/Tenant/Mapping/TenantProfile.cs
index a5cddb78..45b5fcca 100644
--- a/service/src/InstructorIQ.Core/Domain/Tenant/Mapping/TenantProfile.cs
+++ b/service/src/InstructorIQ.Core/Domain/Tenant/Mapping/TenantProfile.cs
@@ -1,40 +1,41 @@
 using System;
+
 using AutoMapper;
+
 using InstructorIQ.Core.Data.Entities;
 using InstructorIQ.Core.Domain.Models;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Mapping
+namespace InstructorIQ.Core.Domain.Mapping;
+
+/// <summary>
+/// Mapper class for entity <see cref="Tenant"/> .
+/// </summary>
+public class TenantProfile
+    : Profile
 {
     /// <summary>
-    /// Mapper class for entity <see cref="Tenant"/> .
+    /// Initializes a new instance of the <see cref="TenantProfile"/> class.
     /// </summary>
-    public class TenantProfile
-        : Profile
+    public TenantProfile()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TenantProfile"/> class.
-        /// </summary>
-        public TenantProfile()
-        {
-            CreateMap<TenantCreateModel, Tenant>();
+        CreateMap<TenantCreateModel, Tenant>();
 
-            CreateMap<TenantUpdateModel, Tenant>()
-                .ForMember(d => d.RowVersion, opt => opt.MapFrom(s => Convert.FromBase64String(s.RowVersion)));
+        CreateMap<TenantUpdateModel, Tenant>()
+            .ForMember(d => d.RowVersion, opt => opt.MapFrom(s => Convert.FromBase64String(s.RowVersion)));
 
-            CreateMap<Tenant, TenantReadModel>()
-                .ForMember(d => d.RowVersion, opt => opt.MapFrom(s => Convert.ToBase64String(s.RowVersion)));
+        CreateMap<Tenant, TenantReadModel>()
+            .ForMember(d => d.RowVersion, opt => opt.MapFrom(s => Convert.ToBase64String(s.RowVersion)));
 
-            CreateMap<Tenant, TenantUpdateModel>()
-                .ForMember(d => d.RowVersion, opt => opt.MapFrom(s => Convert.ToBase64String(s.RowVersion)));
+        CreateMap<Tenant, TenantUpdateModel>()
+            .ForMember(d => d.RowVersion, opt => opt.MapFrom(s => Convert.ToBase64String(s.RowVersion)));
 
-            CreateMap<Tenant, TenantDropdownModel>()
-                .ForMember(d => d.Value, opt => opt.MapFrom(s => s.Id))
-                .ForMember(d => d.Text, opt => opt.MapFrom(s => s.Name));
+        CreateMap<Tenant, TenantDropdownModel>()
+            .ForMember(d => d.Value, opt => opt.MapFrom(s => s.Id))
+            .ForMember(d => d.Text, opt => opt.MapFrom(s => s.Name));
 
-            CreateMap<TenantReadModel, TenantUpdateModel>();
-
-        }
+        CreateMap<TenantReadModel, TenantUpdateModel>();
 
     }
+
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Tenant/Models/TenantCreateModel.cs b/service/src/InstructorIQ.Core/Domain/Tenant/Models/TenantCreateModel.cs
index 88b6f691..09df4d7f 100644
--- a/service/src/InstructorIQ.Core/Domain/Tenant/Models/TenantCreateModel.cs
+++ b/service/src/InstructorIQ.Core/Domain/Tenant/Models/TenantCreateModel.cs
@@ -1,103 +1,103 @@
 using System;
 using System.Collections.Generic;
+
 using MediatR.CommandQuery.Models;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Models
+namespace InstructorIQ.Core.Domain.Models;
+
+/// <summary>
+/// View Model class
+/// </summary>
+public class TenantCreateModel
+    : EntityCreateModel<Guid>
 {
-    /// <summary>
-    /// View Model class
-    /// </summary>
-    public class TenantCreateModel
-        : EntityCreateModel<Guid>
+    public TenantCreateModel()
     {
-        public TenantCreateModel()
-        {
-            TimeZone = "Central Standard Time";
-        }
+        TimeZone = "Central Standard Time";
+    }
 
-        #region Generated Properties
-        /// <summary>
-        /// Gets or sets the property value for 'Name'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Name'.
-        /// </value>
-        public string Name { get; set; }
+    #region Generated Properties
+    /// <summary>
+    /// Gets or sets the property value for 'Name'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'Name'.
+    /// </value>
+    public string Name { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'Slug'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Slug'.
-        /// </value>
-        public string Slug { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'Slug'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'Slug'.
+    /// </value>
+    public string Slug { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'Description'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Description'.
-        /// </value>
-        public string Description { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'Description'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'Description'.
+    /// </value>
+    public string Description { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'City'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'City'.
-        /// </value>
-        public string City { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'City'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'City'.
+    /// </value>
+    public string City { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'StateProvince'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'StateProvince'.
-        /// </value>
-        public string StateProvince { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'StateProvince'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'StateProvince'.
+    /// </value>
+    public string StateProvince { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'TimeZone'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'TimeZone'.
-        /// </value>
-        public string TimeZone { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'TimeZone'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'TimeZone'.
+    /// </value>
+    public string TimeZone { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'DomainName'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'DomainName'.
-        /// </value>
-        public string DomainName { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'DomainName'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'DomainName'.
+    /// </value>
+    public string DomainName { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'IsDeleted'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'IsDeleted'.
-        /// </value>
-        public bool IsDeleted { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'IsDeleted'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'IsDeleted'.
+    /// </value>
+    public bool IsDeleted { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'PeriodStart'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'PeriodStart'.
-        /// </value>
-        public DateTime PeriodStart { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'PeriodStart'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'PeriodStart'.
+    /// </value>
+    public DateTime PeriodStart { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'PeriodEnd'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'PeriodEnd'.
-        /// </value>
-        public DateTime PeriodEnd { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'PeriodEnd'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'PeriodEnd'.
+    /// </value>
+    public DateTime PeriodEnd { get; set; }
 
-        #endregion
+    #endregion
 
-    }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Tenant/Models/TenantDropdownModel.cs b/service/src/InstructorIQ.Core/Domain/Tenant/Models/TenantDropdownModel.cs
index 7dd35b1b..fd5b1547 100644
--- a/service/src/InstructorIQ.Core/Domain/Tenant/Models/TenantDropdownModel.cs
+++ b/service/src/InstructorIQ.Core/Domain/Tenant/Models/TenantDropdownModel.cs
@@ -1,9 +1,8 @@
-using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.Rendering;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Models
+namespace InstructorIQ.Core.Domain.Models;
+
+public class TenantDropdownModel : SelectListItem
 {
-    public class TenantDropdownModel : SelectListItem
-    {
-    }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.Core/Domain/Tenant/Models/TenantMembershipModel.cs b/service/src/InstructorIQ.Core/Domain/Tenant/Models/TenantMembershipModel.cs
index 180beb1d..aca4b202 100644
--- a/service/src/InstructorIQ.Core/Domain/Tenant/Models/TenantMembershipModel.cs
+++ b/service/src/InstructorIQ.Core/Domain/Tenant/Models/TenantMembershipModel.cs
@@ -1,21 +1,20 @@
-using System;
+using System;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Models
+namespace InstructorIQ.Core.Domain.Models;
+
+public class TenantMembershipModel
 {
-    public class TenantMembershipModel
-    {
-        public Guid TenantId { get; set; }
+    public Guid TenantId { get; set; }
 
-        public Guid UserId { get; set; }
+    public Guid UserId { get; set; }
 
-        public bool IsMember { get; set; }
+    public bool IsMember { get; set; }
 
-        public bool IsAttendee { get; set; }
+    public bool IsAttendee { get; set; }
 
-        public bool IsInstructor { get; set; }
+    public bool IsInstructor { get; set; }
 
-        public bool IsAdministrator { get; set; }
+    public bool IsAdministrator { get; set; }
 
-    }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Tenant/Models/TenantReadModel.cs b/service/src/InstructorIQ.Core/Domain/Tenant/Models/TenantReadModel.cs
index aad8dcd4..8cf231bf 100644
--- a/service/src/InstructorIQ.Core/Domain/Tenant/Models/TenantReadModel.cs
+++ b/service/src/InstructorIQ.Core/Domain/Tenant/Models/TenantReadModel.cs
@@ -1,98 +1,98 @@
 using System;
+
 using MediatR.CommandQuery.Definitions;
 using MediatR.CommandQuery.Models;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Models
+namespace InstructorIQ.Core.Domain.Models;
+
+/// <summary>
+/// View Model class
+/// </summary>
+public partial class TenantReadModel
+    : EntityReadModel<Guid>, ITrackHistory
 {
+    #region Generated Properties
     /// <summary>
-    /// View Model class
+    /// Gets or sets the property value for 'Name'.
     /// </summary>
-    public partial class TenantReadModel
-        : EntityReadModel<Guid>, ITrackHistory
-    {
-        #region Generated Properties
-        /// <summary>
-        /// Gets or sets the property value for 'Name'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Name'.
-        /// </value>
-        public string Name { get; set; }
+    /// <value>
+    /// The property value for 'Name'.
+    /// </value>
+    public string Name { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'Slug'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Slug'.
-        /// </value>
-        public string Slug { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'Slug'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'Slug'.
+    /// </value>
+    public string Slug { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'Description'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Description'.
-        /// </value>
-        public string Description { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'Description'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'Description'.
+    /// </value>
+    public string Description { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'City'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'City'.
-        /// </value>
-        public string City { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'City'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'City'.
+    /// </value>
+    public string City { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'StateProvince'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'StateProvince'.
-        /// </value>
-        public string StateProvince { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'StateProvince'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'StateProvince'.
+    /// </value>
+    public string StateProvince { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'TimeZone'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'TimeZone'.
-        /// </value>
-        public string TimeZone { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'TimeZone'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'TimeZone'.
+    /// </value>
+    public string TimeZone { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'DomainName'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'DomainName'.
-        /// </value>
-        public string DomainName { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'DomainName'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'DomainName'.
+    /// </value>
+    public string DomainName { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'IsDeleted'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'IsDeleted'.
-        /// </value>
-        public bool IsDeleted { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'IsDeleted'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'IsDeleted'.
+    /// </value>
+    public bool IsDeleted { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'PeriodStart'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'PeriodStart'.
-        /// </value>
-        public DateTime PeriodStart { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'PeriodStart'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'PeriodStart'.
+    /// </value>
+    public DateTime PeriodStart { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'PeriodEnd'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'PeriodEnd'.
-        /// </value>
-        public DateTime PeriodEnd { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'PeriodEnd'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'PeriodEnd'.
+    /// </value>
+    public DateTime PeriodEnd { get; set; }
 
-        #endregion
+    #endregion
 
-    }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Tenant/Models/TenantUpdateModel.cs b/service/src/InstructorIQ.Core/Domain/Tenant/Models/TenantUpdateModel.cs
index 9653db3b..79510982 100644
--- a/service/src/InstructorIQ.Core/Domain/Tenant/Models/TenantUpdateModel.cs
+++ b/service/src/InstructorIQ.Core/Domain/Tenant/Models/TenantUpdateModel.cs
@@ -1,98 +1,98 @@
 using System;
 using System.Collections.Generic;
+
 using MediatR.CommandQuery.Models;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Models
+namespace InstructorIQ.Core.Domain.Models;
+
+/// <summary>
+/// View Model class
+/// </summary>
+public partial class TenantUpdateModel
+    : EntityUpdateModel
 {
+    #region Generated Properties
     /// <summary>
-    /// View Model class
+    /// Gets or sets the property value for 'Name'.
     /// </summary>
-    public partial class TenantUpdateModel
-        : EntityUpdateModel
-    {
-        #region Generated Properties
-        /// <summary>
-        /// Gets or sets the property value for 'Name'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Name'.
-        /// </value>
-        public string Name { get; set; }
+    /// <value>
+    /// The property value for 'Name'.
+    /// </value>
+    public string Name { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'Slug'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Slug'.
-        /// </value>
-        public string Slug { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'Slug'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'Slug'.
+    /// </value>
+    public string Slug { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'Description'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Description'.
-        /// </value>
-        public string Description { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'Description'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'Description'.
+    /// </value>
+    public string Description { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'City'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'City'.
-        /// </value>
-        public string City { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'City'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'City'.
+    /// </value>
+    public string City { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'StateProvince'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'StateProvince'.
-        /// </value>
-        public string StateProvince { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'StateProvince'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'StateProvince'.
+    /// </value>
+    public string StateProvince { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'TimeZone'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'TimeZone'.
-        /// </value>
-        public string TimeZone { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'TimeZone'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'TimeZone'.
+    /// </value>
+    public string TimeZone { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'DomainName'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'DomainName'.
-        /// </value>
-        public string DomainName { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'DomainName'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'DomainName'.
+    /// </value>
+    public string DomainName { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'IsDeleted'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'IsDeleted'.
-        /// </value>
-        public bool IsDeleted { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'IsDeleted'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'IsDeleted'.
+    /// </value>
+    public bool IsDeleted { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'PeriodStart'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'PeriodStart'.
-        /// </value>
-        public DateTime PeriodStart { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'PeriodStart'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'PeriodStart'.
+    /// </value>
+    public DateTime PeriodStart { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'PeriodEnd'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'PeriodEnd'.
-        /// </value>
-        public DateTime PeriodEnd { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'PeriodEnd'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'PeriodEnd'.
+    /// </value>
+    public DateTime PeriodEnd { get; set; }
 
-        #endregion
+    #endregion
 
-    }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Tenant/Models/TenantUserModel.cs b/service/src/InstructorIQ.Core/Domain/Tenant/Models/TenantUserModel.cs
index d34d7006..8862e40f 100644
--- a/service/src/InstructorIQ.Core/Domain/Tenant/Models/TenantUserModel.cs
+++ b/service/src/InstructorIQ.Core/Domain/Tenant/Models/TenantUserModel.cs
@@ -1,15 +1,15 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
+
 using InstructorIQ.Core.Data.Entities;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Models
+namespace InstructorIQ.Core.Domain.Models;
+
+public class TenantUserModel
 {
-    public class TenantUserModel
-    {
-        public User User { get; set; }
+    public User User { get; set; }
 
-        public TenantReadModel Tenant { get; set; }
+    public TenantReadModel Tenant { get; set; }
 
-        public List<string> Roles { get; set; }
-    }
-}
\ No newline at end of file
+    public List<string> Roles { get; set; }
+}
diff --git a/service/src/InstructorIQ.Core/Domain/Tenant/Queries/TenantDropdownQuery.cs b/service/src/InstructorIQ.Core/Domain/Tenant/Queries/TenantDropdownQuery.cs
index f769d578..03a28d86 100644
--- a/service/src/InstructorIQ.Core/Domain/Tenant/Queries/TenantDropdownQuery.cs
+++ b/service/src/InstructorIQ.Core/Domain/Tenant/Queries/TenantDropdownQuery.cs
@@ -1,15 +1,16 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Security.Principal;
-using MediatR.CommandQuery.Queries;
+
 using InstructorIQ.Core.Domain.Models;
 
+using MediatR.CommandQuery.Queries;
+
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Queries
+namespace InstructorIQ.Core.Domain.Queries;
+
+public class TenantDropdownQuery : PrincipalQueryBase<IReadOnlyCollection<TenantDropdownModel>>
 {
-    public class TenantDropdownQuery : PrincipalQueryBase<IReadOnlyCollection<TenantDropdownModel>>
+    public TenantDropdownQuery(IPrincipal principal) : base(principal)
     {
-        public TenantDropdownQuery(IPrincipal principal) : base(principal)
-        {
-        }
     }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Tenant/Queries/TenantMembershipCommand.cs b/service/src/InstructorIQ.Core/Domain/Tenant/Queries/TenantMembershipCommand.cs
index a8504a08..622a3110 100644
--- a/service/src/InstructorIQ.Core/Domain/Tenant/Queries/TenantMembershipCommand.cs
+++ b/service/src/InstructorIQ.Core/Domain/Tenant/Queries/TenantMembershipCommand.cs
@@ -1,19 +1,20 @@
-using System.Security.Principal;
-using MediatR.CommandQuery.Commands;
+using System.Security.Principal;
+
 using InstructorIQ.Core.Domain.Models;
 
+using MediatR.CommandQuery.Commands;
+
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Queries
-{
-    public class TenantMembershipCommand : PrincipalCommandBase<TenantMembershipModel>
-    {
+namespace InstructorIQ.Core.Domain.Queries;
 
-        public TenantMembershipCommand(IPrincipal principal, TenantMembershipModel membership) : base(principal)
-        {
-            Membership = membership;
-        }
+public class TenantMembershipCommand : PrincipalCommandBase<TenantMembershipModel>
+{
 
-        public TenantMembershipModel Membership { get; set; }
+    public TenantMembershipCommand(IPrincipal principal, TenantMembershipModel membership) : base(principal)
+    {
+        Membership = membership;
     }
+
+    public TenantMembershipModel Membership { get; set; }
 }
 
diff --git a/service/src/InstructorIQ.Core/Domain/Tenant/Queries/TenantMembershipQuery.cs b/service/src/InstructorIQ.Core/Domain/Tenant/Queries/TenantMembershipQuery.cs
index 2009d582..2fd2d9f8 100644
--- a/service/src/InstructorIQ.Core/Domain/Tenant/Queries/TenantMembershipQuery.cs
+++ b/service/src/InstructorIQ.Core/Domain/Tenant/Queries/TenantMembershipQuery.cs
@@ -1,23 +1,24 @@
-using System;
+using System;
 using System.Security.Principal;
-using MediatR.CommandQuery.Queries;
+
 using InstructorIQ.Core.Domain.Models;
 
+using MediatR.CommandQuery.Queries;
+
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Queries
+namespace InstructorIQ.Core.Domain.Queries;
+
+public class TenantMembershipQuery : PrincipalQueryBase<TenantMembershipModel>
 {
-    public class TenantMembershipQuery : PrincipalQueryBase<TenantMembershipModel>
+    public TenantMembershipQuery(IPrincipal principal, Guid tenantId, Guid userId) : base(principal)
     {
-        public TenantMembershipQuery(IPrincipal principal, Guid tenantId, Guid userId) : base(principal)
-        {
-            TenantId = tenantId;
-            UserId = userId;
-        }
+        TenantId = tenantId;
+        UserId = userId;
+    }
 
-        public Guid TenantId { get; set; }
+    public Guid TenantId { get; set; }
 
-        public Guid UserId { get; set; }
+    public Guid UserId { get; set; }
 
-    }
 }
 
diff --git a/service/src/InstructorIQ.Core/Domain/Tenant/Queries/TenantPagedQuery.cs b/service/src/InstructorIQ.Core/Domain/Tenant/Queries/TenantPagedQuery.cs
index c51f433a..f49660ca 100644
--- a/service/src/InstructorIQ.Core/Domain/Tenant/Queries/TenantPagedQuery.cs
+++ b/service/src/InstructorIQ.Core/Domain/Tenant/Queries/TenantPagedQuery.cs
@@ -1,15 +1,16 @@
-using System.Security.Principal;
-using MediatR.CommandQuery.Queries;
+using System.Security.Principal;
+
 using InstructorIQ.Core.Domain.Models;
+
 using MediatR;
+using MediatR.CommandQuery.Queries;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Queries
+namespace InstructorIQ.Core.Domain.Queries;
+
+public class TenantPagedQuery : EntityPagedQuery<TenantReadModel>
 {
-    public class TenantPagedQuery : EntityPagedQuery<TenantReadModel>
+    public TenantPagedQuery(IPrincipal principal, EntityQuery query) : base(principal, query)
     {
-        public TenantPagedQuery(IPrincipal principal, EntityQuery query) : base(principal, query)
-        {
-        }
     }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Tenant/Queries/TenantSlugQuery.cs b/service/src/InstructorIQ.Core/Domain/Tenant/Queries/TenantSlugQuery.cs
index 89ce4aa9..10b5bdd0 100644
--- a/service/src/InstructorIQ.Core/Domain/Tenant/Queries/TenantSlugQuery.cs
+++ b/service/src/InstructorIQ.Core/Domain/Tenant/Queries/TenantSlugQuery.cs
@@ -1,40 +1,41 @@
-using System;
+using System;
 using System.Security.Principal;
+
+using InstructorIQ.Core.Domain.Models;
+
 using MediatR.CommandQuery.Definitions;
 using MediatR.CommandQuery.Queries;
-using InstructorIQ.Core.Domain.Models;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Queries
+namespace InstructorIQ.Core.Domain.Queries;
+
+public class TenantSlugQuery : PrincipalQueryBase<TenantReadModel>, ICacheQueryResult
 {
-    public class TenantSlugQuery : PrincipalQueryBase<TenantReadModel>, ICacheQueryResult
+    public TenantSlugQuery(IPrincipal principal, string slug) : base(principal)
     {
-        public TenantSlugQuery(IPrincipal principal, string slug) : base(principal)
-        {
-            Slug = slug;
-        }
+        Slug = slug;
+    }
 
-        public string Slug { get; set; }
+    public string Slug { get; set; }
 
 
-        string ICacheQueryResult.GetCacheKey()
-        {
-            return $"tenant-slug-{Slug?.ToLowerInvariant()}";
-        }
+    string ICacheQueryResult.GetCacheKey()
+    {
+        return $"tenant-slug-{Slug?.ToLowerInvariant()}";
+    }
 
-        TimeSpan? ICacheQueryResult.SlidingExpiration()
-        {
-            return TimeSpan.FromMinutes(10);
-        }
+    TimeSpan? ICacheQueryResult.SlidingExpiration()
+    {
+        return TimeSpan.FromMinutes(10);
+    }
 
-        DateTimeOffset? ICacheQueryResult.AbsoluteExpiration()
-        {
-            return DateTimeOffset.UtcNow.Add(TimeSpan.FromMinutes(30));
-        }
+    DateTimeOffset? ICacheQueryResult.AbsoluteExpiration()
+    {
+        return DateTimeOffset.UtcNow.Add(TimeSpan.FromMinutes(30));
+    }
 
-        bool ICacheQueryResult.IsCacheable()
-        {
-            return true;
-        }
+    bool ICacheQueryResult.IsCacheable()
+    {
+        return true;
     }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Tenant/TenantServiceRegistration.cs b/service/src/InstructorIQ.Core/Domain/Tenant/TenantServiceRegistration.cs
index c9271292..80b73490 100644
--- a/service/src/InstructorIQ.Core/Domain/Tenant/TenantServiceRegistration.cs
+++ b/service/src/InstructorIQ.Core/Domain/Tenant/TenantServiceRegistration.cs
@@ -17,29 +17,28 @@
 using Microsoft.Extensions.DependencyInjection.Extensions;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain
+namespace InstructorIQ.Core.Domain;
+
+public class TenantServiceRegistration : DomainServiceRegistrationBase
 {
-    public class TenantServiceRegistration : DomainServiceRegistrationBase
-    {
 
-        [RegisterServices]
-        public override void Register(IServiceCollection services)
-        {
-            RegisterEntityQuery<Guid, Tenant, TenantReadModel>(services);
-            RegisterEntityCommand<Guid, Tenant, TenantReadModel, TenantCreateModel, TenantUpdateModel>(services);
+    [RegisterServices]
+    public override void Register(IServiceCollection services)
+    {
+        RegisterEntityQuery<Guid, Tenant, TenantReadModel>(services);
+        RegisterEntityCommand<Guid, Tenant, TenantReadModel, TenantCreateModel, TenantUpdateModel>(services);
 
-            services.TryAddTransient<IRequestHandler<TenantUserResolveCommand, TenantUserModel>, TenantUserResolveCommandHandler>();
+        services.TryAddTransient<IRequestHandler<TenantUserResolveCommand, TenantUserModel>, TenantUserResolveCommandHandler>();
 
-            services.TryAddTransient<IRequestHandler<TenantSlugQuery, TenantReadModel>, TenantSlugQueryHandler>();
-            services.AddTransient<IPipelineBehavior<TenantSlugQuery, TenantReadModel>, MemoryCacheQueryBehavior<TenantSlugQuery, TenantReadModel>>();
+        services.TryAddTransient<IRequestHandler<TenantSlugQuery, TenantReadModel>, TenantSlugQueryHandler>();
+        services.AddTransient<IPipelineBehavior<TenantSlugQuery, TenantReadModel>, MemoryCacheQueryBehavior<TenantSlugQuery, TenantReadModel>>();
 
-            services.TryAddTransient<IRequestHandler<TenantDropdownQuery, IReadOnlyCollection<TenantDropdownModel>>, TenantDropdownQueryHandler>();
+        services.TryAddTransient<IRequestHandler<TenantDropdownQuery, IReadOnlyCollection<TenantDropdownModel>>, TenantDropdownQueryHandler>();
 
-            services.TryAddTransient<IRequestHandler<TenantMembershipQuery, TenantMembershipModel>, TenantMembershipQueryHandler>();
-            services.TryAddTransient<IRequestHandler<TenantMembershipCommand, TenantMembershipModel>, TenantMembershipCommandHandler>();
+        services.TryAddTransient<IRequestHandler<TenantMembershipQuery, TenantMembershipModel>, TenantMembershipQueryHandler>();
+        services.TryAddTransient<IRequestHandler<TenantMembershipCommand, TenantMembershipModel>, TenantMembershipCommandHandler>();
 
-            services.TryAddTransient<IRequestHandler<TenantPagedQuery, EntityPagedResult<TenantReadModel>>, TenantPagedQueryHandler>();
+        services.TryAddTransient<IRequestHandler<TenantPagedQuery, EntityPagedResult<TenantReadModel>>, TenantPagedQueryHandler>();
 
-        }
     }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Tenant/Validation/TenantCreateModelValidator.cs b/service/src/InstructorIQ.Core/Domain/Tenant/Validation/TenantCreateModelValidator.cs
index f2ec4335..6c0eb9d1 100644
--- a/service/src/InstructorIQ.Core/Domain/Tenant/Validation/TenantCreateModelValidator.cs
+++ b/service/src/InstructorIQ.Core/Domain/Tenant/Validation/TenantCreateModelValidator.cs
@@ -1,33 +1,34 @@
 using System;
+
 using FluentValidation;
+
 using InstructorIQ.Core.Domain.Models;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Validation
+namespace InstructorIQ.Core.Domain.Validation;
+
+/// <summary>
+/// Validator class for <see cref="TenantCreateModel"/> .
+/// </summary>
+public partial class TenantCreateModelValidator
+    : AbstractValidator<TenantCreateModel>
 {
     /// <summary>
-    /// Validator class for <see cref="TenantCreateModel"/> .
+    /// Initializes a new instance of the <see cref="TenantCreateModelValidator"/> class.
     /// </summary>
-    public partial class TenantCreateModelValidator
-        : AbstractValidator<TenantCreateModel>
+    public TenantCreateModelValidator()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TenantCreateModelValidator"/> class.
-        /// </summary>
-        public TenantCreateModelValidator()
-        {
-            #region Generated Constructor
-            RuleFor(p => p.Name).NotEmpty();
-            RuleFor(p => p.Name).MaximumLength(256);
-            RuleFor(p => p.Slug).NotEmpty();
-            RuleFor(p => p.Slug).MaximumLength(50);
-            RuleFor(p => p.City).MaximumLength(150);
-            RuleFor(p => p.StateProvince).MaximumLength(150);
-            RuleFor(p => p.TimeZone).NotEmpty();
-            RuleFor(p => p.TimeZone).MaximumLength(150);
-            RuleFor(p => p.DomainName).MaximumLength(150);
-            #endregion
-        }
-
+        #region Generated Constructor
+        RuleFor(p => p.Name).NotEmpty();
+        RuleFor(p => p.Name).MaximumLength(256);
+        RuleFor(p => p.Slug).NotEmpty();
+        RuleFor(p => p.Slug).MaximumLength(50);
+        RuleFor(p => p.City).MaximumLength(150);
+        RuleFor(p => p.StateProvince).MaximumLength(150);
+        RuleFor(p => p.TimeZone).NotEmpty();
+        RuleFor(p => p.TimeZone).MaximumLength(150);
+        RuleFor(p => p.DomainName).MaximumLength(150);
+        #endregion
     }
+
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Tenant/Validation/TenantUpdateModelValidator.cs b/service/src/InstructorIQ.Core/Domain/Tenant/Validation/TenantUpdateModelValidator.cs
index 6011cc85..13c4b20d 100644
--- a/service/src/InstructorIQ.Core/Domain/Tenant/Validation/TenantUpdateModelValidator.cs
+++ b/service/src/InstructorIQ.Core/Domain/Tenant/Validation/TenantUpdateModelValidator.cs
@@ -1,33 +1,34 @@
 using System;
+
 using FluentValidation;
+
 using InstructorIQ.Core.Domain.Models;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Validation
+namespace InstructorIQ.Core.Domain.Validation;
+
+/// <summary>
+/// Validator class for <see cref="TenantUpdateModel"/> .
+/// </summary>
+public partial class TenantUpdateModelValidator
+    : AbstractValidator<TenantUpdateModel>
 {
     /// <summary>
-    /// Validator class for <see cref="TenantUpdateModel"/> .
+    /// Initializes a new instance of the <see cref="TenantUpdateModelValidator"/> class.
     /// </summary>
-    public partial class TenantUpdateModelValidator
-        : AbstractValidator<TenantUpdateModel>
+    public TenantUpdateModelValidator()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TenantUpdateModelValidator"/> class.
-        /// </summary>
-        public TenantUpdateModelValidator()
-        {
-            #region Generated Constructor
-            RuleFor(p => p.Name).NotEmpty();
-            RuleFor(p => p.Name).MaximumLength(256);
-            RuleFor(p => p.Slug).NotEmpty();
-            RuleFor(p => p.Slug).MaximumLength(50);
-            RuleFor(p => p.City).MaximumLength(150);
-            RuleFor(p => p.StateProvince).MaximumLength(150);
-            RuleFor(p => p.TimeZone).NotEmpty();
-            RuleFor(p => p.TimeZone).MaximumLength(150);
-            RuleFor(p => p.DomainName).MaximumLength(150);
-            #endregion
-        }
-
+        #region Generated Constructor
+        RuleFor(p => p.Name).NotEmpty();
+        RuleFor(p => p.Name).MaximumLength(256);
+        RuleFor(p => p.Slug).NotEmpty();
+        RuleFor(p => p.Slug).MaximumLength(50);
+        RuleFor(p => p.City).MaximumLength(150);
+        RuleFor(p => p.StateProvince).MaximumLength(150);
+        RuleFor(p => p.TimeZone).NotEmpty();
+        RuleFor(p => p.TimeZone).MaximumLength(150);
+        RuleFor(p => p.DomainName).MaximumLength(150);
+        #endregion
     }
+
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Topic/Commands/TopicMultipleUpdateCommand.cs b/service/src/InstructorIQ.Core/Domain/Topic/Commands/TopicMultipleUpdateCommand.cs
index 50ceb9d6..f8735450 100644
--- a/service/src/InstructorIQ.Core/Domain/Topic/Commands/TopicMultipleUpdateCommand.cs
+++ b/service/src/InstructorIQ.Core/Domain/Topic/Commands/TopicMultipleUpdateCommand.cs
@@ -1,24 +1,25 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Security.Principal;
+
 using InstructorIQ.Core.Domain.Models;
+
 using MediatR.CommandQuery.Commands;
 using MediatR.CommandQuery.Models;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Commands
+namespace InstructorIQ.Core.Domain.Commands;
+
+public class TopicMultipleUpdateCommand : PrincipalCommandBase<CompleteModel>
 {
-    public class TopicMultipleUpdateCommand : PrincipalCommandBase<CompleteModel>
+    public TopicMultipleUpdateCommand(IPrincipal principal, IEnumerable<TopicMultipleUpdateModel> topics) : base(principal)
     {
-        public TopicMultipleUpdateCommand(IPrincipal principal, IEnumerable<TopicMultipleUpdateModel> topics) : base(principal)
-        {
-            if (topics == null)
-                throw new ArgumentNullException(nameof(topics));
+        if (topics == null)
+            throw new ArgumentNullException(nameof(topics));
 
-            Topics = topics.ToList();
-        }
-
-        public List<TopicMultipleUpdateModel> Topics { get; }
+        Topics = topics.ToList();
     }
+
+    public List<TopicMultipleUpdateModel> Topics { get; }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Topic/Handlers/TopicHistoryQueryHandler.cs b/service/src/InstructorIQ.Core/Domain/Topic/Handlers/TopicHistoryQueryHandler.cs
index be3af30c..2691ffa2 100644
--- a/service/src/InstructorIQ.Core/Domain/Topic/Handlers/TopicHistoryQueryHandler.cs
+++ b/service/src/InstructorIQ.Core/Domain/Topic/Handlers/TopicHistoryQueryHandler.cs
@@ -1,98 +1,103 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+
 using AutoMapper;
 using AutoMapper.QueryableExtensions;
+
 using EntityChange;
+
 using FluentCommand.Extensions;
+
 using InstructorIQ.Core.Data;
 using InstructorIQ.Core.Data.Entities;
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Domain.Queries;
+
 using MediatR;
 using MediatR.CommandQuery.Audit;
 using MediatR.CommandQuery.Definitions;
 using MediatR.CommandQuery.EntityFrameworkCore.Handlers;
+
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Handlers
+namespace InstructorIQ.Core.Domain.Handlers;
+
+public class TopicHistoryQueryHandler : DataContextHandlerBase<InstructorIQContext, TopicHistoryQuery, IReadOnlyCollection<AuditRecord<Guid>>>
 {
-    public class TopicHistoryQueryHandler : DataContextHandlerBase<InstructorIQContext, TopicHistoryQuery, IReadOnlyCollection<AuditRecord<Guid>>>
+    private readonly IMediator _mediator;
+    private readonly IChangeCollector<Guid, TopicReadModel> _changeCollector;
+
+    public TopicHistoryQueryHandler(ILoggerFactory loggerFactory, InstructorIQContext dataContext, IMapper mapper, IMediator mediator, IChangeCollector<Guid, TopicReadModel> changeCollector)
+        : base(loggerFactory, dataContext, mapper)
+    {
+        _mediator = mediator;
+        _changeCollector = changeCollector;
+    }
+
+    protected override async Task<IReadOnlyCollection<AuditRecord<Guid>>> Process(TopicHistoryQuery request, CancellationToken cancellationToken)
+    {
+        var historyList = new List<AuditRecord<Guid>>();
+
+        var topicHistoryList = await CollectTopicHistory(request, cancellationToken);
+        historyList.AddRange(topicHistoryList);
+
+        var sessionHistoryList = await CollectSessionHistory(request, cancellationToken);
+        historyList.AddRange(sessionHistoryList);
+
+        var instructorHistoryList = await CollectSessionInstructorHistory(request, cancellationToken);
+        historyList.AddRange(instructorHistoryList);
+
+        var discussionHistoryList = await CollectDiscussionHistory(request, cancellationToken);
+        historyList.AddRange(discussionHistoryList);
+
+        return historyList
+            .Where(p => p.Operation != AuditOperation.Update || (p.Operation == AuditOperation.Update && p.Changes?.Count > 0))
+            .OrderBy(p => p.ActivityDate)
+            .ToList();
+    }
+
+
+    private async Task<List<AuditRecord<Guid>>> CollectTopicHistory(TopicHistoryQuery request, CancellationToken cancellationToken)
+    {
+        var sql = new StringBuilder();
+        sql.AppendLine("SELECT *");
+        sql.AppendLine("FROM [IQ].[Topic]");
+        sql.AppendLine("FOR SYSTEM_TIME ALL");
+        sql.AppendLine("WHERE [Id] = {0}");
+
+        var entities = await DataContext.Topics
+            .FromSqlRaw(sql.ToString(), request.Id)
+            .AsNoTracking()
+            .OrderBy(p => p.PeriodEnd)
+            .ProjectTo<TopicReadModel>(Mapper.ConfigurationProvider)
+            .ToListAsync(cancellationToken);
+
+        var historyList = _changeCollector.CollectChanges(entities, nameof(Topic), t => t.Title);
+
+        return historyList.ToList();
+    }
+
+    private async Task<IReadOnlyCollection<AuditRecord<Guid>>> CollectSessionHistory(TopicHistoryQuery request, CancellationToken cancellationToken)
+    {
+        var command = new SessionHistoryQuery(request.Principal) { TopicId = request.Id };
+        return await _mediator.Send(command, cancellationToken);
+    }
+
+    private async Task<IReadOnlyCollection<AuditRecord<Guid>>> CollectSessionInstructorHistory(TopicHistoryQuery request, CancellationToken cancellationToken)
+    {
+        var command = new SessionInstructorHistoryQuery(request.Principal) { TopicId = request.Id };
+        return await _mediator.Send(command, cancellationToken);
+    }
+
+    private async Task<IReadOnlyCollection<AuditRecord<Guid>>> CollectDiscussionHistory(TopicHistoryQuery request, CancellationToken cancellationToken)
     {
-        private readonly IMediator _mediator;
-        private readonly IChangeCollector<Guid, TopicReadModel> _changeCollector;
-
-        public TopicHistoryQueryHandler(ILoggerFactory loggerFactory, InstructorIQContext dataContext, IMapper mapper, IMediator mediator, IChangeCollector<Guid, TopicReadModel> changeCollector)
-            : base(loggerFactory, dataContext, mapper)
-        {
-            _mediator = mediator;
-            _changeCollector = changeCollector;
-        }
-
-        protected override async Task<IReadOnlyCollection<AuditRecord<Guid>>> Process(TopicHistoryQuery request, CancellationToken cancellationToken)
-        {
-            var historyList = new List<AuditRecord<Guid>>();
-
-            var topicHistoryList = await CollectTopicHistory(request, cancellationToken);
-            historyList.AddRange(topicHistoryList);
-
-            var sessionHistoryList = await CollectSessionHistory(request, cancellationToken);
-            historyList.AddRange(sessionHistoryList);
-
-            var instructorHistoryList = await CollectSessionInstructorHistory(request, cancellationToken);
-            historyList.AddRange(instructorHistoryList);
-
-            var discussionHistoryList = await CollectDiscussionHistory(request, cancellationToken);
-            historyList.AddRange(discussionHistoryList);
-
-            return historyList
-                .Where(p => p.Operation != AuditOperation.Update || (p.Operation == AuditOperation.Update && p.Changes?.Count > 0))
-                .OrderBy(p => p.ActivityDate)
-                .ToList();
-        }
-
-
-        private async Task<List<AuditRecord<Guid>>> CollectTopicHistory(TopicHistoryQuery request, CancellationToken cancellationToken)
-        {
-            var sql = new StringBuilder();
-            sql.AppendLine("SELECT *");
-            sql.AppendLine("FROM [IQ].[Topic]");
-            sql.AppendLine("FOR SYSTEM_TIME ALL");
-            sql.AppendLine("WHERE [Id] = {0}");
-
-            var entities = await DataContext.Topics
-                .FromSqlRaw(sql.ToString(), request.Id)
-                .AsNoTracking()
-                .OrderBy(p => p.PeriodEnd)
-                .ProjectTo<TopicReadModel>(Mapper.ConfigurationProvider)
-                .ToListAsync(cancellationToken);
-
-            var historyList = _changeCollector.CollectChanges(entities, nameof(Topic), t => t.Title);
-
-            return historyList.ToList();
-        }
-
-        private async Task<IReadOnlyCollection<AuditRecord<Guid>>> CollectSessionHistory(TopicHistoryQuery request, CancellationToken cancellationToken)
-        {
-            var command = new SessionHistoryQuery(request.Principal) { TopicId = request.Id };
-            return await _mediator.Send(command, cancellationToken);
-        }
-
-        private async Task<IReadOnlyCollection<AuditRecord<Guid>>> CollectSessionInstructorHistory(TopicHistoryQuery request, CancellationToken cancellationToken)
-        {
-            var command = new SessionInstructorHistoryQuery(request.Principal) { TopicId = request.Id };
-            return await _mediator.Send(command, cancellationToken);
-        }
-
-        private async Task<IReadOnlyCollection<AuditRecord<Guid>>> CollectDiscussionHistory(TopicHistoryQuery request, CancellationToken cancellationToken)
-        {
-            var command = new DiscussionHistoryQuery(request.Principal) { TopicId = request.Id };
-            return await _mediator.Send(command, cancellationToken);
-        }
+        var command = new DiscussionHistoryQuery(request.Principal) { TopicId = request.Id };
+        return await _mediator.Send(command, cancellationToken);
     }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Topic/Handlers/TopicMultipleUpdateCommandHandler.cs b/service/src/InstructorIQ.Core/Domain/Topic/Handlers/TopicMultipleUpdateCommandHandler.cs
index c1a632bc..a1834172 100644
--- a/service/src/InstructorIQ.Core/Domain/Topic/Handlers/TopicMultipleUpdateCommandHandler.cs
+++ b/service/src/InstructorIQ.Core/Domain/Topic/Handlers/TopicMultipleUpdateCommandHandler.cs
@@ -1,58 +1,61 @@
-using System.Threading;
+using System.Threading;
 using System.Threading.Tasks;
+
 using FluentCommand;
 using FluentCommand.Merge;
+
 using InstructorIQ.Core.Data.Mapping;
 using InstructorIQ.Core.Domain.Commands;
 using InstructorIQ.Core.Domain.Models;
+
 using MediatR.CommandQuery.Handlers;
 using MediatR.CommandQuery.Models;
+
 using Microsoft.Extensions.Logging;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Handlers
+namespace InstructorIQ.Core.Domain.Handlers;
+
+public class TopicMultipleUpdateCommandHandler
+    : RequestHandlerBase<TopicMultipleUpdateCommand, CompleteModel>
 {
-    public class TopicMultipleUpdateCommandHandler
-        : RequestHandlerBase<TopicMultipleUpdateCommand, CompleteModel>
+    private readonly IDataSession _dataSession;
+
+    public TopicMultipleUpdateCommandHandler(ILoggerFactory loggerFactory, IDataSession dataSession) : base(loggerFactory)
     {
-        private readonly IDataSession _dataSession;
+        _dataSession = dataSession;
+    }
 
-        public TopicMultipleUpdateCommandHandler(ILoggerFactory loggerFactory, IDataSession dataSession) : base(loggerFactory)
+    protected override async Task<CompleteModel> Process(TopicMultipleUpdateCommand request, CancellationToken cancellationToken)
+    {
+        if (request.Topics.Count == 0)
         {
-            _dataSession = dataSession;
+            Logger.LogWarning("No topics to process");
+            return new CompleteModel();
         }
 
-        protected override async Task<CompleteModel> Process(TopicMultipleUpdateCommand request, CancellationToken cancellationToken)
-        {
-            if (request.Topics.Count == 0)
+        int rows = await _dataSession
+            .MergeData($"[{TopicMap.Table.Schema}].[{TopicMap.Table.Name}]")
+            .IncludeInsert()
+            .IncludeUpdate()
+            .Mode(DataMergeMode.SqlStatement)
+            .Map<TopicMultipleUpdateModel>(m =>
             {
-                Logger.LogWarning("No topics to process");
-                return new CompleteModel();
-            }
-
-            int rows = await _dataSession
-                .MergeData($"[{TopicMap.Table.Schema}].[{TopicMap.Table.Name}]")
-                .IncludeInsert()
-                .IncludeUpdate()
-                .Mode(DataMergeMode.SqlStatement)
-                .Map<TopicMultipleUpdateModel>(m =>
-                {
-                    m.Column(p => p.Id).Key();
-                    m.Column(p => p.TenantId);
-                    m.Column(p => p.Title);
-                    m.Column(p => p.CalendarYear);
-                    m.Column(p => p.TargetMonth);
-                    m.Column(p => p.Created);
-                    m.Column(p => p.CreatedBy);
-                    m.Column(p => p.Updated);
-                    m.Column(p => p.UpdatedBy);
-                })
-                .ExecuteAsync(request.Topics, cancellationToken);
-
-            Logger.LogInformation("Processed {rows} topics", rows);
+                m.Column(p => p.Id).Key();
+                m.Column(p => p.TenantId);
+                m.Column(p => p.Title);
+                m.Column(p => p.CalendarYear);
+                m.Column(p => p.TargetMonth);
+                m.Column(p => p.Created);
+                m.Column(p => p.CreatedBy);
+                m.Column(p => p.Updated);
+                m.Column(p => p.UpdatedBy);
+            })
+            .ExecuteAsync(request.Topics, cancellationToken);
 
-            return new CompleteModel();
+        Logger.LogInformation("Processed {rows} topics", rows);
+
+        return new CompleteModel();
 
-        }
     }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Topic/Mapping/TopicProfile.cs b/service/src/InstructorIQ.Core/Domain/Topic/Mapping/TopicProfile.cs
index a3887cc8..2f4f8de8 100644
--- a/service/src/InstructorIQ.Core/Domain/Topic/Mapping/TopicProfile.cs
+++ b/service/src/InstructorIQ.Core/Domain/Topic/Mapping/TopicProfile.cs
@@ -1,54 +1,55 @@
 using System;
 using System.Linq;
+
 using AutoMapper;
+
 using InstructorIQ.Core.Data.Entities;
 using InstructorIQ.Core.Domain.Models;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Mapping
+namespace InstructorIQ.Core.Domain.Mapping;
+
+/// <summary>
+/// Mapper class for entity <see cref="Topic"/> .
+/// </summary>
+public class TopicProfile
+    : Profile
 {
     /// <summary>
-    /// Mapper class for entity <see cref="Topic"/> .
+    /// Initializes a new instance of the <see cref="TopicProfile"/> class.
     /// </summary>
-    public class TopicProfile
-        : Profile
+    public TopicProfile()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TopicProfile"/> class.
-        /// </summary>
-        public TopicProfile()
-        {
-            CreateMap<TopicCreateModel, Topic>();
+        CreateMap<TopicCreateModel, Topic>();
 
-            CreateMap<TopicUpdateModel, Topic>()
-                .ForMember(d => d.RowVersion, opt => opt.MapFrom(s => Convert.FromBase64String(s.RowVersion)));
+        CreateMap<TopicUpdateModel, Topic>()
+            .ForMember(d => d.RowVersion, opt => opt.MapFrom(s => Convert.FromBase64String(s.RowVersion)));
 
-            CreateMap<Topic, TopicReadModel>()
-                .ForMember(d => d.RowVersion, opt => opt.MapFrom(s => Convert.ToBase64String(s.RowVersion)))
-                .ForMember(d => d.TenantName, opt => opt.MapFrom(s => s.Tenant.Name))
-                .ForMember(d => d.LeadInstructorName, opt => opt.MapFrom(s => s.LeadInstructor.DisplayName))
-                .ForMember(d => d.LeadInstructorEmail, opt => opt.MapFrom(s => s.LeadInstructor.Email))
-                .ForMember(d => d.SessionCount, opt => opt.MapFrom(s => s.Sessions.Count()));
+        CreateMap<Topic, TopicReadModel>()
+            .ForMember(d => d.RowVersion, opt => opt.MapFrom(s => Convert.ToBase64String(s.RowVersion)))
+            .ForMember(d => d.TenantName, opt => opt.MapFrom(s => s.Tenant.Name))
+            .ForMember(d => d.LeadInstructorName, opt => opt.MapFrom(s => s.LeadInstructor.DisplayName))
+            .ForMember(d => d.LeadInstructorEmail, opt => opt.MapFrom(s => s.LeadInstructor.Email))
+            .ForMember(d => d.SessionCount, opt => opt.MapFrom(s => s.Sessions.Count()));
 
-            CreateMap<Topic, TopicListModel>()
-                .ForMember(d => d.RowVersion, opt => opt.MapFrom(s => Convert.ToBase64String(s.RowVersion)))
-                .ForMember(d => d.TenantName, opt => opt.MapFrom(s => s.Tenant.Name))
-                .ForMember(d => d.LeadInstructorName, opt => opt.MapFrom(s => s.LeadInstructor.DisplayName))
-                .ForMember(d => d.LeadInstructorEmail, opt => opt.MapFrom(s => s.LeadInstructor.Email))
-                .ForMember(d => d.SessionCount, opt => opt.MapFrom(s => s.Sessions.Count()));
+        CreateMap<Topic, TopicListModel>()
+            .ForMember(d => d.RowVersion, opt => opt.MapFrom(s => Convert.ToBase64String(s.RowVersion)))
+            .ForMember(d => d.TenantName, opt => opt.MapFrom(s => s.Tenant.Name))
+            .ForMember(d => d.LeadInstructorName, opt => opt.MapFrom(s => s.LeadInstructor.DisplayName))
+            .ForMember(d => d.LeadInstructorEmail, opt => opt.MapFrom(s => s.LeadInstructor.Email))
+            .ForMember(d => d.SessionCount, opt => opt.MapFrom(s => s.Sessions.Count()));
 
-            CreateMap<Topic, TopicUpdateModel>()
-                .ForMember(d => d.RowVersion, opt => opt.MapFrom(s => Convert.ToBase64String(s.RowVersion)));
+        CreateMap<Topic, TopicUpdateModel>()
+            .ForMember(d => d.RowVersion, opt => opt.MapFrom(s => Convert.ToBase64String(s.RowVersion)));
 
-            CreateMap<TopicReadModel, TopicUpdateModel>();
+        CreateMap<TopicReadModel, TopicUpdateModel>();
 
-            CreateMap<Topic, TopicMultipleUpdateModel>();
+        CreateMap<Topic, TopicMultipleUpdateModel>();
 
-            CreateMap<Topic, TopicDropdownModel>()
-                .ForMember(d => d.Value, opt => opt.MapFrom(s => s.Id))
-                .ForMember(d => d.Text, opt => opt.MapFrom(s => s.Title));
-
-        }
+        CreateMap<Topic, TopicDropdownModel>()
+            .ForMember(d => d.Value, opt => opt.MapFrom(s => s.Id))
+            .ForMember(d => d.Text, opt => opt.MapFrom(s => s.Title));
 
     }
+
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Topic/Mapping/TopicReadModelProfile.cs b/service/src/InstructorIQ.Core/Domain/Topic/Mapping/TopicReadModelProfile.cs
index 08a6c3b7..d252fedd 100644
--- a/service/src/InstructorIQ.Core/Domain/Topic/Mapping/TopicReadModelProfile.cs
+++ b/service/src/InstructorIQ.Core/Domain/Topic/Mapping/TopicReadModelProfile.cs
@@ -1,27 +1,27 @@
 using EntityChange;
+
 using InstructorIQ.Core.Domain.Models;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Mapping
+namespace InstructorIQ.Core.Domain.Mapping;
+
+public class TopicReadModelProfile : EntityProfile<TopicReadModel>
 {
-    public class TopicReadModelProfile : EntityProfile<TopicReadModel>
+    public override void Configure()
     {
-        public override void Configure()
-        {
-            AutoMap();
+        AutoMap();
 
-            Property(p => p.TenantId).Ignore();
-            Property(p => p.LeadInstructorId).Ignore();
-            Property(p => p.SessionCount).Ignore();
+        Property(p => p.TenantId).Ignore();
+        Property(p => p.LeadInstructorId).Ignore();
+        Property(p => p.SessionCount).Ignore();
 
-            Property(p => p.Created).Ignore();
-            Property(p => p.CreatedBy).Ignore();
-            Property(p => p.Updated).Ignore();
-            Property(p => p.UpdatedBy).Ignore();
-            Property(p => p.RowVersion).Ignore();
+        Property(p => p.Created).Ignore();
+        Property(p => p.CreatedBy).Ignore();
+        Property(p => p.Updated).Ignore();
+        Property(p => p.UpdatedBy).Ignore();
+        Property(p => p.RowVersion).Ignore();
 
-            Property(p => p.PeriodStart).Ignore();
-            Property(p => p.PeriodEnd).Ignore();
-        }
+        Property(p => p.PeriodStart).Ignore();
+        Property(p => p.PeriodEnd).Ignore();
     }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.Core/Domain/Topic/Models/TopicCreateModel.cs b/service/src/InstructorIQ.Core/Domain/Topic/Models/TopicCreateModel.cs
index 9b6f3c5c..8ff8e14c 100644
--- a/service/src/InstructorIQ.Core/Domain/Topic/Models/TopicCreateModel.cs
+++ b/service/src/InstructorIQ.Core/Domain/Topic/Models/TopicCreateModel.cs
@@ -1,130 +1,130 @@
 using System;
+
 using MediatR.CommandQuery.Definitions;
 using MediatR.CommandQuery.Models;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Models
+namespace InstructorIQ.Core.Domain.Models;
+
+/// <summary>
+/// View Model class
+/// </summary>
+public class TopicCreateModel
+    : EntityCreateModel<Guid>, IHaveTenant<Guid>
 {
+    #region Generated Properties
+    /// <summary>
+    /// Gets or sets the property value for 'Title'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'Title'.
+    /// </value>
+    public string Title { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'Summary'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'Summary'.
+    /// </value>
+    public string Summary { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'Description'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'Description'.
+    /// </value>
+    public string Description { get; set; }
+
     /// <summary>
-    /// View Model class
+    /// Gets or sets the property value for 'TenantId'.
     /// </summary>
-    public class TopicCreateModel
-        : EntityCreateModel<Guid>, IHaveTenant<Guid>
-    {
-        #region Generated Properties
-        /// <summary>
-        /// Gets or sets the property value for 'Title'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Title'.
-        /// </value>
-        public string Title { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'Summary'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Summary'.
-        /// </value>
-        public string Summary { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'Description'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Description'.
-        /// </value>
-        public string Description { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'TenantId'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'TenantId'.
-        /// </value>
-        public Guid TenantId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'LeadInstructorId'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'LeadInstructorId'.
-        /// </value>
-        public Guid? LeadInstructorId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'LessonPlan'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'LessonPlan'.
-        /// </value>
-        public string LessonPlan { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'Notes'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Notes'.
-        /// </value>
-        public string Notes { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'IsRequired'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'IsRequired'.
-        /// </value>
-        public bool IsRequired { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'IsPublished'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'IsPublished'.
-        /// </value>
-        public bool IsPublished { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'InstructorSlots'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'InstructorSlots'.
-        /// </value>
-        public int? InstructorSlots { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'CalendarYear'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'CalendarYear'.
-        /// </value>
-        public short CalendarYear { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'TargetMonth'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'TargetMonth'.
-        /// </value>
-        public short? TargetMonth { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'PeriodStart'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'PeriodStart'.
-        /// </value>
-        public DateTime PeriodStart { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'PeriodEnd'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'PeriodEnd'.
-        /// </value>
-        public DateTime PeriodEnd { get; set; }
-
-        #endregion
-
-    }
+    /// <value>
+    /// The property value for 'TenantId'.
+    /// </value>
+    public Guid TenantId { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'LeadInstructorId'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'LeadInstructorId'.
+    /// </value>
+    public Guid? LeadInstructorId { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'LessonPlan'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'LessonPlan'.
+    /// </value>
+    public string LessonPlan { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'Notes'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'Notes'.
+    /// </value>
+    public string Notes { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'IsRequired'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'IsRequired'.
+    /// </value>
+    public bool IsRequired { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'IsPublished'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'IsPublished'.
+    /// </value>
+    public bool IsPublished { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'InstructorSlots'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'InstructorSlots'.
+    /// </value>
+    public int? InstructorSlots { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'CalendarYear'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'CalendarYear'.
+    /// </value>
+    public short CalendarYear { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'TargetMonth'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'TargetMonth'.
+    /// </value>
+    public short? TargetMonth { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'PeriodStart'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'PeriodStart'.
+    /// </value>
+    public DateTime PeriodStart { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'PeriodEnd'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'PeriodEnd'.
+    /// </value>
+    public DateTime PeriodEnd { get; set; }
+
+    #endregion
+
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Topic/Models/TopicDropdownModel.cs b/service/src/InstructorIQ.Core/Domain/Topic/Models/TopicDropdownModel.cs
index e5c34db2..ac4bb191 100644
--- a/service/src/InstructorIQ.Core/Domain/Topic/Models/TopicDropdownModel.cs
+++ b/service/src/InstructorIQ.Core/Domain/Topic/Models/TopicDropdownModel.cs
@@ -1,9 +1,8 @@
-using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.Rendering;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Models
+namespace InstructorIQ.Core.Domain.Models;
+
+public class TopicDropdownModel : SelectListItem
 {
-    public class TopicDropdownModel : SelectListItem
-    {
-    }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Topic/Models/TopicListModel.cs b/service/src/InstructorIQ.Core/Domain/Topic/Models/TopicListModel.cs
index ebda08a2..efa4230c 100644
--- a/service/src/InstructorIQ.Core/Domain/Topic/Models/TopicListModel.cs
+++ b/service/src/InstructorIQ.Core/Domain/Topic/Models/TopicListModel.cs
@@ -1,36 +1,36 @@
 using System;
+
 using MediatR.CommandQuery.Definitions;
 using MediatR.CommandQuery.Models;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Models
+namespace InstructorIQ.Core.Domain.Models;
+
+public class TopicListModel : EntityReadModel<Guid>, IHaveTenant<Guid>
 {
-    public class TopicListModel : EntityReadModel<Guid>, IHaveTenant<Guid>
-    {
-        public string Title { get; set; }
+    public string Title { get; set; }
 
-        public string Summary { get; set; }
+    public string Summary { get; set; }
 
-        public short CalendarYear { get; set; }
+    public short CalendarYear { get; set; }
 
-        public short? TargetMonth { get; set; }
+    public short? TargetMonth { get; set; }
 
-        public string TenantName { get; set; }
+    public string TenantName { get; set; }
 
-        public string LeadInstructorName { get; set; }
+    public string LeadInstructorName { get; set; }
 
-        public string LeadInstructorEmail { get; set; }
+    public string LeadInstructorEmail { get; set; }
 
-        public int SessionCount { get; set; }
+    public int SessionCount { get; set; }
 
 
-        public bool IsRequired { get; set; }
+    public bool IsRequired { get; set; }
 
-        public bool IsPublished { get; set; }
+    public bool IsPublished { get; set; }
 
 
-        public Guid TenantId { get; set; }
+    public Guid TenantId { get; set; }
 
-        public Guid? LeadInstructorId { get; set; }
-    }
-}
\ No newline at end of file
+    public Guid? LeadInstructorId { get; set; }
+}
diff --git a/service/src/InstructorIQ.Core/Domain/Topic/Models/TopicMultipleUpdateModel.cs b/service/src/InstructorIQ.Core/Domain/Topic/Models/TopicMultipleUpdateModel.cs
index 06cf3590..e7edede8 100644
--- a/service/src/InstructorIQ.Core/Domain/Topic/Models/TopicMultipleUpdateModel.cs
+++ b/service/src/InstructorIQ.Core/Domain/Topic/Models/TopicMultipleUpdateModel.cs
@@ -1,19 +1,19 @@
 using System;
+
 using MediatR.CommandQuery.Definitions;
 using MediatR.CommandQuery.Models;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Models
+namespace InstructorIQ.Core.Domain.Models;
+
+public class TopicMultipleUpdateModel
+    : EntityCreateModel<Guid>, IHaveTenant<Guid>
 {
-    public class TopicMultipleUpdateModel 
-        : EntityCreateModel<Guid>, IHaveTenant<Guid>
-    {
-        public Guid TenantId { get; set; }
+    public Guid TenantId { get; set; }
 
-        public string Title { get; set; }
+    public string Title { get; set; }
 
-        public short CalendarYear { get; set; }
+    public short CalendarYear { get; set; }
 
-        public short? TargetMonth { get; set; }
-    }
-}
\ No newline at end of file
+    public short? TargetMonth { get; set; }
+}
diff --git a/service/src/InstructorIQ.Core/Domain/Topic/Models/TopicReadModel.cs b/service/src/InstructorIQ.Core/Domain/Topic/Models/TopicReadModel.cs
index 6b99e670..aa31627b 100644
--- a/service/src/InstructorIQ.Core/Domain/Topic/Models/TopicReadModel.cs
+++ b/service/src/InstructorIQ.Core/Domain/Topic/Models/TopicReadModel.cs
@@ -1,137 +1,137 @@
 using System;
+
 using MediatR.CommandQuery.Definitions;
 using MediatR.CommandQuery.Models;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Models
+namespace InstructorIQ.Core.Domain.Models;
+
+/// <summary>
+/// View Model class
+/// </summary>
+public class TopicReadModel
+    : EntityReadModel<Guid>, IHaveTenant<Guid>, ITrackHistory
 {
+    #region Generated Properties
+    /// <summary>
+    /// Gets or sets the property value for 'Title'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'Title'.
+    /// </value>
+    public string Title { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'Summary'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'Summary'.
+    /// </value>
+    public string Summary { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'Description'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'Description'.
+    /// </value>
+    public string Description { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'TenantId'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'TenantId'.
+    /// </value>
+    public Guid TenantId { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'LeadInstructorId'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'LeadInstructorId'.
+    /// </value>
+    public Guid? LeadInstructorId { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'LessonPlan'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'LessonPlan'.
+    /// </value>
+    public string LessonPlan { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'Notes'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'Notes'.
+    /// </value>
+    public string Notes { get; set; }
+
     /// <summary>
-    /// View Model class
+    /// Gets or sets the property value for 'IsRequired'.
     /// </summary>
-    public class TopicReadModel
-        : EntityReadModel<Guid>, IHaveTenant<Guid>, ITrackHistory
-    {
-        #region Generated Properties
-        /// <summary>
-        /// Gets or sets the property value for 'Title'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Title'.
-        /// </value>
-        public string Title { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'Summary'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Summary'.
-        /// </value>
-        public string Summary { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'Description'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Description'.
-        /// </value>
-        public string Description { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'TenantId'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'TenantId'.
-        /// </value>
-        public Guid TenantId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'LeadInstructorId'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'LeadInstructorId'.
-        /// </value>
-        public Guid? LeadInstructorId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'LessonPlan'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'LessonPlan'.
-        /// </value>
-        public string LessonPlan { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'Notes'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Notes'.
-        /// </value>
-        public string Notes { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'IsRequired'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'IsRequired'.
-        /// </value>
-        public bool IsRequired { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'IsPublished'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'IsPublished'.
-        /// </value>
-        public bool IsPublished { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'InstructorSlots'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'InstructorSlots'.
-        /// </value>
-        public int? InstructorSlots { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'CalendarYear'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'CalendarYear'.
-        /// </value>
-        public short CalendarYear { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'TargetMonth'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'TargetMonth'.
-        /// </value>
-        public short? TargetMonth { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'PeriodStart'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'PeriodStart'.
-        /// </value>
-        public DateTime PeriodStart { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'PeriodEnd'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'PeriodEnd'.
-        /// </value>
-        public DateTime PeriodEnd { get; set; }
-
-        #endregion
-
-        public string TenantName { get; set; }
-
-        public string LeadInstructorName { get; set; }
-
-        public string LeadInstructorEmail { get; set; }
-
-        public int SessionCount { get; set; }
-    }
+    /// <value>
+    /// The property value for 'IsRequired'.
+    /// </value>
+    public bool IsRequired { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'IsPublished'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'IsPublished'.
+    /// </value>
+    public bool IsPublished { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'InstructorSlots'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'InstructorSlots'.
+    /// </value>
+    public int? InstructorSlots { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'CalendarYear'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'CalendarYear'.
+    /// </value>
+    public short CalendarYear { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'TargetMonth'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'TargetMonth'.
+    /// </value>
+    public short? TargetMonth { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'PeriodStart'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'PeriodStart'.
+    /// </value>
+    public DateTime PeriodStart { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'PeriodEnd'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'PeriodEnd'.
+    /// </value>
+    public DateTime PeriodEnd { get; set; }
+
+    #endregion
+
+    public string TenantName { get; set; }
+
+    public string LeadInstructorName { get; set; }
+
+    public string LeadInstructorEmail { get; set; }
+
+    public int SessionCount { get; set; }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Topic/Models/TopicUpdateModel.cs b/service/src/InstructorIQ.Core/Domain/Topic/Models/TopicUpdateModel.cs
index 54f7c7ba..393a6a25 100644
--- a/service/src/InstructorIQ.Core/Domain/Topic/Models/TopicUpdateModel.cs
+++ b/service/src/InstructorIQ.Core/Domain/Topic/Models/TopicUpdateModel.cs
@@ -1,130 +1,130 @@
 using System;
+
 using MediatR.CommandQuery.Definitions;
 using MediatR.CommandQuery.Models;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Models
+namespace InstructorIQ.Core.Domain.Models;
+
+/// <summary>
+/// View Model class
+/// </summary>
+public class TopicUpdateModel
+    : EntityUpdateModel, IHaveTenant<Guid>
 {
+    #region Generated Properties
+    /// <summary>
+    /// Gets or sets the property value for 'Title'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'Title'.
+    /// </value>
+    public string Title { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'Summary'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'Summary'.
+    /// </value>
+    public string Summary { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'Description'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'Description'.
+    /// </value>
+    public string Description { get; set; }
+
     /// <summary>
-    /// View Model class
+    /// Gets or sets the property value for 'TenantId'.
     /// </summary>
-    public class TopicUpdateModel
-        : EntityUpdateModel, IHaveTenant<Guid>
-    {
-        #region Generated Properties
-        /// <summary>
-        /// Gets or sets the property value for 'Title'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Title'.
-        /// </value>
-        public string Title { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'Summary'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Summary'.
-        /// </value>
-        public string Summary { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'Description'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Description'.
-        /// </value>
-        public string Description { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'TenantId'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'TenantId'.
-        /// </value>
-        public Guid TenantId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'LeadInstructorId'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'LeadInstructorId'.
-        /// </value>
-        public Guid? LeadInstructorId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'LessonPlan'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'LessonPlan'.
-        /// </value>
-        public string LessonPlan { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'Notes'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'Notes'.
-        /// </value>
-        public string Notes { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'IsRequired'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'IsRequired'.
-        /// </value>
-        public bool IsRequired { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'IsPublished'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'IsPublished'.
-        /// </value>
-        public bool IsPublished { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'InstructorSlots'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'InstructorSlots'.
-        /// </value>
-        public int? InstructorSlots { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'CalendarYear'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'CalendarYear'.
-        /// </value>
-        public short CalendarYear { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'TargetMonth'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'TargetMonth'.
-        /// </value>
-        public short? TargetMonth { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'PeriodStart'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'PeriodStart'.
-        /// </value>
-        public DateTime PeriodStart { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'PeriodEnd'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'PeriodEnd'.
-        /// </value>
-        public DateTime PeriodEnd { get; set; }
-
-        #endregion
-
-    }
+    /// <value>
+    /// The property value for 'TenantId'.
+    /// </value>
+    public Guid TenantId { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'LeadInstructorId'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'LeadInstructorId'.
+    /// </value>
+    public Guid? LeadInstructorId { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'LessonPlan'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'LessonPlan'.
+    /// </value>
+    public string LessonPlan { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'Notes'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'Notes'.
+    /// </value>
+    public string Notes { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'IsRequired'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'IsRequired'.
+    /// </value>
+    public bool IsRequired { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'IsPublished'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'IsPublished'.
+    /// </value>
+    public bool IsPublished { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'InstructorSlots'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'InstructorSlots'.
+    /// </value>
+    public int? InstructorSlots { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'CalendarYear'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'CalendarYear'.
+    /// </value>
+    public short CalendarYear { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'TargetMonth'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'TargetMonth'.
+    /// </value>
+    public short? TargetMonth { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'PeriodStart'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'PeriodStart'.
+    /// </value>
+    public DateTime PeriodStart { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'PeriodEnd'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'PeriodEnd'.
+    /// </value>
+    public DateTime PeriodEnd { get; set; }
+
+    #endregion
+
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Topic/Queries/TopicHistoryQuery.cs b/service/src/InstructorIQ.Core/Domain/Topic/Queries/TopicHistoryQuery.cs
index b4c38934..445855bc 100644
--- a/service/src/InstructorIQ.Core/Domain/Topic/Queries/TopicHistoryQuery.cs
+++ b/service/src/InstructorIQ.Core/Domain/Topic/Queries/TopicHistoryQuery.cs
@@ -1,17 +1,17 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Security.Principal;
+
 using MediatR.CommandQuery.Audit;
 using MediatR.CommandQuery.Queries;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Queries
+namespace InstructorIQ.Core.Domain.Queries;
+
+public class TopicHistoryQuery : EntityIdentifierQuery<Guid, IReadOnlyCollection<AuditRecord<Guid>>>
 {
-    public class TopicHistoryQuery : EntityIdentifierQuery<Guid, IReadOnlyCollection<AuditRecord<Guid>>>
+    public TopicHistoryQuery(IPrincipal principal, Guid id) : base(principal, id)
     {
-        public TopicHistoryQuery(IPrincipal principal, Guid id) : base(principal, id)
-        {
 
-        }
     }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Topic/TopicServiceRegistration.cs b/service/src/InstructorIQ.Core/Domain/Topic/TopicServiceRegistration.cs
index 7ba5396c..66f6503c 100644
--- a/service/src/InstructorIQ.Core/Domain/Topic/TopicServiceRegistration.cs
+++ b/service/src/InstructorIQ.Core/Domain/Topic/TopicServiceRegistration.cs
@@ -17,24 +17,23 @@
 using Microsoft.Extensions.DependencyInjection.Extensions;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain
+namespace InstructorIQ.Core.Domain;
+
+public class TopicServiceRegistration : DomainServiceRegistrationBase
 {
-    public class TopicServiceRegistration : DomainServiceRegistrationBase
-    {
 
-        [RegisterServices]
-        public override void Register(IServiceCollection services)
-        {
-            RegisterEntityQuery<Guid, Topic, TopicReadModel>(services);
-            RegisterEntityQuery<Guid, Topic, TopicListModel>(services);
-            RegisterEntityCommand<Guid, Topic, TopicReadModel, TopicCreateModel, TopicUpdateModel>(services);
+    [RegisterServices]
+    public override void Register(IServiceCollection services)
+    {
+        RegisterEntityQuery<Guid, Topic, TopicReadModel>(services);
+        RegisterEntityQuery<Guid, Topic, TopicListModel>(services);
+        RegisterEntityCommand<Guid, Topic, TopicReadModel, TopicCreateModel, TopicUpdateModel>(services);
 
-            RegisterEntityQuery<Guid, Topic, TopicMultipleUpdateModel>(services);
-            RegisterEntityQuery<Guid, Topic, TopicDropdownModel>(services);
+        RegisterEntityQuery<Guid, Topic, TopicMultipleUpdateModel>(services);
+        RegisterEntityQuery<Guid, Topic, TopicDropdownModel>(services);
 
-            services.TryAddTransient<IRequestHandler<TopicHistoryQuery, IReadOnlyCollection<AuditRecord<Guid>>>, TopicHistoryQueryHandler>();
-            services.TryAddTransient<IRequestHandler<TopicMultipleUpdateCommand, CompleteModel>, TopicMultipleUpdateCommandHandler>();
+        services.TryAddTransient<IRequestHandler<TopicHistoryQuery, IReadOnlyCollection<AuditRecord<Guid>>>, TopicHistoryQueryHandler>();
+        services.TryAddTransient<IRequestHandler<TopicMultipleUpdateCommand, CompleteModel>, TopicMultipleUpdateCommandHandler>();
 
-        }
     }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Topic/Validation/TopicCreateModelValidator.cs b/service/src/InstructorIQ.Core/Domain/Topic/Validation/TopicCreateModelValidator.cs
index 29ff56d0..0c4e12e3 100644
--- a/service/src/InstructorIQ.Core/Domain/Topic/Validation/TopicCreateModelValidator.cs
+++ b/service/src/InstructorIQ.Core/Domain/Topic/Validation/TopicCreateModelValidator.cs
@@ -1,27 +1,28 @@
 using System;
+
 using FluentValidation;
+
 using InstructorIQ.Core.Domain.Models;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Validation
+namespace InstructorIQ.Core.Domain.Validation;
+
+/// <summary>
+/// Validator class for <see cref="TopicCreateModel"/> .
+/// </summary>
+public class TopicCreateModelValidator
+    : AbstractValidator<TopicCreateModel>
 {
     /// <summary>
-    /// Validator class for <see cref="TopicCreateModel"/> .
+    /// Initializes a new instance of the <see cref="TopicCreateModelValidator"/> class.
     /// </summary>
-    public class TopicCreateModelValidator
-        : AbstractValidator<TopicCreateModel>
+    public TopicCreateModelValidator()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TopicCreateModelValidator"/> class.
-        /// </summary>
-        public TopicCreateModelValidator()
-        {
-            #region Generated Constructor
-            RuleFor(p => p.Title).NotEmpty();
-            RuleFor(p => p.Title).MaximumLength(256);
-            RuleFor(p => p.Summary).MaximumLength(256);
-            #endregion
-        }
-
+        #region Generated Constructor
+        RuleFor(p => p.Title).NotEmpty();
+        RuleFor(p => p.Title).MaximumLength(256);
+        RuleFor(p => p.Summary).MaximumLength(256);
+        #endregion
     }
+
 }
diff --git a/service/src/InstructorIQ.Core/Domain/Topic/Validation/TopicUpdateModelValidator.cs b/service/src/InstructorIQ.Core/Domain/Topic/Validation/TopicUpdateModelValidator.cs
index b56557c4..7908380f 100644
--- a/service/src/InstructorIQ.Core/Domain/Topic/Validation/TopicUpdateModelValidator.cs
+++ b/service/src/InstructorIQ.Core/Domain/Topic/Validation/TopicUpdateModelValidator.cs
@@ -1,27 +1,28 @@
 using System;
+
 using FluentValidation;
+
 using InstructorIQ.Core.Domain.Models;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain.Validation
+namespace InstructorIQ.Core.Domain.Validation;
+
+/// <summary>
+/// Validator class for <see cref="TopicUpdateModel"/> .
+/// </summary>
+public class TopicUpdateModelValidator
+    : AbstractValidator<TopicUpdateModel>
 {
     /// <summary>
-    /// Validator class for <see cref="TopicUpdateModel"/> .
+    /// Initializes a new instance of the <see cref="TopicUpdateModelValidator"/> class.
     /// </summary>
-    public class TopicUpdateModelValidator
-        : AbstractValidator<TopicUpdateModel>
+    public TopicUpdateModelValidator()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TopicUpdateModelValidator"/> class.
-        /// </summary>
-        public TopicUpdateModelValidator()
-        {
-            #region Generated Constructor
-            RuleFor(p => p.Title).NotEmpty();
-            RuleFor(p => p.Title).MaximumLength(256);
-            RuleFor(p => p.Summary).MaximumLength(256);
-            #endregion
-        }
-
+        #region Generated Constructor
+        RuleFor(p => p.Title).NotEmpty();
+        RuleFor(p => p.Title).MaximumLength(256);
+        RuleFor(p => p.Summary).MaximumLength(256);
+        #endregion
     }
+
 }
diff --git a/service/src/InstructorIQ.Core/Domain/TopicInstructor/Commands/TopicInstructorSignUpCommand.cs b/service/src/InstructorIQ.Core/Domain/TopicInstructor/Commands/TopicInstructorSignUpCommand.cs
index c655ff6a..5e016731 100644
--- a/service/src/InstructorIQ.Core/Domain/TopicInstructor/Commands/TopicInstructorSignUpCommand.cs
+++ b/service/src/InstructorIQ.Core/Domain/TopicInstructor/Commands/TopicInstructorSignUpCommand.cs
@@ -1,22 +1,22 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Security.Principal;
+
 using MediatR.CommandQuery.Commands;
 using MediatR.CommandQuery.Models;
 
-namespace InstructorIQ.Core.Domain.Commands
+namespace InstructorIQ.Core.Domain.Commands;
+
+public class TopicInstructorSignUpCommand : PrincipalCommandBase<CompleteModel>
 {
-    public class TopicInstructorSignUpCommand : PrincipalCommandBase<CompleteModel>
+    public TopicInstructorSignUpCommand(IPrincipal principal, Guid instructorId, IEnumerable<Guid> topics) : base(principal)
     {
-        public TopicInstructorSignUpCommand(IPrincipal principal, Guid instructorId, IEnumerable<Guid> topics) : base(principal)
-        {
-            InstructorId = instructorId;
-            Topics = topics.ToList();
-        }
+        InstructorId = instructorId;
+        Topics = topics.ToList();
+    }
 
-        public Guid InstructorId { get; }
+    public Guid InstructorId { get; }
 
-        public List<Guid> Topics { get; }
-    }
+    public List<Guid> Topics { get; }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/TopicInstructor/Handlers/TopicInstructorSignUpHandler.cs b/service/src/InstructorIQ.Core/Domain/TopicInstructor/Handlers/TopicInstructorSignUpHandler.cs
index 4e4a12a5..f633cc2e 100644
--- a/service/src/InstructorIQ.Core/Domain/TopicInstructor/Handlers/TopicInstructorSignUpHandler.cs
+++ b/service/src/InstructorIQ.Core/Domain/TopicInstructor/Handlers/TopicInstructorSignUpHandler.cs
@@ -1,71 +1,74 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+
 using AutoMapper;
+
 using InstructorIQ.Core.Data;
 using InstructorIQ.Core.Data.Entities;
 using InstructorIQ.Core.Domain.Commands;
+
 using MediatR.CommandQuery.EntityFrameworkCore.Handlers;
 using MediatR.CommandQuery.Models;
+
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 
-namespace InstructorIQ.Core.Domain.Handlers
+namespace InstructorIQ.Core.Domain.Handlers;
+
+public class TopicInstructorSignUpHandler : DataContextHandlerBase<InstructorIQContext, TopicInstructorSignUpCommand, CompleteModel>
 {
-    public class TopicInstructorSignUpHandler : DataContextHandlerBase<InstructorIQContext, TopicInstructorSignUpCommand, CompleteModel>
+    public TopicInstructorSignUpHandler(ILoggerFactory loggerFactory, InstructorIQContext dataContext, IMapper mapper)
+        : base(loggerFactory, dataContext, mapper)
     {
-        public TopicInstructorSignUpHandler(ILoggerFactory loggerFactory, InstructorIQContext dataContext, IMapper mapper)
-            : base(loggerFactory, dataContext, mapper)
-        {
-        }
+    }
 
-        protected override async Task<CompleteModel> Process(TopicInstructorSignUpCommand request, CancellationToken cancellationToken)
-        {
+    protected override async Task<CompleteModel> Process(TopicInstructorSignUpCommand request, CancellationToken cancellationToken)
+    {
 
-            var identityName = request.Principal?.Identity?.Name;
+        var identityName = request.Principal?.Identity?.Name;
 
-            var existingTopics = await DataContext.TopicInstructors
-                .Where(s => s.InstructorId == request.InstructorId)
-                .ToListAsync(cancellationToken);
+        var existingTopics = await DataContext.TopicInstructors
+            .Where(s => s.InstructorId == request.InstructorId)
+            .ToListAsync(cancellationToken);
 
-            var selectedTopicIds = request.Topics ?? new List<Guid>();
+        var selectedTopicIds = request.Topics ?? new List<Guid>();
 
-            AddInstructorTopics(existingTopics, selectedTopicIds, request.InstructorId, identityName);
+        AddInstructorTopics(existingTopics, selectedTopicIds, request.InstructorId, identityName);
 
-            await DataContext.SaveChangesAsync(cancellationToken);
+        await DataContext.SaveChangesAsync(cancellationToken);
 
-            return new CompleteModel();
-        }
+        return new CompleteModel();
+    }
 
-        private void AddInstructorTopics(List<TopicInstructor> existingTopics, List<Guid> selectedTopicIds, Guid instructorId, string username)
-        {
-            var existingTopicIds = existingTopics
-                .Select(i => i.TopicId)
-                .ToList();
+    private void AddInstructorTopics(List<TopicInstructor> existingTopics, List<Guid> selectedTopicIds, Guid instructorId, string username)
+    {
+        var existingTopicIds = existingTopics
+            .Select(i => i.TopicId)
+            .ToList();
 
-            var insertTopicIds = selectedTopicIds
-                .Except(existingTopicIds)
-                .ToList();
+        var insertTopicIds = selectedTopicIds
+            .Except(existingTopicIds)
+            .ToList();
 
-            if (insertTopicIds.Count == 0)
-                return;
+        if (insertTopicIds.Count == 0)
+            return;
 
-            foreach (var topicId in insertTopicIds)
+        foreach (var topicId in insertTopicIds)
+        {
+            var topicInstructor = new TopicInstructor
             {
-                var topicInstructor = new TopicInstructor
-                {
-                    TopicId = topicId,
-                    InstructorId = instructorId,
-                    Created = DateTimeOffset.UtcNow,
-                    CreatedBy = username,
-                    Updated = DateTimeOffset.UtcNow,
-                    UpdatedBy = username
-                };
-
-                DataContext.TopicInstructors.Add(topicInstructor);
-            }
+                TopicId = topicId,
+                InstructorId = instructorId,
+                Created = DateTimeOffset.UtcNow,
+                CreatedBy = username,
+                Updated = DateTimeOffset.UtcNow,
+                UpdatedBy = username
+            };
+
+            DataContext.TopicInstructors.Add(topicInstructor);
         }
     }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/TopicInstructor/Mapping/TopicInstructorProfile.cs b/service/src/InstructorIQ.Core/Domain/TopicInstructor/Mapping/TopicInstructorProfile.cs
index 7268be5a..e1f6a5a2 100644
--- a/service/src/InstructorIQ.Core/Domain/TopicInstructor/Mapping/TopicInstructorProfile.cs
+++ b/service/src/InstructorIQ.Core/Domain/TopicInstructor/Mapping/TopicInstructorProfile.cs
@@ -1,32 +1,33 @@
 using System;
+
 using AutoMapper;
+
 using InstructorIQ.Core.Data.Entities;
 using InstructorIQ.Core.Domain.Models;
 
-namespace InstructorIQ.Core.Domain.Mapping
+namespace InstructorIQ.Core.Domain.Mapping;
+
+/// <summary>
+/// Mapper class for entity <see cref="TopicInstructor"/> .
+/// </summary>
+public partial class TopicInstructorProfile
+    : Profile
 {
     /// <summary>
-    /// Mapper class for entity <see cref="TopicInstructor"/> .
+    /// Initializes a new instance of the <see cref="TopicInstructorProfile"/> class.
     /// </summary>
-    public partial class TopicInstructorProfile
-        : Profile
+    public TopicInstructorProfile()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TopicInstructorProfile"/> class.
-        /// </summary>
-        public TopicInstructorProfile()
-        {
-            CreateMap<InstructorIQ.Core.Data.Entities.TopicInstructor, InstructorIQ.Core.Domain.Models.TopicInstructorReadModel>();
+        CreateMap<InstructorIQ.Core.Data.Entities.TopicInstructor, InstructorIQ.Core.Domain.Models.TopicInstructorReadModel>();
 
-            CreateMap<InstructorIQ.Core.Domain.Models.TopicInstructorCreateModel, InstructorIQ.Core.Data.Entities.TopicInstructor>();
+        CreateMap<InstructorIQ.Core.Domain.Models.TopicInstructorCreateModel, InstructorIQ.Core.Data.Entities.TopicInstructor>();
 
-            CreateMap<InstructorIQ.Core.Data.Entities.TopicInstructor, InstructorIQ.Core.Domain.Models.TopicInstructorUpdateModel>();
+        CreateMap<InstructorIQ.Core.Data.Entities.TopicInstructor, InstructorIQ.Core.Domain.Models.TopicInstructorUpdateModel>();
 
-            CreateMap<InstructorIQ.Core.Domain.Models.TopicInstructorUpdateModel, InstructorIQ.Core.Data.Entities.TopicInstructor>();
+        CreateMap<InstructorIQ.Core.Domain.Models.TopicInstructorUpdateModel, InstructorIQ.Core.Data.Entities.TopicInstructor>();
 
-            CreateMap<InstructorIQ.Core.Domain.Models.TopicInstructorReadModel, InstructorIQ.Core.Domain.Models.TopicInstructorUpdateModel>();
-
-        }
+        CreateMap<InstructorIQ.Core.Domain.Models.TopicInstructorReadModel, InstructorIQ.Core.Domain.Models.TopicInstructorUpdateModel>();
 
     }
+
 }
diff --git a/service/src/InstructorIQ.Core/Domain/TopicInstructor/Models/TopicInstructorCreateModel.cs b/service/src/InstructorIQ.Core/Domain/TopicInstructor/Models/TopicInstructorCreateModel.cs
index 12328bbb..9dbb9784 100644
--- a/service/src/InstructorIQ.Core/Domain/TopicInstructor/Models/TopicInstructorCreateModel.cs
+++ b/service/src/InstructorIQ.Core/Domain/TopicInstructor/Models/TopicInstructorCreateModel.cs
@@ -1,57 +1,57 @@
 using System;
 using System.Collections.Generic;
+
 using MediatR.CommandQuery.Models;
 
-namespace InstructorIQ.Core.Domain.Models
+namespace InstructorIQ.Core.Domain.Models;
+
+/// <summary>
+/// View Model class
+/// </summary>
+public partial class TopicInstructorCreateModel
+    : EntityCreateModel<Guid>
 {
+    #region Generated Properties
+    /// <summary>
+    /// Gets or sets the property value for 'TopicId'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'TopicId'.
+    /// </value>
+    public Guid TopicId { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'InstructorId'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'InstructorId'.
+    /// </value>
+    public Guid InstructorId { get; set; }
+
     /// <summary>
-    /// View Model class
+    /// Gets or sets the property value for 'InstructorRoleId'.
     /// </summary>
-    public partial class TopicInstructorCreateModel
-        : EntityCreateModel<Guid>
-    {
-        #region Generated Properties
-        /// <summary>
-        /// Gets or sets the property value for 'TopicId'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'TopicId'.
-        /// </value>
-        public Guid TopicId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'InstructorId'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'InstructorId'.
-        /// </value>
-        public Guid InstructorId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'InstructorRoleId'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'InstructorRoleId'.
-        /// </value>
-        public Guid? InstructorRoleId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'PeriodStart'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'PeriodStart'.
-        /// </value>
-        public DateTime PeriodStart { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'PeriodEnd'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'PeriodEnd'.
-        /// </value>
-        public DateTime PeriodEnd { get; set; }
-
-        #endregion
-
-    }
+    /// <value>
+    /// The property value for 'InstructorRoleId'.
+    /// </value>
+    public Guid? InstructorRoleId { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'PeriodStart'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'PeriodStart'.
+    /// </value>
+    public DateTime PeriodStart { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'PeriodEnd'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'PeriodEnd'.
+    /// </value>
+    public DateTime PeriodEnd { get; set; }
+
+    #endregion
+
 }
diff --git a/service/src/InstructorIQ.Core/Domain/TopicInstructor/Models/TopicInstructorReadModel.cs b/service/src/InstructorIQ.Core/Domain/TopicInstructor/Models/TopicInstructorReadModel.cs
index 112f8e6b..e4d487a6 100644
--- a/service/src/InstructorIQ.Core/Domain/TopicInstructor/Models/TopicInstructorReadModel.cs
+++ b/service/src/InstructorIQ.Core/Domain/TopicInstructor/Models/TopicInstructorReadModel.cs
@@ -1,68 +1,68 @@
 using System;
 using System.Collections.Generic;
+
 using MediatR.CommandQuery.Models;
 
-namespace InstructorIQ.Core.Domain.Models
+namespace InstructorIQ.Core.Domain.Models;
+
+/// <summary>
+/// View Model class
+/// </summary>
+public partial class TopicInstructorReadModel
+    : EntityReadModel<Guid>
 {
+    #region Generated Properties
     /// <summary>
-    /// View Model class
+    /// Gets or sets the property value for 'TopicId'.
     /// </summary>
-    public partial class TopicInstructorReadModel
-        : EntityReadModel<Guid>
-    {
-        #region Generated Properties
-        /// <summary>
-        /// Gets or sets the property value for 'TopicId'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'TopicId'.
-        /// </value>
-        public Guid TopicId { get; set; }
+    /// <value>
+    /// The property value for 'TopicId'.
+    /// </value>
+    public Guid TopicId { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'InstructorId'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'InstructorId'.
-        /// </value>
-        public Guid InstructorId { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'InstructorId'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'InstructorId'.
+    /// </value>
+    public Guid InstructorId { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'InstructorRoleId'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'InstructorRoleId'.
-        /// </value>
-        public Guid? InstructorRoleId { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'InstructorRoleId'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'InstructorRoleId'.
+    /// </value>
+    public Guid? InstructorRoleId { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'PeriodStart'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'PeriodStart'.
-        /// </value>
-        public DateTime PeriodStart { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'PeriodStart'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'PeriodStart'.
+    /// </value>
+    public DateTime PeriodStart { get; set; }
 
-        /// <summary>
-        /// Gets or sets the property value for 'PeriodEnd'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'PeriodEnd'.
-        /// </value>
-        public DateTime PeriodEnd { get; set; }
+    /// <summary>
+    /// Gets or sets the property value for 'PeriodEnd'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'PeriodEnd'.
+    /// </value>
+    public DateTime PeriodEnd { get; set; }
 
-        #endregion
+    #endregion
 
-        public string InstructorGivenName { get; set; }
+    public string InstructorGivenName { get; set; }
 
-        public string InstructorFamilyName { get; set; }
+    public string InstructorFamilyName { get; set; }
 
-        public string InstructorDisplayName { get; set; }
+    public string InstructorDisplayName { get; set; }
 
-        public string InstructorSortName { get; set; }
+    public string InstructorSortName { get; set; }
 
-        public string InstructorEmailAddress { get; set; }
+    public string InstructorEmailAddress { get; set; }
 
 
-    }
 }
diff --git a/service/src/InstructorIQ.Core/Domain/TopicInstructor/Models/TopicInstructorUpdateModel.cs b/service/src/InstructorIQ.Core/Domain/TopicInstructor/Models/TopicInstructorUpdateModel.cs
index 470fc1ad..fd3d561e 100644
--- a/service/src/InstructorIQ.Core/Domain/TopicInstructor/Models/TopicInstructorUpdateModel.cs
+++ b/service/src/InstructorIQ.Core/Domain/TopicInstructor/Models/TopicInstructorUpdateModel.cs
@@ -1,57 +1,57 @@
 using System;
 using System.Collections.Generic;
+
 using MediatR.CommandQuery.Models;
 
-namespace InstructorIQ.Core.Domain.Models
+namespace InstructorIQ.Core.Domain.Models;
+
+/// <summary>
+/// View Model class
+/// </summary>
+public partial class TopicInstructorUpdateModel
+    : EntityUpdateModel
 {
+    #region Generated Properties
+    /// <summary>
+    /// Gets or sets the property value for 'TopicId'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'TopicId'.
+    /// </value>
+    public Guid TopicId { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'InstructorId'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'InstructorId'.
+    /// </value>
+    public Guid InstructorId { get; set; }
+
     /// <summary>
-    /// View Model class
+    /// Gets or sets the property value for 'InstructorRoleId'.
     /// </summary>
-    public partial class TopicInstructorUpdateModel
-        : EntityUpdateModel
-    {
-        #region Generated Properties
-        /// <summary>
-        /// Gets or sets the property value for 'TopicId'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'TopicId'.
-        /// </value>
-        public Guid TopicId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'InstructorId'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'InstructorId'.
-        /// </value>
-        public Guid InstructorId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'InstructorRoleId'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'InstructorRoleId'.
-        /// </value>
-        public Guid? InstructorRoleId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'PeriodStart'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'PeriodStart'.
-        /// </value>
-        public DateTime PeriodStart { get; set; }
-
-        /// <summary>
-        /// Gets or sets the property value for 'PeriodEnd'.
-        /// </summary>
-        /// <value>
-        /// The property value for 'PeriodEnd'.
-        /// </value>
-        public DateTime PeriodEnd { get; set; }
-
-        #endregion
-
-    }
+    /// <value>
+    /// The property value for 'InstructorRoleId'.
+    /// </value>
+    public Guid? InstructorRoleId { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'PeriodStart'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'PeriodStart'.
+    /// </value>
+    public DateTime PeriodStart { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property value for 'PeriodEnd'.
+    /// </summary>
+    /// <value>
+    /// The property value for 'PeriodEnd'.
+    /// </value>
+    public DateTime PeriodEnd { get; set; }
+
+    #endregion
+
 }
diff --git a/service/src/InstructorIQ.Core/Domain/TopicInstructor/TopicInstructorServiceRegistration.cs b/service/src/InstructorIQ.Core/Domain/TopicInstructor/TopicInstructorServiceRegistration.cs
index 5bdc7b8d..5b88c0c1 100644
--- a/service/src/InstructorIQ.Core/Domain/TopicInstructor/TopicInstructorServiceRegistration.cs
+++ b/service/src/InstructorIQ.Core/Domain/TopicInstructor/TopicInstructorServiceRegistration.cs
@@ -13,20 +13,19 @@
 using Microsoft.Extensions.DependencyInjection.Extensions;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Domain
-{
-    public class TopicInstructorServiceRegistration : DomainServiceRegistrationBase
-    {
+namespace InstructorIQ.Core.Domain;
 
-        [RegisterServices]
-        public override void Register(IServiceCollection services)
-        {
-            RegisterEntityQuery<Guid, Data.Entities.TopicInstructor, TopicInstructorReadModel>(services);
+public class TopicInstructorServiceRegistration : DomainServiceRegistrationBase
+{
 
-            RegisterEntityCommand<Guid, Data.Entities.TopicInstructor, TopicInstructorReadModel, TopicInstructorCreateModel, TopicInstructorUpdateModel>(services);
+    [RegisterServices]
+    public override void Register(IServiceCollection services)
+    {
+        RegisterEntityQuery<Guid, Data.Entities.TopicInstructor, TopicInstructorReadModel>(services);
 
-            services.TryAddTransient<IRequestHandler<TopicInstructorSignUpCommand, CompleteModel>, TopicInstructorSignUpHandler>();
-        }
+        RegisterEntityCommand<Guid, Data.Entities.TopicInstructor, TopicInstructorReadModel, TopicInstructorCreateModel, TopicInstructorUpdateModel>(services);
 
+        services.TryAddTransient<IRequestHandler<TopicInstructorSignUpCommand, CompleteModel>, TopicInstructorSignUpHandler>();
     }
+
 }
diff --git a/service/src/InstructorIQ.Core/Domain/TopicInstructor/Validation/TopicInstructorCreateModelValidator.cs b/service/src/InstructorIQ.Core/Domain/TopicInstructor/Validation/TopicInstructorCreateModelValidator.cs
index bfb5de70..1cf8d2cd 100644
--- a/service/src/InstructorIQ.Core/Domain/TopicInstructor/Validation/TopicInstructorCreateModelValidator.cs
+++ b/service/src/InstructorIQ.Core/Domain/TopicInstructor/Validation/TopicInstructorCreateModelValidator.cs
@@ -1,23 +1,24 @@
 using System;
+
 using FluentValidation;
+
 using InstructorIQ.Core.Domain.Models;
 
-namespace InstructorIQ.Core.Domain.Validation
+namespace InstructorIQ.Core.Domain.Validation;
+
+/// <summary>
+/// Validator class for <see cref="TopicInstructorCreateModel"/> .
+/// </summary>
+public partial class TopicInstructorCreateModelValidator
+    : AbstractValidator<TopicInstructorCreateModel>
 {
     /// <summary>
-    /// Validator class for <see cref="TopicInstructorCreateModel"/> .
+    /// Initializes a new instance of the <see cref="TopicInstructorCreateModelValidator"/> class.
     /// </summary>
-    public partial class TopicInstructorCreateModelValidator
-        : AbstractValidator<TopicInstructorCreateModel>
+    public TopicInstructorCreateModelValidator()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TopicInstructorCreateModelValidator"/> class.
-        /// </summary>
-        public TopicInstructorCreateModelValidator()
-        {
-            #region Generated Constructor
-            #endregion
-        }
-
+        #region Generated Constructor
+        #endregion
     }
+
 }
diff --git a/service/src/InstructorIQ.Core/Domain/TopicInstructor/Validation/TopicInstructorUpdateModelValidator.cs b/service/src/InstructorIQ.Core/Domain/TopicInstructor/Validation/TopicInstructorUpdateModelValidator.cs
index 8437bbf7..847ad77f 100644
--- a/service/src/InstructorIQ.Core/Domain/TopicInstructor/Validation/TopicInstructorUpdateModelValidator.cs
+++ b/service/src/InstructorIQ.Core/Domain/TopicInstructor/Validation/TopicInstructorUpdateModelValidator.cs
@@ -1,23 +1,24 @@
 using System;
+
 using FluentValidation;
+
 using InstructorIQ.Core.Domain.Models;
 
-namespace InstructorIQ.Core.Domain.Validation
+namespace InstructorIQ.Core.Domain.Validation;
+
+/// <summary>
+/// Validator class for <see cref="TopicInstructorUpdateModel"/> .
+/// </summary>
+public partial class TopicInstructorUpdateModelValidator
+    : AbstractValidator<TopicInstructorUpdateModel>
 {
     /// <summary>
-    /// Validator class for <see cref="TopicInstructorUpdateModel"/> .
+    /// Initializes a new instance of the <see cref="TopicInstructorUpdateModelValidator"/> class.
     /// </summary>
-    public partial class TopicInstructorUpdateModelValidator
-        : AbstractValidator<TopicInstructorUpdateModel>
+    public TopicInstructorUpdateModelValidator()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TopicInstructorUpdateModelValidator"/> class.
-        /// </summary>
-        public TopicInstructorUpdateModelValidator()
-        {
-            #region Generated Constructor
-            #endregion
-        }
-
+        #region Generated Constructor
+        #endregion
     }
+
 }
diff --git a/service/src/InstructorIQ.Core/Extensions/DateTimeExtensions.cs b/service/src/InstructorIQ.Core/Extensions/DateTimeExtensions.cs
index 6f6792b8..da49e977 100644
--- a/service/src/InstructorIQ.Core/Extensions/DateTimeExtensions.cs
+++ b/service/src/InstructorIQ.Core/Extensions/DateTimeExtensions.cs
@@ -1,37 +1,36 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Text;
 
-namespace InstructorIQ.Core.Extensions
+namespace InstructorIQ.Core.Extensions;
+
+public static class DateTimeExtensions
 {
-    public static class DateTimeExtensions
+    public static int GetWeekOfYear(this DateTime dateTime)
     {
-        public static int GetWeekOfYear(this DateTime dateTime)
-        {
-            var formatInfo = DateTimeFormatInfo.CurrentInfo;
-            return GetWeekOfYear(dateTime, formatInfo);
-        }
+        var formatInfo = DateTimeFormatInfo.CurrentInfo;
+        return GetWeekOfYear(dateTime, formatInfo);
+    }
 
-        public static int GetWeekOfYear(this DateTime dateTime, DateTimeFormatInfo formatInfo)
-        {
-            var calendar = formatInfo.Calendar;
-            return calendar.GetWeekOfYear(dateTime, formatInfo.CalendarWeekRule, formatInfo.FirstDayOfWeek);
-        }
+    public static int GetWeekOfYear(this DateTime dateTime, DateTimeFormatInfo formatInfo)
+    {
+        var calendar = formatInfo.Calendar;
+        return calendar.GetWeekOfYear(dateTime, formatInfo.CalendarWeekRule, formatInfo.FirstDayOfWeek);
+    }
 
-        public static DateTime GetFirstDayOfWeek(this DateTimeFormatInfo formatInfo, int year, int week)
-        {
-            var currentDate = new DateTime(year, 1, 1);
+    public static DateTime GetFirstDayOfWeek(this DateTimeFormatInfo formatInfo, int year, int week)
+    {
+        var currentDate = new DateTime(year, 1, 1);
 
-            // walk forward till date is first day of week
-            while (currentDate.DayOfWeek != formatInfo.FirstDayOfWeek) 
-                currentDate = currentDate.AddDays(1);
+        // walk forward till date is first day of week
+        while (currentDate.DayOfWeek != formatInfo.FirstDayOfWeek)
+            currentDate = currentDate.AddDays(1);
 
-            var calendar = formatInfo.Calendar;
-            int firstWeek = calendar.GetWeekOfYear(currentDate, formatInfo.CalendarWeekRule, formatInfo.FirstDayOfWeek);
+        var calendar = formatInfo.Calendar;
+        int firstWeek = calendar.GetWeekOfYear(currentDate, formatInfo.CalendarWeekRule, formatInfo.FirstDayOfWeek);
 
-            int weekOffset = week - firstWeek;
-            return calendar.AddWeeks(currentDate, weekOffset);
-        }
+        int weekOffset = week - firstWeek;
+        return calendar.AddWeeks(currentDate, weekOffset);
     }
 }
diff --git a/service/src/InstructorIQ.Core/Extensions/EnumerableExtensions.cs b/service/src/InstructorIQ.Core/Extensions/EnumerableExtensions.cs
index 333f1257..5e646ed3 100644
--- a/service/src/InstructorIQ.Core/Extensions/EnumerableExtensions.cs
+++ b/service/src/InstructorIQ.Core/Extensions/EnumerableExtensions.cs
@@ -1,164 +1,170 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using System.Threading.Tasks;
 
-namespace InstructorIQ.Core.Extensions
+namespace InstructorIQ.Core.Extensions;
+
+/// <summary>
+/// Extension methods for <see cref="IEnumerable{T}"/>
+/// </summary>
+public static class EnumerableExtensions
 {
     /// <summary>
-    /// Extension methods for <see cref="IEnumerable{T}"/>
+    /// Converts an IEnumerable of values to a delimited string.
     /// </summary>
-    public static class EnumerableExtensions
+    /// <typeparam name="T">
+    /// The type of objects to delimit.
+    /// </typeparam>
+    /// <param name="values">
+    /// The IEnumerable string values to convert.
+    /// </param>
+    /// <returns>
+    /// A delimited string of the values.
+    /// </returns>
+    public static string ToDelimitedString<T>(this IEnumerable<T> values)
     {
-        /// <summary>
-        /// Converts an IEnumerable of values to a delimited string.
-        /// </summary>
-        /// <typeparam name="T">
-        /// The type of objects to delimit.
-        /// </typeparam>
-        /// <param name="values">
-        /// The IEnumerable string values to convert.
-        /// </param>
-        /// <returns>
-        /// A delimited string of the values.
-        /// </returns>
-        public static string ToDelimitedString<T>(this IEnumerable<T> values)
-        {
-            return ToDelimitedString<T>(values, ",");
-        }
-
-        /// <summary>
-        /// Converts an IEnumerable of values to a delimited string.
-        /// </summary>
-        /// <typeparam name="T">
-        /// The type of objects to delimit.
-        /// </typeparam>
-        /// <param name="values">
-        /// The IEnumerable string values to convert.
-        /// </param>
-        /// <param name="delimiter">
-        /// The delimiter.
-        /// </param>
-        /// <returns>
-        /// A delimited string of the values.
-        /// </returns>
-        public static string ToDelimitedString<T>(this IEnumerable<T> values, string delimiter)
-        {
-            var sb = new StringBuilder();
-            foreach (var i in values)
-            {
-                if (sb.Length > 0)
-                    sb.Append(delimiter ?? ",");
-                sb.Append(i.ToString());
-            }
-
-            return sb.ToString();
-        }
+        return ToDelimitedString<T>(values, ",");
+    }
 
-        /// <summary>
-        /// Converts an IEnumerable of values to a delimited string.
-        /// </summary>
-        /// <param name="values">The IEnumerable string values to convert.</param>
-        /// <returns>A delimited string of the values.</returns>
-        public static string ToDelimitedString(this IEnumerable<string> values)
+    /// <summary>
+    /// Converts an IEnumerable of values to a delimited string.
+    /// </summary>
+    /// <typeparam name="T">
+    /// The type of objects to delimit.
+    /// </typeparam>
+    /// <param name="values">
+    /// The IEnumerable string values to convert.
+    /// </param>
+    /// <param name="delimiter">
+    /// The delimiter.
+    /// </param>
+    /// <returns>
+    /// A delimited string of the values.
+    /// </returns>
+    public static string ToDelimitedString<T>(this IEnumerable<T> values, string delimiter)
+    {
+        var sb = new StringBuilder();
+        foreach (var i in values)
         {
-            return ToDelimitedString(values, ",");
+            if (sb.Length > 0)
+                sb.Append(delimiter ?? ",");
+            sb.Append(i.ToString());
         }
 
-        /// <summary>
-        /// Converts an IEnumerable of values to a delimited string.
-        /// </summary>
-        /// <param name="values">The IEnumerable string values to convert.</param>
-        /// <param name="delimiter">The delimiter.</param>
-        /// <returns>A delimited string of the values.</returns>
-        public static string ToDelimitedString(this IEnumerable<string> values, string delimiter)
-        {
-            return ToDelimitedString(values, delimiter, null);
-        }
+        return sb.ToString();
+    }
 
-        /// <summary>
-        /// Converts an IEnumerable of values to a delimited string.
-        /// </summary>
-        /// <param name="values">The IEnumerable string values to convert.</param>
-        /// <param name="delimiter">The delimiter.</param>
-        /// <param name="escapeDelimiter">A delegate used to escape the delimiter contained in the value.</param>
-        /// <returns>A delimited string of the values.</returns>
-        public static string ToDelimitedString(this IEnumerable<string> values, string delimiter, Func<string, string> escapeDelimiter)
-        {
-            var sb = new StringBuilder();
-            foreach (var value in values)
-            {
-                if (sb.Length > 0)
-                    sb.Append(delimiter);
+    /// <summary>
+    /// Converts an IEnumerable of values to a delimited string.
+    /// </summary>
+    /// <param name="values">The IEnumerable string values to convert.</param>
+    /// <returns>A delimited string of the values.</returns>
+    public static string ToDelimitedString(this IEnumerable<string> values)
+    {
+        return ToDelimitedString(values, ",");
+    }
 
-                var v = escapeDelimiter != null
-                    ? escapeDelimiter(value ?? string.Empty)
-                    : value ?? string.Empty;
+    /// <summary>
+    /// Converts an IEnumerable of values to a delimited string.
+    /// </summary>
+    /// <param name="values">The IEnumerable string values to convert.</param>
+    /// <param name="delimiter">The delimiter.</param>
+    /// <returns>A delimited string of the values.</returns>
+    public static string ToDelimitedString(this IEnumerable<string> values, string delimiter)
+    {
+        return ToDelimitedString(values, delimiter, null);
+    }
 
-                sb.Append(v);
-            }
+    /// <summary>
+    /// Converts an IEnumerable of values to a delimited string.
+    /// </summary>
+    /// <param name="values">The IEnumerable string values to convert.</param>
+    /// <param name="delimiter">The delimiter.</param>
+    /// <param name="escapeDelimiter">A delegate used to escape the delimiter contained in the value.</param>
+    /// <returns>A delimited string of the values.</returns>
+    public static string ToDelimitedString(this IEnumerable<string> values, string delimiter, Func<string, string> escapeDelimiter)
+    {
+        var sb = new StringBuilder();
+        foreach (var value in values)
+        {
+            if (sb.Length > 0)
+                sb.Append(delimiter);
 
-            return sb.ToString();
-        }
+            var v = escapeDelimiter != null
+                ? escapeDelimiter(value ?? string.Empty)
+                : value ?? string.Empty;
 
-        /// <summary>
-        /// Converts an IEnumerable to an index value.
-        /// </summary>
-        /// <typeparam name="TValue">The type of the value.</typeparam>
-        /// <param name="items">The items to index.</param>
-        /// <returns></returns>
-        public static IEnumerable<IndexedValue<TValue>> ToIndexedList<TValue>(this IEnumerable<TValue> items)
-        {
-            int index = 0;
-            return items.Select(item => new IndexedValue<TValue>(index++, item));
+            sb.Append(v);
         }
 
-        /// <summary>
-        /// Converts an IEnumerable to a selection list.
-        /// </summary>
-        /// <typeparam name="TValue">The type of the value.</typeparam>
-        /// <param name="items">The items to use.</param>
-        /// <returns></returns>
-        public static IEnumerable<SelectionValue<TValue>> ToSelectionList<TValue>(this IEnumerable<TValue> items)
-        {
-            int index = 0;
-            return items.Select(item => new SelectionValue<TValue>(index++, item));
-        }
+        return sb.ToString();
+    }
 
-        public static IQueryable<T> Paginate<T>(this IQueryable<T> query, int pageNumber, int pageSize)
-        {
-            int skip = Math.Max(pageSize * (pageNumber - 1), 0);
-            return query.Skip(skip).Take(pageSize);
-        }
+    /// <summary>
+    /// Converts an IEnumerable to an index value.
+    /// </summary>
+    /// <typeparam name="TValue">The type of the value.</typeparam>
+    /// <param name="items">The items to index.</param>
+    /// <returns></returns>
+    public static IEnumerable<IndexedValue<TValue>> ToIndexedList<TValue>(this IEnumerable<TValue> items)
+    {
+        int index = 0;
+        return items.Select(item => new IndexedValue<TValue>(index++, item));
+    }
 
+    /// <summary>
+    /// Converts an IEnumerable to a selection list.
+    /// </summary>
+    /// <typeparam name="TValue">The type of the value.</typeparam>
+    /// <param name="items">The items to use.</param>
+    /// <returns></returns>
+    public static IEnumerable<SelectionValue<TValue>> ToSelectionList<TValue>(this IEnumerable<TValue> items)
+    {
+        int index = 0;
+        return items.Select(item => new SelectionValue<TValue>(index++, item));
     }
 
-    public class IndexedValue<T>
+    public static IQueryable<T> Paginate<T>(this IQueryable<T> query, int pageNumber, int pageSize)
     {
-        public IndexedValue(int index, T value)
-        {
-            Index = index;
-            Value = value;
-        }
+        int skip = Math.Max(pageSize * (pageNumber - 1), 0);
+        return query.Skip(skip).Take(pageSize);
+    }
 
-        public int Index { get; }
+    public static async Task<T> FirstOrDefault<T>(this IAsyncEnumerable<T> enumerable)
+    {
+        await foreach (var item in enumerable)
+            return item;
 
-        public T Value { get; }
+        return default;
     }
+}
 
-    public class SelectionValue<T>
+public class IndexedValue<T>
+{
+    public IndexedValue(int index, T value)
     {
-        public SelectionValue(int index, T value)
-        {
-            Index = index;
-            Value = value;
-        }
+        Index = index;
+        Value = value;
+    }
 
-        public int Index { get; }
+    public int Index { get; }
 
-        public T Value { get; }
+    public T Value { get; }
+}
 
-        public bool Selected { get; set; }
+public class SelectionValue<T>
+{
+    public SelectionValue(int index, T value)
+    {
+        Index = index;
+        Value = value;
     }
 
+    public int Index { get; }
+
+    public T Value { get; }
+
+    public bool Selected { get; set; }
 }
diff --git a/service/src/InstructorIQ.Core/Extensions/HttpExtensions.cs b/service/src/InstructorIQ.Core/Extensions/HttpExtensions.cs
index bad2fdf9..f8bc57d3 100644
--- a/service/src/InstructorIQ.Core/Extensions/HttpExtensions.cs
+++ b/service/src/InstructorIQ.Core/Extensions/HttpExtensions.cs
@@ -1,42 +1,44 @@
-using System;
+using System;
+
 using InstructorIQ.Core.Models;
+
 using Microsoft.AspNetCore.Http;
+
 using UAParser;
 
-namespace InstructorIQ.Core.Extensions
+namespace InstructorIQ.Core.Extensions;
+
+public static class HttpExtensions
 {
-    public static class HttpExtensions
+    public static IUserAgentModel ReadUserAgent(this HttpRequest httpRequest)
     {
-        public static IUserAgentModel ReadUserAgent(this HttpRequest httpRequest)
-        {
-            var model = new UserAgentModel();
-            return ReadUserAgent(httpRequest, model);
-        }
+        var model = new UserAgentModel();
+        return ReadUserAgent(httpRequest, model);
+    }
 
-        public static IUserAgentModel ReadUserAgent(this HttpRequest httpRequest, IUserAgentModel model)
-        {
-            if (httpRequest == null)
-                return model;
+    public static IUserAgentModel ReadUserAgent(this HttpRequest httpRequest, IUserAgentModel model)
+    {
+        if (httpRequest == null)
+            return model;
 
-            if (model == null)
-                throw new ArgumentNullException(nameof(model));
+        if (model == null)
+            throw new ArgumentNullException(nameof(model));
 
-            model.IpAddress = httpRequest.HttpContext.Connection.RemoteIpAddress.ToString();
-            model.UserAgent = httpRequest.Headers["User-Agent"].ToString();
+        model.IpAddress = httpRequest.HttpContext.Connection.RemoteIpAddress.ToString();
+        model.UserAgent = httpRequest.Headers["User-Agent"].ToString();
 
-            if (string.IsNullOrEmpty(model.UserAgent))
-                return model;
+        if (string.IsNullOrEmpty(model.UserAgent))
+            return model;
 
-            var uaParser = Parser.GetDefault();
-            var clientInfo = uaParser.Parse(model.UserAgent);
+        var uaParser = Parser.GetDefault();
+        var clientInfo = uaParser.Parse(model.UserAgent);
 
-            model.Browser = clientInfo.UA.Family;
-            model.DeviceBrand = clientInfo.Device.Brand;
-            model.DeviceFamily = clientInfo.Device.Family;
-            model.DeviceModel = clientInfo.Device.Model;
-            model.OperatingSystem = clientInfo.OS.Family;
+        model.Browser = clientInfo.UA.Family;
+        model.DeviceBrand = clientInfo.Device.Brand;
+        model.DeviceFamily = clientInfo.Device.Family;
+        model.DeviceModel = clientInfo.Device.Model;
+        model.OperatingSystem = clientInfo.OS.Family;
 
-            return model;
-        }
+        return model;
     }
 }
diff --git a/service/src/InstructorIQ.Core/Extensions/ServiceCollectionExtensions.cs b/service/src/InstructorIQ.Core/Extensions/ServiceCollectionExtensions.cs
index 2b842081..ec15bded 100644
--- a/service/src/InstructorIQ.Core/Extensions/ServiceCollectionExtensions.cs
+++ b/service/src/InstructorIQ.Core/Extensions/ServiceCollectionExtensions.cs
@@ -1,22 +1,22 @@
-using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
 using Microsoft.AspNetCore.Mvc.Routing;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace InstructorIQ.Core.Extensions
+namespace InstructorIQ.Core.Extensions;
+
+public static class ServiceCollectionExtensions
 {
-    public static class ServiceCollectionExtensions
+    public static IServiceCollection AddUrlHelper(this IServiceCollection services)
     {
-        public static IServiceCollection AddUrlHelper(this IServiceCollection services)
+        services.AddSingleton<IActionContextAccessor, ActionContextAccessor>();
+        services.AddScoped(it =>
         {
-            services.AddSingleton<IActionContextAccessor, ActionContextAccessor>();
-            services.AddScoped(it => {
-                var urlHelperFactory = it.GetRequiredService<IUrlHelperFactory>();
-                var actionContextAccessor = it.GetRequiredService<IActionContextAccessor>();
+            var urlHelperFactory = it.GetRequiredService<IUrlHelperFactory>();
+            var actionContextAccessor = it.GetRequiredService<IActionContextAccessor>();
 
-                return urlHelperFactory.GetUrlHelper(actionContextAccessor.ActionContext);
-            });
+            return urlHelperFactory.GetUrlHelper(actionContextAccessor.ActionContext);
+        });
 
-            return services;
-        }
+        return services;
     }
 }
diff --git a/service/src/InstructorIQ.Core/Extensions/StringConvert.cs b/service/src/InstructorIQ.Core/Extensions/StringConvert.cs
index fa5f965f..ba618a60 100644
--- a/service/src/InstructorIQ.Core/Extensions/StringConvert.cs
+++ b/service/src/InstructorIQ.Core/Extensions/StringConvert.cs
@@ -1,601 +1,600 @@
-using System;
+using System;
 using System.Globalization;
 
-namespace InstructorIQ.Core.Extensions
+namespace InstructorIQ.Core.Extensions;
+
+/// <summary>
+/// Converts a string data type to another base data type using a safe conversion method.
+/// </summary>
+public static class StringConvert
 {
     /// <summary>
-    /// Converts a string data type to another base data type using a safe conversion method.
+    /// Converts the specified string representation of a logical value to its Boolean equivalent.
     /// </summary>
-    public static class StringConvert
+    /// <param name="value">A string that contains the value of either <see cref="F:System.Boolean.TrueString"/> or <see cref="F:System.Boolean.FalseString"/>.</param>
+    /// <returns>
+    /// true if <paramref name="value"/> equals <see cref="F:System.Boolean.TrueString"/>, or false if <paramref name="value"/> equals <see cref="F:System.Boolean.FalseString"/> or null.
+    /// </returns>
+    public static bool? ToBoolean(this string value)
     {
-        /// <summary>
-        /// Converts the specified string representation of a logical value to its Boolean equivalent.
-        /// </summary>
-        /// <param name="value">A string that contains the value of either <see cref="F:System.Boolean.TrueString"/> or <see cref="F:System.Boolean.FalseString"/>.</param>
-        /// <returns>
-        /// true if <paramref name="value"/> equals <see cref="F:System.Boolean.TrueString"/>, or false if <paramref name="value"/> equals <see cref="F:System.Boolean.FalseString"/> or null.
-        /// </returns>
-        public static bool? ToBoolean(this string value)
-        {
-            if (value == null)
-                return null;
+        if (value == null)
+            return null;
 
-            if (bool.TryParse(value, out var result))
-                return result;
+        if (bool.TryParse(value, out var result))
+            return result;
 
-            string v = value.Trim();
+        string v = value.Trim();
 
-            if (string.Equals(v, "t", StringComparison.OrdinalIgnoreCase)
-                || string.Equals(v, "true", StringComparison.OrdinalIgnoreCase)
-                || string.Equals(v, "y", StringComparison.OrdinalIgnoreCase)
-                || string.Equals(v, "yes", StringComparison.OrdinalIgnoreCase)
-                || string.Equals(v, "1", StringComparison.OrdinalIgnoreCase)
-                || string.Equals(v, "x", StringComparison.OrdinalIgnoreCase)
-                || string.Equals(v, "on", StringComparison.OrdinalIgnoreCase))
-                return true;
+        if (string.Equals(v, "t", StringComparison.OrdinalIgnoreCase)
+            || string.Equals(v, "true", StringComparison.OrdinalIgnoreCase)
+            || string.Equals(v, "y", StringComparison.OrdinalIgnoreCase)
+            || string.Equals(v, "yes", StringComparison.OrdinalIgnoreCase)
+            || string.Equals(v, "1", StringComparison.OrdinalIgnoreCase)
+            || string.Equals(v, "x", StringComparison.OrdinalIgnoreCase)
+            || string.Equals(v, "on", StringComparison.OrdinalIgnoreCase))
+            return true;
 
+        return null;
+    }
+
+    /// <summary>
+    /// Converts the specified string representation of a number to an equivalent 8-bit unsigned integer.
+    /// </summary>
+    /// <param name="value">A string that contains the number to convert.</param>
+    /// <returns>
+    /// An 8-bit unsigned integer that is equivalent to <paramref name="value"/>, or zero if <paramref name="value"/> is null.
+    /// </returns>
+    public static byte? ToByte(this string value)
+    {
+        if (value == null)
             return null;
-        }
 
-        /// <summary>
-        /// Converts the specified string representation of a number to an equivalent 8-bit unsigned integer.
-        /// </summary>
-        /// <param name="value">A string that contains the number to convert.</param>
-        /// <returns>
-        /// An 8-bit unsigned integer that is equivalent to <paramref name="value"/>, or zero if <paramref name="value"/> is null.
-        /// </returns>
-        public static byte? ToByte(this string value)
-        {
-            if (value == null)
-                return null;
+        if (byte.TryParse(value, out var result))
+            return result;
 
-            if (byte.TryParse(value, out var result))
-                return result;
+        return null;
+    }
 
+    /// <summary>
+    /// Converts the specified string representation of a number to an equivalent 8-bit unsigned integer, using specified culture-specific formatting information.
+    /// </summary>
+    /// <param name="value">A string that contains the number to convert.</param>
+    /// <param name="provider">An object that supplies culture-specific formatting information.</param>
+    /// <returns>
+    /// An 8-bit unsigned integer that is equivalent to <paramref name="value"/>, or zero if <paramref name="value"/> is null.
+    /// </returns>
+    public static byte? ToByte(this string value, IFormatProvider provider)
+    {
+        if (value == null)
             return null;
-        }
 
-        /// <summary>
-        /// Converts the specified string representation of a number to an equivalent 8-bit unsigned integer, using specified culture-specific formatting information.
-        /// </summary>
-        /// <param name="value">A string that contains the number to convert.</param>
-        /// <param name="provider">An object that supplies culture-specific formatting information.</param>
-        /// <returns>
-        /// An 8-bit unsigned integer that is equivalent to <paramref name="value"/>, or zero if <paramref name="value"/> is null.
-        /// </returns>
-        public static byte? ToByte(this string value, IFormatProvider provider)
-        {
-            if (value == null)
-                return null;
+        if (byte.TryParse(value, NumberStyles.Integer, provider, out var result))
+            return result;
 
-            if (byte.TryParse(value, NumberStyles.Integer, provider, out var result))
-                return result;
+        return null;
+    }
 
+    /// <summary>
+    /// Converts the specified string representation of a date and time to an equivalent date and time value.
+    /// </summary>
+    /// <param name="value">The string representation of a date and time.</param>
+    /// <returns>
+    /// The date and time equivalent of the value of <paramref name="value"/>, or the date and time equivalent of <see cref="F:System.DateTime.MinValue"/> if <paramref name="value"/> is null.
+    /// </returns>
+    public static DateTime? ToDateTime(this string value)
+    {
+        if (value == null)
             return null;
-        }
 
-        /// <summary>
-        /// Converts the specified string representation of a date and time to an equivalent date and time value.
-        /// </summary>
-        /// <param name="value">The string representation of a date and time.</param>
-        /// <returns>
-        /// The date and time equivalent of the value of <paramref name="value"/>, or the date and time equivalent of <see cref="F:System.DateTime.MinValue"/> if <paramref name="value"/> is null.
-        /// </returns>
-        public static DateTime? ToDateTime(this string value)
-        {
-            if (value == null)
-                return null;
+        if (DateTime.TryParse(value, out var result))
+            return result;
 
-            if (DateTime.TryParse(value, out var result))
-                return result;
+        return null;
+    }
 
+    /// <summary>
+    /// Converts the specified string representation of a number to an equivalent date and time, using the specified culture-specific formatting information.
+    /// </summary>
+    /// <param name="value">A string that contains a date and time to convert.</param>
+    /// <param name="provider">An object that supplies culture-specific formatting information.</param>
+    /// <returns>
+    /// The date and time equivalent of the value of <paramref name="value"/>, or the date and time equivalent of <see cref="F:System.DateTime.MinValue"/> if <paramref name="value"/> is null.
+    /// </returns>
+    public static DateTime? ToDateTime(this string value, IFormatProvider provider)
+    {
+        if (value == null)
             return null;
-        }
 
-        /// <summary>
-        /// Converts the specified string representation of a number to an equivalent date and time, using the specified culture-specific formatting information.
-        /// </summary>
-        /// <param name="value">A string that contains a date and time to convert.</param>
-        /// <param name="provider">An object that supplies culture-specific formatting information.</param>
-        /// <returns>
-        /// The date and time equivalent of the value of <paramref name="value"/>, or the date and time equivalent of <see cref="F:System.DateTime.MinValue"/> if <paramref name="value"/> is null.
-        /// </returns>
-        public static DateTime? ToDateTime(this string value, IFormatProvider provider)
-        {
-            if (value == null)
-                return null;
+        if (DateTime.TryParse(value, provider, DateTimeStyles.None, out var result))
+            return result;
 
-            if (DateTime.TryParse(value, provider, DateTimeStyles.None, out var result))
-                return result;
+        return null;
+    }
 
+    /// <summary>
+    /// Converts the specified string representation of a number to an equivalent decimal number.
+    /// </summary>
+    /// <param name="value">A string that contains a number to convert.</param>
+    /// <returns>
+    /// A decimal number that is equivalent to the number in <paramref name="value"/>, or 0 (zero) if <paramref name="value"/> is null.
+    /// </returns>
+    public static decimal? ToDecimal(this string value)
+    {
+        if (value == null)
             return null;
-        }
 
-        /// <summary>
-        /// Converts the specified string representation of a number to an equivalent decimal number.
-        /// </summary>
-        /// <param name="value">A string that contains a number to convert.</param>
-        /// <returns>
-        /// A decimal number that is equivalent to the number in <paramref name="value"/>, or 0 (zero) if <paramref name="value"/> is null.
-        /// </returns>
-        public static decimal? ToDecimal(this string value)
-        {
-            if (value == null)
-                return null;
+        if (decimal.TryParse(value, out var result))
+            return result;
 
-            if (decimal.TryParse(value, out var result))
-                return result;
+        return null;
+    }
 
+    /// <summary>
+    /// Converts the specified string representation of a number to an equivalent decimal number, using the specified culture-specific formatting information.
+    /// </summary>
+    /// <param name="value">A string that contains a number to convert.</param>
+    /// <param name="provider">An object that supplies culture-specific formatting information.</param>
+    /// <returns>
+    /// A decimal number that is equivalent to the number in <paramref name="value"/>, or 0 (zero) if <paramref name="value"/> is null.
+    /// </returns>
+    public static decimal? ToDecimal(this string value, IFormatProvider provider)
+    {
+        if (value == null)
             return null;
-        }
 
-        /// <summary>
-        /// Converts the specified string representation of a number to an equivalent decimal number, using the specified culture-specific formatting information.
-        /// </summary>
-        /// <param name="value">A string that contains a number to convert.</param>
-        /// <param name="provider">An object that supplies culture-specific formatting information.</param>
-        /// <returns>
-        /// A decimal number that is equivalent to the number in <paramref name="value"/>, or 0 (zero) if <paramref name="value"/> is null.
-        /// </returns>
-        public static decimal? ToDecimal(this string value, IFormatProvider provider)
-        {
-            if (value == null)
-                return null;
+        if (decimal.TryParse(value, NumberStyles.Number, provider, out var result))
+            return result;
 
-            if (decimal.TryParse(value, NumberStyles.Number, provider, out var result))
-                return result;
+        return null;
+    }
 
+    /// <summary>
+    /// Converts the specified string representation of a number to an equivalent double-precision floating-point number.
+    /// </summary>
+    /// <param name="value">A string that contains the number to convert.</param>
+    /// <returns>
+    /// A double-precision floating-point number that is equivalent to the number in <paramref name="value"/>, or 0 (zero) if <paramref name="value"/> is null.
+    /// </returns>
+    public static double? ToDouble(this string value)
+    {
+        if (value == null)
             return null;
-        }
 
-        /// <summary>
-        /// Converts the specified string representation of a number to an equivalent double-precision floating-point number.
-        /// </summary>
-        /// <param name="value">A string that contains the number to convert.</param>
-        /// <returns>
-        /// A double-precision floating-point number that is equivalent to the number in <paramref name="value"/>, or 0 (zero) if <paramref name="value"/> is null.
-        /// </returns>
-        public static double? ToDouble(this string value)
-        {
-            if (value == null)
-                return null;
+        if (double.TryParse(value, out var result))
+            return result;
 
-            if (double.TryParse(value, out var result))
-                return result;
+        return null;
+    }
 
+    /// <summary>
+    /// Converts the specified string representation of a number to an equivalent double-precision floating-point number, using the specified culture-specific formatting information.
+    /// </summary>
+    /// <param name="value">A string that contains the number to convert.</param>
+    /// <param name="provider">An object that supplies culture-specific formatting information.</param>
+    /// <returns>
+    /// A double-precision floating-point number that is equivalent to the number in <paramref name="value"/>, or 0 (zero) if <paramref name="value"/> is null.
+    /// </returns>
+    public static double? ToDouble(this string value, IFormatProvider provider)
+    {
+        if (value == null)
             return null;
-        }
 
-        /// <summary>
-        /// Converts the specified string representation of a number to an equivalent double-precision floating-point number, using the specified culture-specific formatting information.
-        /// </summary>
-        /// <param name="value">A string that contains the number to convert.</param>
-        /// <param name="provider">An object that supplies culture-specific formatting information.</param>
-        /// <returns>
-        /// A double-precision floating-point number that is equivalent to the number in <paramref name="value"/>, or 0 (zero) if <paramref name="value"/> is null.
-        /// </returns>
-        public static double? ToDouble(this string value, IFormatProvider provider)
-        {
-            if (value == null)
-                return null;
+        if (double.TryParse(value, NumberStyles.Float | NumberStyles.AllowThousands, provider, out var result))
+            return result;
 
-            if (double.TryParse(value, NumberStyles.Float | NumberStyles.AllowThousands, provider, out var result))
-                return result;
+        return null;
+    }
 
+    /// <summary>
+    /// Converts the specified string representation of a number to an equivalent 16-bit signed integer.
+    /// </summary>
+    /// <param name="value">A string that contains the number to convert.</param>
+    /// <returns>
+    /// A 16-bit signed integer that is equivalent to the number in <paramref name="value"/>, or 0 (zero) if <paramref name="value"/> is null.
+    /// </returns>
+    public static short? ToInt16(this string value)
+    {
+        if (value == null)
             return null;
-        }
 
-        /// <summary>
-        /// Converts the specified string representation of a number to an equivalent 16-bit signed integer.
-        /// </summary>
-        /// <param name="value">A string that contains the number to convert.</param>
-        /// <returns>
-        /// A 16-bit signed integer that is equivalent to the number in <paramref name="value"/>, or 0 (zero) if <paramref name="value"/> is null.
-        /// </returns>
-        public static short? ToInt16(this string value)
-        {
-            if (value == null)
-                return null;
+        if (short.TryParse(value, out var result))
+            return result;
 
-            if (short.TryParse(value, out var result))
-                return result;
+        return null;
+    }
 
+    /// <summary>
+    /// Converts the specified string representation of a number to an equivalent 16-bit signed integer, using the specified culture-specific formatting information.
+    /// </summary>
+    /// <param name="value">A string that contains the number to convert.</param>
+    /// <param name="provider">An object that supplies culture-specific formatting information.</param>
+    /// <returns>
+    /// A 16-bit signed integer that is equivalent to the number in <paramref name="value"/>, or 0 (zero) if <paramref name="value"/> is null.
+    /// </returns>
+    public static short? ToInt16(this string value, IFormatProvider provider)
+    {
+        if (value == null)
             return null;
-        }
 
-        /// <summary>
-        /// Converts the specified string representation of a number to an equivalent 16-bit signed integer, using the specified culture-specific formatting information.
-        /// </summary>
-        /// <param name="value">A string that contains the number to convert.</param>
-        /// <param name="provider">An object that supplies culture-specific formatting information.</param>
-        /// <returns>
-        /// A 16-bit signed integer that is equivalent to the number in <paramref name="value"/>, or 0 (zero) if <paramref name="value"/> is null.
-        /// </returns>
-        public static short? ToInt16(this string value, IFormatProvider provider)
-        {
-            if (value == null)
-                return null;
+        if (short.TryParse(value, NumberStyles.Integer, provider, out var result))
+            return result;
 
-            if (short.TryParse(value, NumberStyles.Integer, provider, out var result))
-                return result;
+        return null;
+    }
 
+    /// <summary>
+    /// Converts the specified string representation of a number to an equivalent 32-bit signed integer.
+    /// </summary>
+    /// <param name="value">A string that contains the number to convert.</param>
+    /// <returns>
+    /// A 32-bit signed integer that is equivalent to the number in <paramref name="value"/>, or 0 (zero) if <paramref name="value"/> is null.
+    /// </returns>
+    public static int? ToInt32(this string value)
+    {
+        if (value == null)
             return null;
-        }
 
-        /// <summary>
-        /// Converts the specified string representation of a number to an equivalent 32-bit signed integer.
-        /// </summary>
-        /// <param name="value">A string that contains the number to convert.</param>
-        /// <returns>
-        /// A 32-bit signed integer that is equivalent to the number in <paramref name="value"/>, or 0 (zero) if <paramref name="value"/> is null.
-        /// </returns>
-        public static int? ToInt32(this string value)
-        {
-            if (value == null)
-                return null;
+        if (int.TryParse(value, out var result))
+            return result;
 
-            if (int.TryParse(value, out var result))
-                return result;
+        return null;
+    }
 
+    /// <summary>
+    /// Converts the specified string representation of a number to an equivalent 32-bit signed integer, using the specified culture-specific formatting information.
+    /// </summary>
+    /// <param name="value">A string that contains the number to convert.</param>
+    /// <param name="provider">An object that supplies culture-specific formatting information.</param>
+    /// <returns>
+    /// A 32-bit signed integer that is equivalent to the number in <paramref name="value"/>, or 0 (zero) if <paramref name="value"/> is null.
+    /// </returns>
+    public static int? ToInt32(this string value, IFormatProvider provider)
+    {
+        if (value == null)
             return null;
-        }
 
-        /// <summary>
-        /// Converts the specified string representation of a number to an equivalent 32-bit signed integer, using the specified culture-specific formatting information.
-        /// </summary>
-        /// <param name="value">A string that contains the number to convert.</param>
-        /// <param name="provider">An object that supplies culture-specific formatting information.</param>
-        /// <returns>
-        /// A 32-bit signed integer that is equivalent to the number in <paramref name="value"/>, or 0 (zero) if <paramref name="value"/> is null.
-        /// </returns>
-        public static int? ToInt32(this string value, IFormatProvider provider)
-        {
-            if (value == null)
-                return null;
+        if (int.TryParse(value, NumberStyles.Integer, provider, out var result))
+            return result;
 
-            if (int.TryParse(value, NumberStyles.Integer, provider, out var result))
-                return result;
+        return null;
+    }
 
+    /// <summary>
+    /// Converts the specified string representation of a number to an equivalent 64-bit signed integer.
+    /// </summary>
+    /// <param name="value">A string that contains a number to convert.</param>
+    /// <returns>
+    /// A 64-bit signed integer that is equivalent to the number in <paramref name="value"/>, or 0 (zero) if <paramref name="value"/> is null.
+    /// </returns>
+    public static long? ToInt64(this string value)
+    {
+        if (value == null)
             return null;
-        }
 
-        /// <summary>
-        /// Converts the specified string representation of a number to an equivalent 64-bit signed integer.
-        /// </summary>
-        /// <param name="value">A string that contains a number to convert.</param>
-        /// <returns>
-        /// A 64-bit signed integer that is equivalent to the number in <paramref name="value"/>, or 0 (zero) if <paramref name="value"/> is null.
-        /// </returns>
-        public static long? ToInt64(this string value)
-        {
-            if (value == null)
-                return null;
+        if (long.TryParse(value, out var result))
+            return result;
 
-            if (long.TryParse(value, out var result))
-                return result;
+        return null;
+    }
 
+    /// <summary>
+    /// Converts the specified string representation of a number to an equivalent 64-bit signed integer, using the specified culture-specific formatting information.
+    /// </summary>
+    /// <param name="value">A string that contains the number to convert.</param>
+    /// <param name="provider">An object that supplies culture-specific formatting information.</param>
+    /// <returns>
+    /// A 64-bit signed integer that is equivalent to the number in <paramref name="value"/>, or 0 (zero) if <paramref name="value"/> is null.
+    /// </returns>
+    public static long? ToInt64(this string value, IFormatProvider provider)
+    {
+        if (value == null)
             return null;
-        }
 
-        /// <summary>
-        /// Converts the specified string representation of a number to an equivalent 64-bit signed integer, using the specified culture-specific formatting information.
-        /// </summary>
-        /// <param name="value">A string that contains the number to convert.</param>
-        /// <param name="provider">An object that supplies culture-specific formatting information.</param>
-        /// <returns>
-        /// A 64-bit signed integer that is equivalent to the number in <paramref name="value"/>, or 0 (zero) if <paramref name="value"/> is null.
-        /// </returns>
-        public static long? ToInt64(this string value, IFormatProvider provider)
-        {
-            if (value == null)
-                return null;
+        if (long.TryParse(value, NumberStyles.Integer, provider, out var result))
+            return result;
 
-            if (long.TryParse(value, NumberStyles.Integer, provider, out var result))
-                return result;
+        return null;
+    }
 
+    /// <summary>
+    /// Converts the specified string representation of a number to an equivalent single-precision floating-point number.
+    /// </summary>
+    /// <param name="value">A string that contains the number to convert.</param>
+    /// <returns>
+    /// A single-precision floating-point number that is equivalent to the number in <paramref name="value"/>, or 0 (zero) if <paramref name="value"/> is null.
+    /// </returns>
+    public static float? ToSingle(this string value)
+    {
+        if (value == null)
             return null;
-        }
 
-        /// <summary>
-        /// Converts the specified string representation of a number to an equivalent single-precision floating-point number.
-        /// </summary>
-        /// <param name="value">A string that contains the number to convert.</param>
-        /// <returns>
-        /// A single-precision floating-point number that is equivalent to the number in <paramref name="value"/>, or 0 (zero) if <paramref name="value"/> is null.
-        /// </returns>
-        public static float? ToSingle(this string value)
-        {
-            if (value == null)
-                return null;
+        if (float.TryParse(value, out var result))
+            return result;
 
-            if (float.TryParse(value, out var result))
-                return result;
+        return null;
+    }
 
+    /// <summary>
+    /// Converts the specified string representation of a number to an equivalent single-precision floating-point number, using the specified culture-specific formatting information.
+    /// </summary>
+    /// <param name="value">A string that contains the number to convert.</param>
+    /// <param name="provider">An object that supplies culture-specific formatting information.</param>
+    /// <returns>
+    /// A single-precision floating-point number that is equivalent to the number in <paramref name="value"/>, or 0 (zero) if <paramref name="value"/> is null.
+    /// </returns>
+    public static float? ToSingle(this string value, IFormatProvider provider)
+    {
+        if (value == null)
             return null;
-        }
 
-        /// <summary>
-        /// Converts the specified string representation of a number to an equivalent single-precision floating-point number, using the specified culture-specific formatting information.
-        /// </summary>
-        /// <param name="value">A string that contains the number to convert.</param>
-        /// <param name="provider">An object that supplies culture-specific formatting information.</param>
-        /// <returns>
-        /// A single-precision floating-point number that is equivalent to the number in <paramref name="value"/>, or 0 (zero) if <paramref name="value"/> is null.
-        /// </returns>
-        public static float? ToSingle(this string value, IFormatProvider provider)
-        {
-            if (value == null)
-                return null;
+        if (float.TryParse(value, NumberStyles.Float | NumberStyles.AllowThousands, provider, out var result))
+            return result;
 
-            if (float.TryParse(value, NumberStyles.Float | NumberStyles.AllowThousands, provider, out var result))
-                return result;
+        return null;
+    }
 
+    /// <summary>
+    /// Converts the specified string representation of a number to an equivalent 16-bit unsigned integer.
+    /// </summary>
+    /// <param name="value">A string that contains the number to convert.</param>
+    /// <returns>
+    /// A 16-bit unsigned integer that is equivalent to the number in <paramref name="value"/>, or 0 (zero) if <paramref name="value"/> is null.
+    /// </returns>
+    public static ushort? ToUInt16(this string value)
+    {
+        if (value == null)
             return null;
-        }
 
-        /// <summary>
-        /// Converts the specified string representation of a number to an equivalent 16-bit unsigned integer.
-        /// </summary>
-        /// <param name="value">A string that contains the number to convert.</param>
-        /// <returns>
-        /// A 16-bit unsigned integer that is equivalent to the number in <paramref name="value"/>, or 0 (zero) if <paramref name="value"/> is null.
-        /// </returns>
-        public static ushort? ToUInt16(this string value)
-        {
-            if (value == null)
-                return null;
+        if (ushort.TryParse(value, out var result))
+            return result;
 
-            if (ushort.TryParse(value, out var result))
-                return result;
+        return null;
+    }
 
+    /// <summary>
+    /// Converts the specified string representation of a number to an equivalent 16-bit unsigned integer, using the specified culture-specific formatting information.
+    /// </summary>
+    /// <param name="value">A string that contains the number to convert.</param>
+    /// <param name="provider">An object that supplies culture-specific formatting information.</param>
+    /// <returns>
+    /// A 16-bit unsigned integer that is equivalent to the number in <paramref name="value"/>, or 0 (zero) if <paramref name="value"/> is null.
+    /// </returns>
+    public static ushort? ToUInt16(this string value, IFormatProvider provider)
+    {
+        if (value == null)
             return null;
-        }
 
-        /// <summary>
-        /// Converts the specified string representation of a number to an equivalent 16-bit unsigned integer, using the specified culture-specific formatting information.
-        /// </summary>
-        /// <param name="value">A string that contains the number to convert.</param>
-        /// <param name="provider">An object that supplies culture-specific formatting information.</param>
-        /// <returns>
-        /// A 16-bit unsigned integer that is equivalent to the number in <paramref name="value"/>, or 0 (zero) if <paramref name="value"/> is null.
-        /// </returns>
-        public static ushort? ToUInt16(this string value, IFormatProvider provider)
-        {
-            if (value == null)
-                return null;
+        if (ushort.TryParse(value, NumberStyles.Integer, provider, out var result))
+            return result;
 
-            if (ushort.TryParse(value, NumberStyles.Integer, provider, out var result))
-                return result;
+        return null;
+    }
 
+    /// <summary>
+    /// Converts the specified string representation of a number to an equivalent 32-bit unsigned integer.
+    /// </summary>
+    /// <param name="value">A string that contains the number to convert.</param>
+    /// <returns>
+    /// A 32-bit unsigned integer that is equivalent to the number in <paramref name="value"/>, or 0 (zero) if <paramref name="value"/> is null.
+    /// </returns>
+    public static uint? ToUInt32(this string value)
+    {
+        if (value == null)
             return null;
-        }
 
-        /// <summary>
-        /// Converts the specified string representation of a number to an equivalent 32-bit unsigned integer.
-        /// </summary>
-        /// <param name="value">A string that contains the number to convert.</param>
-        /// <returns>
-        /// A 32-bit unsigned integer that is equivalent to the number in <paramref name="value"/>, or 0 (zero) if <paramref name="value"/> is null.
-        /// </returns>
-        public static uint? ToUInt32(this string value)
-        {
-            if (value == null)
-                return null;
+        if (uint.TryParse(value, out var result))
+            return result;
 
-            if (uint.TryParse(value, out var result))
-                return result;
+        return null;
+    }
 
+    /// <summary>
+    /// Converts the specified string representation of a number to an equivalent 32-bit unsigned integer, using the specified culture-specific formatting information.
+    /// </summary>
+    /// <param name="value">A string that contains the number to convert.</param>
+    /// <param name="provider">An object that supplies culture-specific formatting information.</param>
+    /// <returns>
+    /// A 32-bit unsigned integer that is equivalent to the number in <paramref name="value"/>, or 0 (zero) if <paramref name="value"/> is null.
+    /// </returns>
+    public static uint? ToUInt32(this string value, IFormatProvider provider)
+    {
+        if (value == null)
             return null;
-        }
 
-        /// <summary>
-        /// Converts the specified string representation of a number to an equivalent 32-bit unsigned integer, using the specified culture-specific formatting information.
-        /// </summary>
-        /// <param name="value">A string that contains the number to convert.</param>
-        /// <param name="provider">An object that supplies culture-specific formatting information.</param>
-        /// <returns>
-        /// A 32-bit unsigned integer that is equivalent to the number in <paramref name="value"/>, or 0 (zero) if <paramref name="value"/> is null.
-        /// </returns>
-        public static uint? ToUInt32(this string value, IFormatProvider provider)
-        {
-            if (value == null)
-                return null;
+        if (uint.TryParse(value, NumberStyles.Integer, provider, out var result))
+            return result;
 
-            if (uint.TryParse(value, NumberStyles.Integer, provider, out var result))
-                return result;
+        return null;
+    }
 
+    /// <summary>
+    /// Converts the specified string representation of a number to an equivalent 64-bit unsigned integer.
+    /// </summary>
+    /// <param name="value">A string that contains the number to convert.</param>
+    /// <returns>
+    /// A 64-bit signed integer that is equivalent to the number in <paramref name="value"/>, or 0 (zero) if <paramref name="value"/> is null.
+    /// </returns>
+    public static ulong? ToUInt64(this string value)
+    {
+        if (value == null)
             return null;
-        }
 
-        /// <summary>
-        /// Converts the specified string representation of a number to an equivalent 64-bit unsigned integer.
-        /// </summary>
-        /// <param name="value">A string that contains the number to convert.</param>
-        /// <returns>
-        /// A 64-bit signed integer that is equivalent to the number in <paramref name="value"/>, or 0 (zero) if <paramref name="value"/> is null.
-        /// </returns>
-        public static ulong? ToUInt64(this string value)
-        {
-            if (value == null)
-                return null;
+        if (ulong.TryParse(value, out var result))
+            return result;
 
-            if (ulong.TryParse(value, out var result))
-                return result;
+        return null;
+    }
 
+    /// <summary>
+    /// Converts the specified string representation of a number to an equivalent 64-bit unsigned integer, using the specified culture-specific formatting information.
+    /// </summary>
+    /// <param name="value">A string that contains the number to convert.</param>
+    /// <param name="provider">An object that supplies culture-specific formatting information.</param>
+    /// <returns>
+    /// A 64-bit unsigned integer that is equivalent to the number in <paramref name="value"/>, or 0 (zero) if <paramref name="value"/> is null.
+    /// </returns>
+    public static ulong? ToUInt64(this string value, IFormatProvider provider)
+    {
+        if (value == null)
             return null;
-        }
 
-        /// <summary>
-        /// Converts the specified string representation of a number to an equivalent 64-bit unsigned integer, using the specified culture-specific formatting information.
-        /// </summary>
-        /// <param name="value">A string that contains the number to convert.</param>
-        /// <param name="provider">An object that supplies culture-specific formatting information.</param>
-        /// <returns>
-        /// A 64-bit unsigned integer that is equivalent to the number in <paramref name="value"/>, or 0 (zero) if <paramref name="value"/> is null.
-        /// </returns>
-        public static ulong? ToUInt64(this string value, IFormatProvider provider)
-        {
-            if (value == null)
-                return null;
+        if (ulong.TryParse(value, NumberStyles.Integer, provider, out var result))
+            return result;
 
-            if (ulong.TryParse(value, NumberStyles.Integer, provider, out var result))
-                return result;
+        return null;
+    }
 
+    /// <summary>
+    /// Converts the specified string to an equivalent <see cref="TimeSpan"/> value.
+    /// </summary>
+    /// <param name="value">The string representation of a <see cref="TimeSpan"/>.</param>
+    /// <returns>
+    /// The <see cref="TimeSpan"/> equivalent of the <paramref name="value"/>, or <see cref="F:System.TimeSpan.Zero"/> if <paramref name="value"/> is null.
+    /// </returns>
+    public static TimeSpan? ToTimeSpan(this string value)
+    {
+        if (value == null)
             return null;
-        }
 
-        /// <summary>
-        /// Converts the specified string to an equivalent <see cref="TimeSpan"/> value.
-        /// </summary>
-        /// <param name="value">The string representation of a <see cref="TimeSpan"/>.</param>
-        /// <returns>
-        /// The <see cref="TimeSpan"/> equivalent of the <paramref name="value"/>, or <see cref="F:System.TimeSpan.Zero"/> if <paramref name="value"/> is null.
-        /// </returns>
-        public static TimeSpan? ToTimeSpan(this string value)
-        {
-            if (value == null)
-                return null;
+        if (TimeSpan.TryParse(value, out var result))
+            return result;
 
-            if (TimeSpan.TryParse(value, out var result))
-                return result;
+        return null;
+    }
 
+    /// <summary>
+    /// Converts the specified string to an equivalent <see cref="Guid"/> value.
+    /// </summary>
+    /// <param name="value">The string representation of a <see cref="Guid"/>.</param>
+    /// <returns>
+    /// The <see cref="Guid"/> equivalent of the <paramref name="value"/>, or <see cref="F:System.Guid.Empty"/> if <paramref name="value"/> is null.
+    /// </returns>
+    public static Guid? ToGuid(this string value)
+    {
+        if (value == null)
             return null;
-        }
 
-        /// <summary>
-        /// Converts the specified string to an equivalent <see cref="Guid"/> value.
-        /// </summary>
-        /// <param name="value">The string representation of a <see cref="Guid"/>.</param>
-        /// <returns>
-        /// The <see cref="Guid"/> equivalent of the <paramref name="value"/>, or <see cref="F:System.Guid.Empty"/> if <paramref name="value"/> is null.
-        /// </returns>
-        public static Guid? ToGuid(this string value)
-        {
-            if (value == null)
-                return null;
+        if (Guid.TryParse(value, out var result))
+            return result;
 
-            if (Guid.TryParse(value, out var result))
-                return result;
+        return null;
+    }
 
-            return null;
-        }
+    /// <summary>
+    /// Try to convert the specified string to the specified type.
+    /// </summary>
+    /// <param name="input">The input string to convert.</param>
+    /// <param name="value">The converted value.</param>
+    /// <returns><c>true</c> if the value is converted; otherwise <c>false</c></returns>
+    public static bool TryConvert<T>(this string input, out T value)
+    {
+        var type = typeof(T);
 
-        /// <summary>
-        /// Try to convert the specified string to the specified type.
-        /// </summary>
-        /// <param name="input">The input string to convert.</param>
-        /// <param name="value">The converted value.</param>
-        /// <returns><c>true</c> if the value is converted; otherwise <c>false</c></returns>
-        public static bool TryConvert<T>(this string input, out T value)
-        {
-            var type = typeof(T);
+        var result = TryConvert(input, type, out var objectType);
+        value = result ? (T)objectType : default(T);
 
-            var result = TryConvert(input, type, out var objectType);
-            value = result ? (T)objectType : default(T);
+        return result;
+    }
 
-            return result;
+    /// <summary>
+    /// Try to convert the specified string to the specified type.
+    /// </summary>
+    /// <param name="input">The input string to convert.</param>
+    /// <param name="type">The type to convert to.</param>
+    /// <param name="value">The converted value.</param>
+    /// <returns><c>true</c> if the value is converted; otherwise <c>false</c></returns>
+    public static bool TryConvert(this string input, Type type, out object value)
+    {
+        // first try string
+        if (type == typeof(string))
+        {
+            value = input;
+            return true;
         }
 
-        /// <summary>
-        /// Try to convert the specified string to the specified type.
-        /// </summary>
-        /// <param name="input">The input string to convert.</param>
-        /// <param name="type">The type to convert to.</param>
-        /// <param name="value">The converted value.</param>
-        /// <returns><c>true</c> if the value is converted; otherwise <c>false</c></returns>
-        public static bool TryConvert(this string input, Type type, out object value)
+        // check nullable
+        if (input == null && type.IsNullable())
         {
-            // first try string
-            if (type == typeof(string))
-            {
-                value = input;
-                return true;
-            }
-
-            // check nullable
-            if (input == null && type.IsNullable())
-            {
-                value = null;
-                return true;
-            }
-
-            Type underlyingType = type.GetUnderlyingType();
-
-            // convert by type
-            if (underlyingType == typeof(bool))
-            {
-                value = input.ToBoolean();
-                return value != null;
-            }
-            if (underlyingType == typeof(byte))
-            {
-                value = input.ToByte();
-                return value != null;
-            }
-            if (underlyingType == typeof(DateTime))
-            {
-                value = input.ToDateTime();
-                return value != null;
-            }
-            if (underlyingType == typeof(decimal))
-            {
-                value = input.ToDecimal();
-                return value != null;
-            }
-            if (underlyingType == typeof(double))
-            {
-                value = input.ToDouble();
-                return value != null;
-            }
-            if (underlyingType == typeof(short))
-            {
-                value = input.ToInt16();
-                return value != null;
-            }
-            if (underlyingType == typeof(int))
-            {
-                value = input.ToInt32();
-                return value != null;
-            }
-            if (underlyingType == typeof(long))
-            {
-                value = input.ToInt64();
-                return value != null;
-            }
-            if (underlyingType == typeof(float))
-            {
-                value = input.ToSingle();
-                return value != null;
-            }
-            if (underlyingType == typeof(ushort))
-            {
-                value = input.ToUInt16();
-                return value != null;
-            }
-            if (underlyingType == typeof(uint))
-            {
-                value = input.ToUInt32();
-                return value != null;
-            }
-            if (underlyingType == typeof(ulong))
-            {
-                value = input.ToUInt64();
-                return value != null;
-            }
-            if (underlyingType == typeof(TimeSpan))
-            {
-                value = input.ToTimeSpan();
-                return value != null;
-            }
-            if (underlyingType == typeof(Guid))
-            {
-                value = input.ToGuid();
-                return value != null;
-            }
-
             value = null;
-            return false;
+            return true;
+        }
+
+        Type underlyingType = type.GetUnderlyingType();
+
+        // convert by type
+        if (underlyingType == typeof(bool))
+        {
+            value = input.ToBoolean();
+            return value != null;
+        }
+        if (underlyingType == typeof(byte))
+        {
+            value = input.ToByte();
+            return value != null;
+        }
+        if (underlyingType == typeof(DateTime))
+        {
+            value = input.ToDateTime();
+            return value != null;
+        }
+        if (underlyingType == typeof(decimal))
+        {
+            value = input.ToDecimal();
+            return value != null;
+        }
+        if (underlyingType == typeof(double))
+        {
+            value = input.ToDouble();
+            return value != null;
+        }
+        if (underlyingType == typeof(short))
+        {
+            value = input.ToInt16();
+            return value != null;
+        }
+        if (underlyingType == typeof(int))
+        {
+            value = input.ToInt32();
+            return value != null;
+        }
+        if (underlyingType == typeof(long))
+        {
+            value = input.ToInt64();
+            return value != null;
+        }
+        if (underlyingType == typeof(float))
+        {
+            value = input.ToSingle();
+            return value != null;
+        }
+        if (underlyingType == typeof(ushort))
+        {
+            value = input.ToUInt16();
+            return value != null;
+        }
+        if (underlyingType == typeof(uint))
+        {
+            value = input.ToUInt32();
+            return value != null;
+        }
+        if (underlyingType == typeof(ulong))
+        {
+            value = input.ToUInt64();
+            return value != null;
+        }
+        if (underlyingType == typeof(TimeSpan))
+        {
+            value = input.ToTimeSpan();
+            return value != null;
+        }
+        if (underlyingType == typeof(Guid))
+        {
+            value = input.ToGuid();
+            return value != null;
         }
 
+        value = null;
+        return false;
     }
+
 }
diff --git a/service/src/InstructorIQ.Core/Extensions/StringExtensions.cs b/service/src/InstructorIQ.Core/Extensions/StringExtensions.cs
index bda27281..1be7ad5e 100644
--- a/service/src/InstructorIQ.Core/Extensions/StringExtensions.cs
+++ b/service/src/InstructorIQ.Core/Extensions/StringExtensions.cs
@@ -5,309 +5,308 @@
 using System.Text;
 using System.Text.RegularExpressions;
 
-namespace InstructorIQ.Core.Extensions
+namespace InstructorIQ.Core.Extensions;
+
+public static class StringExtensions
 {
-    public static class StringExtensions
+    private static readonly Regex _splitNameRegex = new Regex(@"[\W_]+");
+    private static readonly Regex _properWordRegex = new Regex(@"([A-Z][a-z]*)|([0-9]+)");
+
+    /// <summary>
+    /// Truncates the specified text.
+    /// </summary>
+    /// <param name="text">The text to truncate.</param>
+    /// <param name="keep">The number of characters to keep.</param>
+    /// <param name="ellipsis">The ellipsis string to use when truncating. (Default ...)</param>
+    /// <returns>
+    /// A truncate string.
+    /// </returns>
+    public static string Truncate(this string text, int keep, string ellipsis = "...")
     {
-        private static readonly Regex _splitNameRegex = new Regex(@"[\W_]+");
-        private static readonly Regex _properWordRegex = new Regex(@"([A-Z][a-z]*)|([0-9]+)");
-
-        /// <summary>
-        /// Truncates the specified text.
-        /// </summary>
-        /// <param name="text">The text to truncate.</param>
-        /// <param name="keep">The number of characters to keep.</param>
-        /// <param name="ellipsis">The ellipsis string to use when truncating. (Default ...)</param>
-        /// <returns>
-        /// A truncate string.
-        /// </returns>
-        public static string Truncate(this string text, int keep, string ellipsis = "...")
-        {
-            if (string.IsNullOrEmpty(text))
-                return string.Empty;
+        if (string.IsNullOrEmpty(text))
+            return string.Empty;
 
-            if (string.IsNullOrEmpty(ellipsis))
-                ellipsis = string.Empty;
+        if (string.IsNullOrEmpty(ellipsis))
+            ellipsis = string.Empty;
 
-            string buffer = NormalizeLineEndings(text);
-            if (buffer.Length <= keep)
-                return buffer;
+        string buffer = NormalizeLineEndings(text);
+        if (buffer.Length <= keep)
+            return buffer;
 
-            if (buffer.Length <= keep + ellipsis.Length || keep < ellipsis.Length)
-                return buffer.Substring(0, keep);
+        if (buffer.Length <= keep + ellipsis.Length || keep < ellipsis.Length)
+            return buffer.Substring(0, keep);
 
-            return string.Concat(buffer.Substring(0, keep - ellipsis.Length), ellipsis);
-        }
+        return string.Concat(buffer.Substring(0, keep - ellipsis.Length), ellipsis);
+    }
 
 
-        /// <summary>
-        /// Indicates whether the specified String object is null or an empty string
-        /// </summary>
-        /// <param name="item">A String reference</param>
-        /// <returns>
-        ///     <c>true</c> if is null or empty; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool IsNullOrEmpty(this string item)
-        {
-            return string.IsNullOrEmpty(item);
-        }
+    /// <summary>
+    /// Indicates whether the specified String object is null or an empty string
+    /// </summary>
+    /// <param name="item">A String reference</param>
+    /// <returns>
+    ///     <c>true</c> if is null or empty; otherwise, <c>false</c>.
+    /// </returns>
+    public static bool IsNullOrEmpty(this string item)
+    {
+        return string.IsNullOrEmpty(item);
+    }
 
-        /// <summary>
-        /// Indicates whether a specified string is null, empty, or consists only of white-space characters
-        /// </summary>
-        /// <param name="item">A String reference</param>
-        /// <returns>
-        ///      <c>true</c> if is null or empty; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool IsNullOrWhiteSpace(this string item)
-        {
-            if (item == null)
-                return true;
+    /// <summary>
+    /// Indicates whether a specified string is null, empty, or consists only of white-space characters
+    /// </summary>
+    /// <param name="item">A String reference</param>
+    /// <returns>
+    ///      <c>true</c> if is null or empty; otherwise, <c>false</c>.
+    /// </returns>
+    public static bool IsNullOrWhiteSpace(this string item)
+    {
+        if (item == null)
+            return true;
 
-            for (int i = 0; i < item.Length; i++)
-                if (!char.IsWhiteSpace(item[i]))
-                    return false;
+        for (int i = 0; i < item.Length; i++)
+            if (!char.IsWhiteSpace(item[i]))
+                return false;
 
-            return true;
-        }
+        return true;
+    }
 
-        /// <summary>
-        /// Determines whether the specified string is not <see cref="IsNullOrEmpty"/>.
-        /// </summary>
-        /// <param name="value">The value to check.</param>
-        /// <returns>
-        ///   <c>true</c> if the specified <paramref name="value"/> is not <see cref="IsNullOrEmpty"/>; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool HasValue(this string value)
-        {
-            return !string.IsNullOrEmpty(value);
-        }
+    /// <summary>
+    /// Determines whether the specified string is not <see cref="IsNullOrEmpty"/>.
+    /// </summary>
+    /// <param name="value">The value to check.</param>
+    /// <returns>
+    ///   <c>true</c> if the specified <paramref name="value"/> is not <see cref="IsNullOrEmpty"/>; otherwise, <c>false</c>.
+    /// </returns>
+    public static bool HasValue(this string value)
+    {
+        return !string.IsNullOrEmpty(value);
+    }
 
-        /// <summary>
-        /// Does string contain both uppercase and lowercase characters?
-        /// </summary>
-        /// <param name="s">The value.</param>
-        /// <returns>True if contain mixed case.</returns>
-        public static bool IsMixedCase(this string s)
-        {
-            if (s.IsNullOrEmpty())
-                return false;
+    /// <summary>
+    /// Does string contain both uppercase and lowercase characters?
+    /// </summary>
+    /// <param name="s">The value.</param>
+    /// <returns>True if contain mixed case.</returns>
+    public static bool IsMixedCase(this string s)
+    {
+        if (s.IsNullOrEmpty())
+            return false;
 
-            var containsUpper = s.Any(Char.IsUpper);
-            var containsLower = s.Any(Char.IsLower);
+        var containsUpper = s.Any(Char.IsUpper);
+        var containsLower = s.Any(Char.IsLower);
 
-            return containsLower && containsUpper;
-        }
+        return containsLower && containsUpper;
+    }
 
-        /// <summary>
-        /// Converts a string to use camelCase.
-        /// </summary>
-        /// <param name="value">The value.</param>
-        /// <returns>The to camel case. </returns>
-        public static string ToCamelCase(this string value)
-        {
-            if (string.IsNullOrEmpty(value))
-                return value;
+    /// <summary>
+    /// Converts a string to use camelCase.
+    /// </summary>
+    /// <param name="value">The value.</param>
+    /// <returns>The to camel case. </returns>
+    public static string ToCamelCase(this string value)
+    {
+        if (string.IsNullOrEmpty(value))
+            return value;
 
-            string output = ToPascalCase(value);
-            if (output.Length > 2)
-                return char.ToLower(output[0]) + output.Substring(1);
+        string output = ToPascalCase(value);
+        if (output.Length > 2)
+            return char.ToLower(output[0]) + output.Substring(1);
 
-            return output.ToLower();
-        }
+        return output.ToLower();
+    }
 
-        /// <summary>
-        /// Converts a string to use PascalCase.
-        /// </summary>
-        /// <param name="value">Text to convert</param>
-        /// <returns>The string</returns>
-        public static string ToPascalCase(this string value)
-        {
-            return value.ToPascalCase(_splitNameRegex);
-        }
+    /// <summary>
+    /// Converts a string to use PascalCase.
+    /// </summary>
+    /// <param name="value">Text to convert</param>
+    /// <returns>The string</returns>
+    public static string ToPascalCase(this string value)
+    {
+        return value.ToPascalCase(_splitNameRegex);
+    }
 
-        /// <summary>
-        /// Converts a string to use PascalCase.
-        /// </summary>
-        /// <param name="value">Text to convert</param>
-        /// <param name="splitRegex">Regular Expression to split words on.</param>
-        /// <returns>The string</returns>
-        public static string ToPascalCase(this string value, Regex splitRegex)
-        {
-            if (string.IsNullOrEmpty(value))
-                return value;
+    /// <summary>
+    /// Converts a string to use PascalCase.
+    /// </summary>
+    /// <param name="value">Text to convert</param>
+    /// <param name="splitRegex">Regular Expression to split words on.</param>
+    /// <returns>The string</returns>
+    public static string ToPascalCase(this string value, Regex splitRegex)
+    {
+        if (string.IsNullOrEmpty(value))
+            return value;
 
-            var mixedCase = value.IsMixedCase();
-            var names = splitRegex.Split(value);
-            var output = new StringBuilder();
+        var mixedCase = value.IsMixedCase();
+        var names = splitRegex.Split(value);
+        var output = new StringBuilder();
 
-            if (names.Length > 1)
+        if (names.Length > 1)
+        {
+            foreach (string name in names)
             {
-                foreach (string name in names)
+                if (name.Length > 1)
                 {
-                    if (name.Length > 1)
-                    {
-                        output.Append(char.ToUpper(name[0]));
-                        output.Append(mixedCase ? name.Substring(1) : name.Substring(1).ToLower());
-                    }
-                    else
-                    {
-                        output.Append(name);
-                    }
+                    output.Append(char.ToUpper(name[0]));
+                    output.Append(mixedCase ? name.Substring(1) : name.Substring(1).ToLower());
+                }
+                else
+                {
+                    output.Append(name);
                 }
             }
-            else if (value.Length > 1)
-            {
-                output.Append(char.ToUpper(value[0]));
-                output.Append(mixedCase ? value.Substring(1) : value.Substring(1).ToLower());
-            }
-            else
-            {
-                output.Append(value.ToUpper());
-            }
-
-            return output.ToString();
         }
-
-        /// <summary>
-        /// Takes a NameIdentifier and spaces it out into words "Name Identifier".
-        /// </summary>
-        /// <param name="value">The value to convert.</param>
-        /// <returns>The string</returns>
-        public static string ToTitle(this string value)
+        else if (value.Length > 1)
         {
-            if (string.IsNullOrEmpty(value))
-                return value;
-
-            value = ToPascalCase(value);
-
-            var words = _properWordRegex.Matches(value);
-            var spacedName = new StringBuilder();
-            foreach (Match word in words)
-            {
-                if (spacedName.Length > 0)
-                    spacedName.Append(' ');
+            output.Append(char.ToUpper(value[0]));
+            output.Append(mixedCase ? value.Substring(1) : value.Substring(1).ToLower());
+        }
+        else
+        {
+            output.Append(value.ToUpper());
+        }
 
-                spacedName.Append(word.Value);
-            }
+        return output.ToString();
+    }
 
-            return spacedName.ToString();
-        }
+    /// <summary>
+    /// Takes a NameIdentifier and spaces it out into words "Name Identifier".
+    /// </summary>
+    /// <param name="value">The value to convert.</param>
+    /// <returns>The string</returns>
+    public static string ToTitle(this string value)
+    {
+        if (string.IsNullOrEmpty(value))
+            return value;
 
+        value = ToPascalCase(value);
 
-        /// <summary>
-        /// Strips NewLines and Tabs
-        /// </summary>
-        /// <param name="s">The string to strip.</param>
-        /// <returns>Stripped string.</returns>
-        public static string RemoveInvisible(this string s)
+        var words = _properWordRegex.Matches(value);
+        var spacedName = new StringBuilder();
+        foreach (Match word in words)
         {
-            if (string.IsNullOrEmpty(s))
-                return s;
+            if (spacedName.Length > 0)
+                spacedName.Append(' ');
 
-            return s
-                .Replace("\r\n", " ")
-                .Replace('\n', ' ')
-                .Replace('\t', ' ');
+            spacedName.Append(word.Value);
         }
 
-        public static string NormalizeLineEndings(this string text)
-        {
-            if (string.IsNullOrEmpty(text))
-                return string.Empty;
+        return spacedName.ToString();
+    }
 
-            return text
-                .Replace("\r\n", "\n")
-                .Replace("\n", Environment.NewLine);
-        }
 
-        public static string RemoveExtended(this string text)
-        {
-            var buffer = new StringBuilder(text.Length);
-            foreach (var c in text)
-            {
-                var n = Convert.ToUInt16(c);
+    /// <summary>
+    /// Strips NewLines and Tabs
+    /// </summary>
+    /// <param name="s">The string to strip.</param>
+    /// <returns>Stripped string.</returns>
+    public static string RemoveInvisible(this string s)
+    {
+        if (string.IsNullOrEmpty(s))
+            return s;
 
-                if ((n >= 33u) && (n <= 126u))
-                    buffer.Append(c);
-                else if (buffer.Length == 0 || buffer[buffer.Length - 1] != ' ')
-                    buffer.Append(' ');
-            }
+        return s
+            .Replace("\r\n", " ")
+            .Replace('\n', ' ')
+            .Replace('\t', ' ');
+    }
 
-            return buffer.ToString();
-        }
+    public static string NormalizeLineEndings(this string text)
+    {
+        if (string.IsNullOrEmpty(text))
+            return string.Empty;
 
-        /// <summary>
-        /// Appends a copy of the specified string followed by the default line terminator to the end of the StringBuilder object.
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to append to.</param>
-        /// <param name="format">A composite format string.</param>
-        /// <param name="args">An object array that contains zero or more objects to format.</param>
-        public static StringBuilder AppendLine(this StringBuilder sb, string format, params object[] args)
+        return text
+            .Replace("\r\n", "\n")
+            .Replace("\n", Environment.NewLine);
+    }
+
+    public static string RemoveExtended(this string text)
+    {
+        var buffer = new StringBuilder(text.Length);
+        foreach (var c in text)
         {
-            sb.AppendFormat(format, args);
-            sb.AppendLine();
-            return sb;
+            var n = Convert.ToUInt16(c);
+
+            if ((n >= 33u) && (n <= 126u))
+                buffer.Append(c);
+            else if (buffer.Length == 0 || buffer[buffer.Length - 1] != ' ')
+                buffer.Append(' ');
         }
 
-        /// <summary>
-        /// Appends a copy of the specified string if <paramref name="condition"/> is met.
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to append to.</param>
-        /// <param name="text">The string to append.</param>
-        /// <param name="condition">The condition delegate to evaluate. If condition is null, String.IsNullOrWhiteSpace method will be used.</param>
-        public static StringBuilder AppendIf(this StringBuilder sb, string text, Func<string, bool> condition = null)
-        {
-            var c = condition ?? (s => !string.IsNullOrWhiteSpace(s));
+        return buffer.ToString();
+    }
 
-            if (c(text))
-                sb.Append(text);
+    /// <summary>
+    /// Appends a copy of the specified string followed by the default line terminator to the end of the StringBuilder object.
+    /// </summary>
+    /// <param name="sb">The StringBuilder instance to append to.</param>
+    /// <param name="format">A composite format string.</param>
+    /// <param name="args">An object array that contains zero or more objects to format.</param>
+    public static StringBuilder AppendLine(this StringBuilder sb, string format, params object[] args)
+    {
+        sb.AppendFormat(format, args);
+        sb.AppendLine();
+        return sb;
+    }
 
-            return sb;
-        }
+    /// <summary>
+    /// Appends a copy of the specified string if <paramref name="condition"/> is met.
+    /// </summary>
+    /// <param name="sb">The StringBuilder instance to append to.</param>
+    /// <param name="text">The string to append.</param>
+    /// <param name="condition">The condition delegate to evaluate. If condition is null, String.IsNullOrWhiteSpace method will be used.</param>
+    public static StringBuilder AppendIf(this StringBuilder sb, string text, Func<string, bool> condition = null)
+    {
+        var c = condition ?? (s => !string.IsNullOrWhiteSpace(s));
 
-        /// <summary>
-        /// Appends a copy of the specified string if <paramref name="condition"/> is met.
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to append to.</param>
-        /// <param name="text">The string to append.</param>
-        /// <param name="condition">The condition.</param>
-        public static StringBuilder AppendIf(this StringBuilder sb, string text, bool condition)
-        {
-            if (condition)
-                sb.Append(text);
+        if (c(text))
+            sb.Append(text);
 
-            return sb;
-        }
+        return sb;
+    }
 
-        /// <summary>
-        /// Appends a copy of the specified string followed by the default line terminator if <paramref name="condition"/> is met.
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to append to.</param>
-        /// <param name="text">The string to append.</param>
-        /// <param name="condition">The condition delegate to evaluate. If condition is null, String.IsNullOrWhiteSpace method will be used.</param>
-        public static StringBuilder AppendLineIf(this StringBuilder sb, string text, Func<string, bool> condition = null)
-        {
-            var c = condition ?? (s => !string.IsNullOrWhiteSpace(s));
+    /// <summary>
+    /// Appends a copy of the specified string if <paramref name="condition"/> is met.
+    /// </summary>
+    /// <param name="sb">The StringBuilder instance to append to.</param>
+    /// <param name="text">The string to append.</param>
+    /// <param name="condition">The condition.</param>
+    public static StringBuilder AppendIf(this StringBuilder sb, string text, bool condition)
+    {
+        if (condition)
+            sb.Append(text);
 
-            if (c(text))
-                sb.AppendLine(text);
+        return sb;
+    }
 
-            return sb;
-        }
+    /// <summary>
+    /// Appends a copy of the specified string followed by the default line terminator if <paramref name="condition"/> is met.
+    /// </summary>
+    /// <param name="sb">The StringBuilder instance to append to.</param>
+    /// <param name="text">The string to append.</param>
+    /// <param name="condition">The condition delegate to evaluate. If condition is null, String.IsNullOrWhiteSpace method will be used.</param>
+    public static StringBuilder AppendLineIf(this StringBuilder sb, string text, Func<string, bool> condition = null)
+    {
+        var c = condition ?? (s => !string.IsNullOrWhiteSpace(s));
 
+        if (c(text))
+            sb.AppendLine(text);
 
-        public static string ComputeHash(this string value)
-        {
-            byte[] bytes = Encoding.ASCII.GetBytes(value);
-            byte[] hashBytes;
+        return sb;
+    }
 
-            using (var sha = SHA512.Create())
-                hashBytes = sha.ComputeHash(bytes);
 
-            var hash = Convert.ToBase64String(hashBytes);
+    public static string ComputeHash(this string value)
+    {
+        byte[] bytes = Encoding.ASCII.GetBytes(value);
+        byte[] hashBytes;
 
-            return hash;
-        }
+        using (var sha = SHA512.Create())
+            hashBytes = sha.ComputeHash(bytes);
+
+        var hash = Convert.ToBase64String(hashBytes);
+
+        return hash;
     }
 }
diff --git a/service/src/InstructorIQ.Core/Extensions/TypeExtensions.cs b/service/src/InstructorIQ.Core/Extensions/TypeExtensions.cs
index a218ad32..819aa01f 100644
--- a/service/src/InstructorIQ.Core/Extensions/TypeExtensions.cs
+++ b/service/src/InstructorIQ.Core/Extensions/TypeExtensions.cs
@@ -1,60 +1,59 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Text;
 
-namespace InstructorIQ.Core.Extensions
+namespace InstructorIQ.Core.Extensions;
+
+public static class TypeExtensions
 {
-    public static class TypeExtensions
+    /// <summary>
+    /// Gets the underlying type dealing with <see cref="T:Nullable`1"/>.
+    /// </summary>
+    /// <param name="type">The type.</param>
+    /// <returns>Returns a type dealing with <see cref="T:Nullable`1"/>.</returns>
+    public static Type GetUnderlyingType(this Type type)
+    {
+        if (type == null)
+            throw new ArgumentNullException("type");
+
+        Type t = type;
+        bool isNullable = t.IsGenericType && (t.GetGenericTypeDefinition() == typeof(Nullable<>));
+        if (isNullable)
+            return Nullable.GetUnderlyingType(t);
+
+        return t;
+    }
+
+    /// <summary>
+    /// Determines whether the specified <paramref name="type"/> can be null.
+    /// </summary>
+    /// <param name="type">The type to check.</param>
+    /// <returns>
+    ///   <c>true</c> if the specified <paramref name="type"/> can be null; otherwise, <c>false</c>.
+    /// </returns>
+    public static bool IsNullable(this Type type)
     {
-        /// <summary>
-        /// Gets the underlying type dealing with <see cref="T:Nullable`1"/>.
-        /// </summary>
-        /// <param name="type">The type.</param>
-        /// <returns>Returns a type dealing with <see cref="T:Nullable`1"/>.</returns>
-        public static Type GetUnderlyingType(this Type type)
-        {
-            if (type == null)
-                throw new ArgumentNullException("type");
-
-            Type t = type;
-            bool isNullable = t.IsGenericType && (t.GetGenericTypeDefinition() == typeof(Nullable<>));
-            if (isNullable)
-                return Nullable.GetUnderlyingType(t);
-
-            return t;
-        }
-
-        /// <summary>
-        /// Determines whether the specified <paramref name="type"/> can be null.
-        /// </summary>
-        /// <param name="type">The type to check.</param>
-        /// <returns>
-        ///   <c>true</c> if the specified <paramref name="type"/> can be null; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool IsNullable(this Type type)
-        {
-            if (!type.IsValueType)
-                return true;
-
-            return type.IsGenericType && (type.GetGenericTypeDefinition() == typeof(Nullable<>));
-        }
-
-        /// <summary>
-        /// Determines whether the specified type implements an interface.
-        /// </summary>
-        /// <typeparam name="TInterface">The type of the interface.</typeparam>
-        /// <param name="type">The type to check.</param>
-        /// <returns><c>true</c> if type implements the interface; otherwise <c>false</c></returns>
-        /// <exception cref="InvalidOperationException">Only interfaces can be implemented.</exception>
-        public static bool Implements<TInterface>(this Type type)
-            where TInterface : class
-        {
-            var interfaceType = typeof(TInterface);
-
-            if (!interfaceType.IsInterface)
-                throw new InvalidOperationException("Only interfaces can be implemented.");
-
-            return interfaceType.IsAssignableFrom(type);
-        }
+        if (!type.IsValueType)
+            return true;
+
+        return type.IsGenericType && (type.GetGenericTypeDefinition() == typeof(Nullable<>));
+    }
+
+    /// <summary>
+    /// Determines whether the specified type implements an interface.
+    /// </summary>
+    /// <typeparam name="TInterface">The type of the interface.</typeparam>
+    /// <param name="type">The type to check.</param>
+    /// <returns><c>true</c> if type implements the interface; otherwise <c>false</c></returns>
+    /// <exception cref="InvalidOperationException">Only interfaces can be implemented.</exception>
+    public static bool Implements<TInterface>(this Type type)
+        where TInterface : class
+    {
+        var interfaceType = typeof(TInterface);
+
+        if (!interfaceType.IsInterface)
+            throw new InvalidOperationException("Only interfaces can be implemented.");
+
+        return interfaceType.IsAssignableFrom(type);
     }
 }
diff --git a/service/src/InstructorIQ.Core/Extensions/UriExtensions.cs b/service/src/InstructorIQ.Core/Extensions/UriExtensions.cs
index bb2dcbd4..b2432fba 100644
--- a/service/src/InstructorIQ.Core/Extensions/UriExtensions.cs
+++ b/service/src/InstructorIQ.Core/Extensions/UriExtensions.cs
@@ -1,18 +1,17 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Text;
 
-namespace InstructorIQ.Core.Extensions
+namespace InstructorIQ.Core.Extensions;
+
+public static class UriExtensions
 {
-    public static class UriExtensions
+    public static string ToLocalPath(this Uri uri)
     {
-        public static string ToLocalPath(this Uri uri)
-        {
-            if (!uri.IsAbsoluteUri)
-                return uri.ToString();
-            
+        if (!uri.IsAbsoluteUri)
+            return uri.ToString();
+
 
-            return uri.PathAndQuery + uri.Fragment;
-        }
+        return uri.PathAndQuery + uri.Fragment;
     }
 }
diff --git a/service/src/InstructorIQ.Core/InstructorIQ.Core.csproj b/service/src/InstructorIQ.Core/InstructorIQ.Core.csproj
index 5f493ae2..b480cef1 100644
--- a/service/src/InstructorIQ.Core/InstructorIQ.Core.csproj
+++ b/service/src/InstructorIQ.Core/InstructorIQ.Core.csproj
@@ -15,29 +15,30 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="AngleSharp" Version="0.17.1" />
-    <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.0" />
-    <PackageReference Include="Azure.Storage.Blobs" Version="12.14.1" />
+    <PackageReference Include="AngleSharp" Version="1.0.1" />
+    <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
+    <PackageReference Include="Azure.Data.Tables" Version="12.8.0" />
+    <PackageReference Include="Azure.Storage.Blobs" Version="12.15.1" />
     <PackageReference Include="CsvHelper" Version="30.0.1" />
     <PackageReference Include="EntityChange" Version="5.0.21" />
-    <PackageReference Include="FluentCommand.SqlServer" Version="10.0.637" />
-    <PackageReference Include="Handlebars.Net" Version="2.1.2" />
-    <PackageReference Include="Injectio" Version="2.0.43" PrivateAssets="all" />
-    <PackageReference Include="MailKit" Version="3.4.3" />
+    <PackageReference Include="FluentCommand.SqlServer" Version="10.0.707" />
+    <PackageReference Include="Handlebars.Net" Version="2.1.4" />
+    <PackageReference Include="MailKit" Version="3.6.0" />
     <PackageReference Include="MediatR.CommandQuery.Audit" Version="12.0.919" />
     <PackageReference Include="MediatR.CommandQuery.EntityFrameworkCore" Version="12.0.919" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="7.0.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.5" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.RazorPages" Version="2.2.5" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.ViewFeatures" Version="2.2.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="7.0.4" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.4" />
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="7.0.0" />
     <PackageReference Include="NaturalSort.Extension" Version="4.0.0" />
     <PackageReference Include="SendGrid" Version="9.28.1" />
     <PackageReference Include="SendGrid.Extensions.DependencyInjection" Version="1.0.1" />
-    <PackageReference Include="System.Text.Json" Version="7.0.1" />
+    <PackageReference Include="System.Text.Json" Version="7.0.2" />
     <PackageReference Include="UAParser" Version="3.1.47" />
-    <PackageReference Include="YamlDotNet" Version="12.3.1" />
+    <PackageReference Include="YamlDotNet" Version="13.0.2" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <FrameworkReference Include="Microsoft.AspNetCore.App" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/service/src/InstructorIQ.Core/Jobs/DatabaseOneTimeJobBase.cs b/service/src/InstructorIQ.Core/Jobs/DatabaseOneTimeJobBase.cs
index e7cddf10..7f34314e 100644
--- a/service/src/InstructorIQ.Core/Jobs/DatabaseOneTimeJobBase.cs
+++ b/service/src/InstructorIQ.Core/Jobs/DatabaseOneTimeJobBase.cs
@@ -1,17 +1,17 @@
-using InstructorIQ.Core.Data;
+using InstructorIQ.Core.Data;
+
 using Microsoft.Extensions.Logging;
 
-namespace InstructorIQ.Core.Jobs
+namespace InstructorIQ.Core.Jobs;
+
+public abstract class DatabaseOneTimeJobBase : OneTimeJobBase
 {
-    public abstract class DatabaseOneTimeJobBase : OneTimeJobBase
-    {
 
-        protected InstructorIQContext DataContext { get; }
+    protected InstructorIQContext DataContext { get; }
 
-        protected DatabaseOneTimeJobBase(ILoggerFactory loggerFactory, InstructorIQContext dataContext)
-            : base(loggerFactory)
-        {
-            DataContext = dataContext;
-        }
+    protected DatabaseOneTimeJobBase(ILoggerFactory loggerFactory, InstructorIQContext dataContext)
+        : base(loggerFactory)
+    {
+        DataContext = dataContext;
     }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.Core/Jobs/IOneTimeJob.cs b/service/src/InstructorIQ.Core/Jobs/IOneTimeJob.cs
index 01c23dd5..b2b49ded 100644
--- a/service/src/InstructorIQ.Core/Jobs/IOneTimeJob.cs
+++ b/service/src/InstructorIQ.Core/Jobs/IOneTimeJob.cs
@@ -1,12 +1,11 @@
-using System;
+using System;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace InstructorIQ.Core.Jobs
+namespace InstructorIQ.Core.Jobs;
+
+public interface IOneTimeJob
 {
-    public interface IOneTimeJob
-    {
-        Guid Id { get; }
-        Task ExecuteAsync(CancellationToken stoppingToken);
-    }
-}
\ No newline at end of file
+    Guid Id { get; }
+    Task ExecuteAsync(CancellationToken stoppingToken);
+}
diff --git a/service/src/InstructorIQ.Core/Jobs/JobServiceModule.cs b/service/src/InstructorIQ.Core/Jobs/JobServiceModule.cs
index 45b3b3e5..d1fca62a 100644
--- a/service/src/InstructorIQ.Core/Jobs/JobServiceModule.cs
+++ b/service/src/InstructorIQ.Core/Jobs/JobServiceModule.cs
@@ -2,15 +2,14 @@
 
 using Microsoft.Extensions.DependencyInjection;
 
-namespace InstructorIQ.Core.Jobs
+namespace InstructorIQ.Core.Jobs;
+
+public class JobServiceModule
 {
-    public class JobServiceModule
-    {
 
-        [RegisterServices]
-        public void Register(IServiceCollection services)
-        {
-            services.AddTransient<IOneTimeJob, TopicSummaryOneTimeJob>();
-        }
+    [RegisterServices]
+    public void Register(IServiceCollection services)
+    {
+        services.AddTransient<IOneTimeJob, TopicSummaryOneTimeJob>();
     }
 }
diff --git a/service/src/InstructorIQ.Core/Jobs/OneTimeJobBase.cs b/service/src/InstructorIQ.Core/Jobs/OneTimeJobBase.cs
index 67e45575..dc57a44b 100644
--- a/service/src/InstructorIQ.Core/Jobs/OneTimeJobBase.cs
+++ b/service/src/InstructorIQ.Core/Jobs/OneTimeJobBase.cs
@@ -1,43 +1,43 @@
-using System;
+using System;
 using System.Diagnostics;
 using System.Threading;
 using System.Threading.Tasks;
+
 using Microsoft.Extensions.Logging;
 
-namespace InstructorIQ.Core.Jobs
+namespace InstructorIQ.Core.Jobs;
+
+public abstract class OneTimeJobBase : IOneTimeJob
 {
-    public abstract class OneTimeJobBase : IOneTimeJob
+    protected OneTimeJobBase(ILoggerFactory loggerFactory)
     {
-        protected OneTimeJobBase(ILoggerFactory loggerFactory)
-        {
-            Logger = loggerFactory.CreateLogger(GetType());
-        }
+        Logger = loggerFactory.CreateLogger(GetType());
+    }
+
+    protected ILogger Logger { get; }
 
-        protected ILogger Logger { get; }
+    public abstract Guid Id { get; }
 
-        public abstract Guid Id { get; }
+    public virtual async Task ExecuteAsync(CancellationToken cancellationToken)
+    {
+        var jobType = GetType().Name;
 
-        public virtual async Task ExecuteAsync(CancellationToken cancellationToken)
+        try
         {
-            var jobType = GetType().Name;
-
-            try
-            {
-                Logger.LogTrace("Processing one-time job '{jobType}' ...", jobType);
-                var watch = Stopwatch.StartNew();
-
-                await ProcessAsync(cancellationToken).ConfigureAwait(false);
-
-                watch.Stop();
-                Logger.LogTrace("Processed one-time job '{jobType}': {elapsed} ms", jobType, watch.ElapsedMilliseconds);
-            }
-            catch (Exception ex)
-            {
-                Logger.LogError(ex, "Error processing one-time job '{jobType}': {errorMessage}", jobType, ex.Message);
-                throw;
-            }
-        }
+            Logger.LogTrace("Processing one-time job '{jobType}' ...", jobType);
+            var watch = Stopwatch.StartNew();
+
+            await ProcessAsync(cancellationToken).ConfigureAwait(false);
 
-        public abstract Task ProcessAsync(CancellationToken cancellationToken);
+            watch.Stop();
+            Logger.LogTrace("Processed one-time job '{jobType}': {elapsed} ms", jobType, watch.ElapsedMilliseconds);
+        }
+        catch (Exception ex)
+        {
+            Logger.LogError(ex, "Error processing one-time job '{jobType}': {errorMessage}", jobType, ex.Message);
+            throw;
+        }
     }
+
+    public abstract Task ProcessAsync(CancellationToken cancellationToken);
 }
diff --git a/service/src/InstructorIQ.Core/Jobs/TopicSummaryOneTimeJob.cs b/service/src/InstructorIQ.Core/Jobs/TopicSummaryOneTimeJob.cs
index 44004597..f7dcc24b 100644
--- a/service/src/InstructorIQ.Core/Jobs/TopicSummaryOneTimeJob.cs
+++ b/service/src/InstructorIQ.Core/Jobs/TopicSummaryOneTimeJob.cs
@@ -1,52 +1,53 @@
-using System;
+using System;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+
 using InstructorIQ.Core.Data;
 using InstructorIQ.Core.Extensions;
 using InstructorIQ.Core.Services;
+
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 
-namespace InstructorIQ.Core.Jobs
+namespace InstructorIQ.Core.Jobs;
+
+public class TopicSummaryOneTimeJob : DatabaseOneTimeJobBase
 {
-    public class TopicSummaryOneTimeJob : DatabaseOneTimeJobBase
+    private readonly IHtmlService _htmlService;
+
+    public TopicSummaryOneTimeJob(ILoggerFactory loggerFactory, InstructorIQContext dataContext, IHtmlService htmlService)
+        : base(loggerFactory, dataContext)
     {
-        private readonly IHtmlService _htmlService;
+        _htmlService = htmlService;
+    }
 
-        public TopicSummaryOneTimeJob(ILoggerFactory loggerFactory, InstructorIQContext dataContext, IHtmlService htmlService)
-            : base(loggerFactory, dataContext)
-        {
-            _htmlService = htmlService;
-        }
+    public override Guid Id { get; } = new Guid("051b8ec8-0c05-4b16-bb6e-730659a2e62c");
 
-        public override Guid Id { get; } = new Guid("051b8ec8-0c05-4b16-bb6e-730659a2e62c");
+    public override async Task ProcessAsync(CancellationToken stoppingToken)
+    {
+        var topics = await DataContext.Topics
+            .Where(p => p.Summary == null || p.Summary.Length == 0)
+            .Where(p => p.Description != null || p.Description.Length > 1)
+            .ToListAsync(stoppingToken);
 
-        public override async Task ProcessAsync(CancellationToken stoppingToken)
+        // fix topic summary text
+        foreach (var topic in topics)
         {
-            var topics = await DataContext.Topics
-                .Where(p => p.Summary == null || p.Summary.Length == 0)
-                .Where(p => p.Description != null || p.Description.Length > 1)
-                .ToListAsync(stoppingToken);
-
-            // fix topic summary text
-            foreach (var topic in topics)
-            {
-                if (topic.Summary.HasValue())
-                    continue;
+            if (topic.Summary.HasValue())
+                continue;
 
-                if (topic.Description.IsNullOrWhiteSpace())
-                    continue;
+            if (topic.Description.IsNullOrWhiteSpace())
+                continue;
 
-                var summary = _htmlService
-                    .PlainText(topic.Description)
-                    .RemoveExtended()
-                    .Truncate(256);
+            var summary = _htmlService
+                .PlainText(topic.Description)
+                .RemoveExtended()
+                .Truncate(256);
 
-                topic.Summary = summary;
+            topic.Summary = summary;
 
-                await DataContext.SaveChangesAsync(stoppingToken);
-            }
+            await DataContext.SaveChangesAsync(stoppingToken);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.Core/Models/EmailModelBase.cs b/service/src/InstructorIQ.Core/Models/EmailModelBase.cs
index 4adb7126..9b727e25 100644
--- a/service/src/InstructorIQ.Core/Models/EmailModelBase.cs
+++ b/service/src/InstructorIQ.Core/Models/EmailModelBase.cs
@@ -1,16 +1,15 @@
-using System;
+using System;
 
 // ReSharper disable once CheckNamespace
-namespace InstructorIQ.Core.Models
+namespace InstructorIQ.Core.Models;
+
+public abstract class EmailModelBase : UserAgentModel, IEmailRecipient, IEmailReplyTo
 {
-    public abstract class EmailModelBase : UserAgentModel, IEmailRecipient, IEmailReplyTo
-    {
-        public string RecipientName { get; set; }
-        public string RecipientAddress { get; set; }
+    public string RecipientName { get; set; }
+    public string RecipientAddress { get; set; }
+
+    public string ReplyToName { get; set; }
+    public string ReplyToAddress { get; set; }
 
-        public string ReplyToName { get; set; }
-        public string ReplyToAddress { get; set; }
-        
-        public string Link { get; set; }
-    }
-}
\ No newline at end of file
+    public string Link { get; set; }
+}
diff --git a/service/src/InstructorIQ.Core/Models/IEmailRecipient.cs b/service/src/InstructorIQ.Core/Models/IEmailRecipient.cs
index 8dd678dd..851d4917 100644
--- a/service/src/InstructorIQ.Core/Models/IEmailRecipient.cs
+++ b/service/src/InstructorIQ.Core/Models/IEmailRecipient.cs
@@ -1,8 +1,7 @@
-namespace InstructorIQ.Core.Models
+namespace InstructorIQ.Core.Models;
+
+public interface IEmailRecipient
 {
-    public interface IEmailRecipient
-    {
-        string RecipientName { get; set; }
-        string RecipientAddress { get; set; }
-    }
-}
\ No newline at end of file
+    string RecipientName { get; set; }
+    string RecipientAddress { get; set; }
+}
diff --git a/service/src/InstructorIQ.Core/Models/IEmailReplyTo.cs b/service/src/InstructorIQ.Core/Models/IEmailReplyTo.cs
index dc6e0631..e428c7ff 100644
--- a/service/src/InstructorIQ.Core/Models/IEmailReplyTo.cs
+++ b/service/src/InstructorIQ.Core/Models/IEmailReplyTo.cs
@@ -1,8 +1,7 @@
-namespace InstructorIQ.Core.Models
+namespace InstructorIQ.Core.Models;
+
+public interface IEmailReplyTo
 {
-    public interface IEmailReplyTo
-    {
-        string ReplyToName { get; set; }
-        string ReplyToAddress { get; set; }
-    }
-}
\ No newline at end of file
+    string ReplyToName { get; set; }
+    string ReplyToAddress { get; set; }
+}
diff --git a/service/src/InstructorIQ.Core/Models/IUserAgentModel.cs b/service/src/InstructorIQ.Core/Models/IUserAgentModel.cs
index 9fc151b6..a1ee6bd5 100644
--- a/service/src/InstructorIQ.Core/Models/IUserAgentModel.cs
+++ b/service/src/InstructorIQ.Core/Models/IUserAgentModel.cs
@@ -1,15 +1,14 @@
-using System;
+using System;
 
-namespace InstructorIQ.Core.Models
+namespace InstructorIQ.Core.Models;
+
+public interface IUserAgentModel
 {
-    public interface IUserAgentModel
-    {
-        string UserAgent { get; set; }
-        string Browser { get; set; }
-        string OperatingSystem { get; set; }
-        string DeviceFamily { get; set; }
-        string DeviceBrand { get; set; }
-        string DeviceModel { get; set; }
-        string IpAddress { get; set; }
-    }
-}
\ No newline at end of file
+    string UserAgent { get; set; }
+    string Browser { get; set; }
+    string OperatingSystem { get; set; }
+    string DeviceFamily { get; set; }
+    string DeviceBrand { get; set; }
+    string DeviceModel { get; set; }
+    string IpAddress { get; set; }
+}
diff --git a/service/src/InstructorIQ.Core/Models/SessionQueryState.cs b/service/src/InstructorIQ.Core/Models/SessionQueryState.cs
index fefc2ffc..83db1082 100644
--- a/service/src/InstructorIQ.Core/Models/SessionQueryState.cs
+++ b/service/src/InstructorIQ.Core/Models/SessionQueryState.cs
@@ -1,19 +1,18 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Text;
 
-namespace InstructorIQ.Core.Models
+namespace InstructorIQ.Core.Models;
+
+public class SessionQueryState
 {
-    public class SessionQueryState
-    {
-        public int? Year { get; set; }
+    public int? Year { get; set; }
 
-        public int? Month { get; set; }
+    public int? Month { get; set; }
 
-        public string Query { get; set; }
+    public string Query { get; set; }
 
-        public Guid? TopicId { get; set; }
+    public Guid? TopicId { get; set; }
 
-        public string UserName { get; set; }
-    }
+    public string UserName { get; set; }
 }
diff --git a/service/src/InstructorIQ.Core/Models/SummaryReportEmail.cs b/service/src/InstructorIQ.Core/Models/SummaryReportEmail.cs
index cc77ae97..58a97228 100644
--- a/service/src/InstructorIQ.Core/Models/SummaryReportEmail.cs
+++ b/service/src/InstructorIQ.Core/Models/SummaryReportEmail.cs
@@ -1,22 +1,21 @@
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 
-namespace InstructorIQ.Core.Models
+namespace InstructorIQ.Core.Models;
+
+public class SummaryReportEmail : IEmailRecipient, IEmailReplyTo
 {
-    public class SummaryReportEmail : IEmailRecipient, IEmailReplyTo
-    {
-        [Required]
-        public string RecipientAddress { get; set; }
-        public string RecipientName { get; set; }
-        
-        [Required]
-        public string ReplyToAddress { get; set; }
-        public string ReplyToName { get; set; }
-        
-        [Required]
-        public string Subject { get; set; }
-        
-        public string TextBody { get; set; }
+    [Required]
+    public string RecipientAddress { get; set; }
+    public string RecipientName { get; set; }
+
+    [Required]
+    public string ReplyToAddress { get; set; }
+    public string ReplyToName { get; set; }
+
+    [Required]
+    public string Subject { get; set; }
+
+    public string TextBody { get; set; }
 
-        public string HtmlBody { get; set; }
-    }
+    public string HtmlBody { get; set; }
 }
diff --git a/service/src/InstructorIQ.Core/Models/SummaryReportModel.cs b/service/src/InstructorIQ.Core/Models/SummaryReportModel.cs
index 9c3ca537..76d5687d 100644
--- a/service/src/InstructorIQ.Core/Models/SummaryReportModel.cs
+++ b/service/src/InstructorIQ.Core/Models/SummaryReportModel.cs
@@ -1,22 +1,21 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 
-namespace InstructorIQ.Core.Models
+namespace InstructorIQ.Core.Models;
+
+public class SummaryReportModel
 {
-    public class SummaryReportModel
-    {
-        [Required]
-        public List<string> Recipients { get; set; } = new List<string>();
+    [Required]
+    public List<string> Recipients { get; set; } = new List<string>();
 
-        [Required]
-        public string ReplyToAddress { get; set; }
-        public string ReplyToName { get; set; }
+    [Required]
+    public string ReplyToAddress { get; set; }
+    public string ReplyToName { get; set; }
 
-        [Required]
-        public string Subject { get; set; }
+    [Required]
+    public string Subject { get; set; }
 
-        public string TextBody { get; set; }
+    public string TextBody { get; set; }
 
-        public string HtmlBody { get; set; }
-    }
-}
\ No newline at end of file
+    public string HtmlBody { get; set; }
+}
diff --git a/service/src/InstructorIQ.Core/Models/UpdateLessonPlanEmail.cs b/service/src/InstructorIQ.Core/Models/UpdateLessonPlanEmail.cs
index f5e5b2c5..383cd3d8 100644
--- a/service/src/InstructorIQ.Core/Models/UpdateLessonPlanEmail.cs
+++ b/service/src/InstructorIQ.Core/Models/UpdateLessonPlanEmail.cs
@@ -1,13 +1,12 @@
-namespace InstructorIQ.Core.Models
+namespace InstructorIQ.Core.Models;
+
+public class UpdateLessonPlanEmail : EmailModelBase
 {
-    public class UpdateLessonPlanEmail : EmailModelBase
-    {
-        public string InstructorName { get; set; }
+    public string InstructorName { get; set; }
 
-        public string SenderName { get; set; }
+    public string SenderName { get; set; }
 
-        public string SenderEmailAddress { get; set; }
+    public string SenderEmailAddress { get; set; }
 
-        public string TopicTitle { get; set; }
-    }
-}
\ No newline at end of file
+    public string TopicTitle { get; set; }
+}
diff --git a/service/src/InstructorIQ.Core/Models/UserAgentModel.cs b/service/src/InstructorIQ.Core/Models/UserAgentModel.cs
index 5b5f48cb..a57b2549 100644
--- a/service/src/InstructorIQ.Core/Models/UserAgentModel.cs
+++ b/service/src/InstructorIQ.Core/Models/UserAgentModel.cs
@@ -1,19 +1,18 @@
-using System;
+using System;
 
-namespace InstructorIQ.Core.Models
+namespace InstructorIQ.Core.Models;
+
+public class UserAgentModel : IUserAgentModel
 {
-    public class UserAgentModel : IUserAgentModel
-    {
-        public string UserAgent { get; set; }
+    public string UserAgent { get; set; }
 
-        public string Browser { get; set; }
-        public string OperatingSystem { get; set; }
+    public string Browser { get; set; }
+    public string OperatingSystem { get; set; }
 
-        public string DeviceFamily { get; set; }
-        public string DeviceBrand { get; set; }
-        public string DeviceModel { get; set; }
+    public string DeviceFamily { get; set; }
+    public string DeviceBrand { get; set; }
+    public string DeviceModel { get; set; }
 
-        public string IpAddress { get; set; }
+    public string IpAddress { get; set; }
 
-    }
 }
diff --git a/service/src/InstructorIQ.Core/Models/UserInviteEmail.cs b/service/src/InstructorIQ.Core/Models/UserInviteEmail.cs
index d9da39d0..936eda62 100644
--- a/service/src/InstructorIQ.Core/Models/UserInviteEmail.cs
+++ b/service/src/InstructorIQ.Core/Models/UserInviteEmail.cs
@@ -1,12 +1,11 @@
-using System;
+using System;
 
-namespace InstructorIQ.Core.Models
+namespace InstructorIQ.Core.Models;
+
+public class UserInviteEmail : EmailModelBase
 {
-    public class UserInviteEmail : EmailModelBase
-    {
-        public string TenantName { get; set; }
+    public string TenantName { get; set; }
 
-        public string SenderName { get; set; }
-        public string SenderEmail { get; set; }
-    }
-}
\ No newline at end of file
+    public string SenderName { get; set; }
+    public string SenderEmail { get; set; }
+}
diff --git a/service/src/InstructorIQ.Core/Models/UserInviteModel.cs b/service/src/InstructorIQ.Core/Models/UserInviteModel.cs
index 608dbe04..521d133e 100644
--- a/service/src/InstructorIQ.Core/Models/UserInviteModel.cs
+++ b/service/src/InstructorIQ.Core/Models/UserInviteModel.cs
@@ -1,9 +1,8 @@
-namespace InstructorIQ.Core.Models
+namespace InstructorIQ.Core.Models;
+
+public class UserInviteModel : UserAgentModel
 {
-    public class UserInviteModel : UserAgentModel
-    {
-        public Data.Entities.User User { get; set; }
+    public Data.Entities.User User { get; set; }
 
-        public string ReturnUrl { get; set; }
-    }
-}
\ No newline at end of file
+    public string ReturnUrl { get; set; }
+}
diff --git a/service/src/InstructorIQ.Core/Models/UserLinkEmail.cs b/service/src/InstructorIQ.Core/Models/UserLinkEmail.cs
index 2e91cf4c..cd4587a5 100644
--- a/service/src/InstructorIQ.Core/Models/UserLinkEmail.cs
+++ b/service/src/InstructorIQ.Core/Models/UserLinkEmail.cs
@@ -1,23 +1,22 @@
-namespace InstructorIQ.Core.Models
+namespace InstructorIQ.Core.Models;
+
+public class UserLinkEmail : IEmailRecipient, IEmailReplyTo
 {
-    public class UserLinkEmail: IEmailRecipient, IEmailReplyTo
-    {
-        public string RecipientName { get; set; }
+    public string RecipientName { get; set; }
 
-        public string RecipientAddress { get; set; }
+    public string RecipientAddress { get; set; }
 
-        public string ReplyToAddress { get; set; }
+    public string ReplyToAddress { get; set; }
 
-        public string ReplyToName { get; set; }
+    public string ReplyToName { get; set; }
 
-        public string Subject { get; set; }
+    public string Subject { get; set; }
 
-        public string TextBody { get; set; }
+    public string TextBody { get; set; }
 
-        public string HtmlBody { get; set; }
+    public string HtmlBody { get; set; }
 
-        public string LinkUrl { get; set; }
+    public string LinkUrl { get; set; }
 
-        public string LinkText { get; set; }
-    }
-}
\ No newline at end of file
+    public string LinkText { get; set; }
+}
diff --git a/service/src/InstructorIQ.Core/Models/UserLinkModel.cs b/service/src/InstructorIQ.Core/Models/UserLinkModel.cs
index 9f58bdf1..e218bc78 100644
--- a/service/src/InstructorIQ.Core/Models/UserLinkModel.cs
+++ b/service/src/InstructorIQ.Core/Models/UserLinkModel.cs
@@ -1,26 +1,25 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 
-namespace InstructorIQ.Core.Models
+namespace InstructorIQ.Core.Models;
+
+public class UserLinkModel
 {
-    public class UserLinkModel
-    {
-        [Required]
-        public List<string> Recipients { get; set; } = new List<string>();
+    [Required]
+    public List<string> Recipients { get; set; } = new List<string>();
 
-        public string ReplyToName { get; set; }
+    public string ReplyToName { get; set; }
 
-        public string ReplyToAddress { get; set; }
+    public string ReplyToAddress { get; set; }
 
-        [Required]
-        public string Subject { get; set; }
+    [Required]
+    public string Subject { get; set; }
 
-        public string TextBody { get; set; }
+    public string TextBody { get; set; }
 
-        public string HtmlBody { get; set; }
+    public string HtmlBody { get; set; }
 
-        public string LinkUrl { get; set; }
+    public string LinkUrl { get; set; }
 
-        public string LinkText { get; set; }
-    }
-}
\ No newline at end of file
+    public string LinkText { get; set; }
+}
diff --git a/service/src/InstructorIQ.Core/Models/UserPasswordlessEmail.cs b/service/src/InstructorIQ.Core/Models/UserPasswordlessEmail.cs
index 95716196..79c5ffb8 100644
--- a/service/src/InstructorIQ.Core/Models/UserPasswordlessEmail.cs
+++ b/service/src/InstructorIQ.Core/Models/UserPasswordlessEmail.cs
@@ -1,9 +1,8 @@
-using System;
+using System;
 
-namespace InstructorIQ.Core.Models
+namespace InstructorIQ.Core.Models;
+
+public class UserPasswordlessEmail : EmailModelBase
 {
-    public class UserPasswordlessEmail : EmailModelBase
-    {
-        public int ExpireHours { get; set; } = 4;
-    }
-}
\ No newline at end of file
+    public int ExpireHours { get; set; } = 4;
+}
diff --git a/service/src/InstructorIQ.Core/Models/UserResetPasswordEmail.cs b/service/src/InstructorIQ.Core/Models/UserResetPasswordEmail.cs
index bbef4e70..904d815e 100644
--- a/service/src/InstructorIQ.Core/Models/UserResetPasswordEmail.cs
+++ b/service/src/InstructorIQ.Core/Models/UserResetPasswordEmail.cs
@@ -1,9 +1,8 @@
-using System;
+using System;
 
-namespace InstructorIQ.Core.Models
+namespace InstructorIQ.Core.Models;
+
+public class UserResetPasswordEmail : EmailModelBase
 {
-    public class UserResetPasswordEmail : EmailModelBase
-    {
-        public int ExpireHours { get; set; } = 24;
-    }
-}
\ No newline at end of file
+    public int ExpireHours { get; set; } = 24;
+}
diff --git a/service/src/InstructorIQ.Core/Multitenancy/ApplicationBuilderExtensions.cs b/service/src/InstructorIQ.Core/Multitenancy/ApplicationBuilderExtensions.cs
index 087a0718..7c7a76f0 100644
--- a/service/src/InstructorIQ.Core/Multitenancy/ApplicationBuilderExtensions.cs
+++ b/service/src/InstructorIQ.Core/Multitenancy/ApplicationBuilderExtensions.cs
@@ -1,16 +1,16 @@
-using System;
+using System;
+
 using Microsoft.AspNetCore.Builder;
 
-namespace InstructorIQ.Core.Multitenancy
+namespace InstructorIQ.Core.Multitenancy;
+
+public static class ApplicationBuilderExtensions
 {
-    public static class ApplicationBuilderExtensions
+    public static IApplicationBuilder UseMultitenancy<TTenant>(this IApplicationBuilder app)
     {
-        public static IApplicationBuilder UseMultitenancy<TTenant>(this IApplicationBuilder app)
-        {
-            if (app == null)
-                throw new ArgumentNullException(nameof(app));
+        if (app == null)
+            throw new ArgumentNullException(nameof(app));
 
-            return app.UseMiddleware<TenantResolutionMiddleware<TTenant>>();
-        }
+        return app.UseMiddleware<TenantResolutionMiddleware<TTenant>>();
     }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.Core/Multitenancy/HttpContextExtensions.cs b/service/src/InstructorIQ.Core/Multitenancy/HttpContextExtensions.cs
index d3b189eb..db4a7419 100644
--- a/service/src/InstructorIQ.Core/Multitenancy/HttpContextExtensions.cs
+++ b/service/src/InstructorIQ.Core/Multitenancy/HttpContextExtensions.cs
@@ -1,42 +1,42 @@
-using System;
+using System;
+
 using Microsoft.AspNetCore.Http;
 
-namespace InstructorIQ.Core.Multitenancy
+namespace InstructorIQ.Core.Multitenancy;
+
+public static class HttpContextExtensions
 {
-    public static class HttpContextExtensions
+    private const string TenantContextKey = "TenantContext";
+
+    public static void SetTenantContext<TTenant>(this HttpContext context, TenantContext<TTenant> tenantContext)
+    {
+        if (context == null)
+            throw new ArgumentNullException(nameof(context));
+        if (tenantContext == null)
+            throw new ArgumentNullException(nameof(tenantContext));
+
+        context.Items[TenantContextKey] = tenantContext;
+    }
+
+    public static TenantContext<TTenant> GetTenantContext<TTenant>(this HttpContext context)
     {
-        private const string TenantContextKey = "TenantContext";
-
-        public static void SetTenantContext<TTenant>(this HttpContext context, TenantContext<TTenant> tenantContext)
-        {
-            if (context == null)
-                throw new ArgumentNullException(nameof(context));
-            if (tenantContext == null)
-                throw new ArgumentNullException(nameof(tenantContext));
-
-            context.Items[TenantContextKey] = tenantContext;
-        }
-
-        public static TenantContext<TTenant> GetTenantContext<TTenant>(this HttpContext context)
-        {
-            if (context == null)
-                throw new ArgumentNullException(nameof(context));
-
-            return context.Items.TryGetValue(TenantContextKey, out var tenantContext)
-                ? tenantContext as TenantContext<TTenant>
-                : null;
-        }
-
-        public static TTenant GetTenant<TTenant>(this HttpContext context)
-        {
-            if (context == null)
-                throw new ArgumentNullException(nameof(context));
-
-            var tenantContext = GetTenantContext<TTenant>(context);
-
-            return tenantContext != null
-                ? tenantContext.Tenant
-                : default(TTenant);
-        }
+        if (context == null)
+            throw new ArgumentNullException(nameof(context));
+
+        return context.Items.TryGetValue(TenantContextKey, out var tenantContext)
+            ? tenantContext as TenantContext<TTenant>
+            : null;
+    }
+
+    public static TTenant GetTenant<TTenant>(this HttpContext context)
+    {
+        if (context == null)
+            throw new ArgumentNullException(nameof(context));
+
+        var tenantContext = GetTenantContext<TTenant>(context);
+
+        return tenantContext != null
+            ? tenantContext.Tenant
+            : default(TTenant);
     }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.Core/Multitenancy/ITenant.cs b/service/src/InstructorIQ.Core/Multitenancy/ITenant.cs
index 5dcaa969..990f1eb9 100644
--- a/service/src/InstructorIQ.Core/Multitenancy/ITenant.cs
+++ b/service/src/InstructorIQ.Core/Multitenancy/ITenant.cs
@@ -1,10 +1,9 @@
-using System;
+using System;
 
-namespace InstructorIQ.Core.Multitenancy
+namespace InstructorIQ.Core.Multitenancy;
+
+public interface ITenant<out TTenant>
 {
-    public interface ITenant<out TTenant>
-    {
-        TTenant Value { get; }
-        bool HasValue { get; }
-    }
-}
\ No newline at end of file
+    TTenant Value { get; }
+    bool HasValue { get; }
+}
diff --git a/service/src/InstructorIQ.Core/Multitenancy/ITenantContextResolver.cs b/service/src/InstructorIQ.Core/Multitenancy/ITenantContextResolver.cs
index ad1072da..8cfface5 100644
--- a/service/src/InstructorIQ.Core/Multitenancy/ITenantContextResolver.cs
+++ b/service/src/InstructorIQ.Core/Multitenancy/ITenantContextResolver.cs
@@ -1,14 +1,14 @@
-using System;
+using System;
 using System.Text;
 using System.Threading.Tasks;
+
 using Microsoft.AspNetCore.Http;
 
-namespace InstructorIQ.Core.Multitenancy
+namespace InstructorIQ.Core.Multitenancy;
+
+public interface ITenantContextResolver<TTenant>
 {
-    public interface ITenantContextResolver<TTenant>
-    {
-        Task<TenantContext<TTenant>> ResolveAsync();
+    Task<TenantContext<TTenant>> ResolveAsync();
 
-        Task<TenantContext<TTenant>> ResolveAsync(HttpContext context);
-    }
+    Task<TenantContext<TTenant>> ResolveAsync(HttpContext context);
 }
diff --git a/service/src/InstructorIQ.Core/Multitenancy/PageConventionCollectionExtensions.cs b/service/src/InstructorIQ.Core/Multitenancy/PageConventionCollectionExtensions.cs
index 844e5ab5..d21f79c6 100644
--- a/service/src/InstructorIQ.Core/Multitenancy/PageConventionCollectionExtensions.cs
+++ b/service/src/InstructorIQ.Core/Multitenancy/PageConventionCollectionExtensions.cs
@@ -1,68 +1,68 @@
-using System;
+using System;
+
 using Microsoft.AspNetCore.Mvc.ApplicationModels;
 
-namespace InstructorIQ.Core.Multitenancy
+namespace InstructorIQ.Core.Multitenancy;
+
+public static class PageConventionCollectionExtensions
 {
-    public static class PageConventionCollectionExtensions
+    public static IPageRouteModelConvention AddPageTenantRoute(this PageConventionCollection pageConventionCollection, string pageName, bool rewrite = true)
     {
-        public static IPageRouteModelConvention AddPageTenantRoute(this PageConventionCollection pageConventionCollection, string pageName, bool rewrite = true)
-        {
-            return rewrite
-                ? pageConventionCollection.AddPageRouteModelConvention(pageName, RewriteTenantPageRoute)
-                : pageConventionCollection.AddPageRouteModelConvention(pageName, AppendTenantPageRoute);
-        }
+        return rewrite
+            ? pageConventionCollection.AddPageRouteModelConvention(pageName, RewriteTenantPageRoute)
+            : pageConventionCollection.AddPageRouteModelConvention(pageName, AppendTenantPageRoute);
+    }
 
-        public static IPageRouteModelConvention AddAreaPageTenantRoute(this PageConventionCollection pageConventionCollection, string areaName, string pageName, bool rewrite = true)
-        {
-            return rewrite
-                ? pageConventionCollection.AddAreaPageRouteModelConvention(areaName, pageName, RewriteTenantPageRoute)
-                : pageConventionCollection.AddAreaPageRouteModelConvention(areaName, pageName, AppendTenantPageRoute);
-        }
+    public static IPageRouteModelConvention AddAreaPageTenantRoute(this PageConventionCollection pageConventionCollection, string areaName, string pageName, bool rewrite = true)
+    {
+        return rewrite
+            ? pageConventionCollection.AddAreaPageRouteModelConvention(areaName, pageName, RewriteTenantPageRoute)
+            : pageConventionCollection.AddAreaPageRouteModelConvention(areaName, pageName, AppendTenantPageRoute);
+    }
 
-        public static IPageRouteModelConvention AddFolderTenantRoute(this PageConventionCollection pageConventionCollection, string folderPath, bool rewrite = true)
-        {
-            return rewrite
-                ? pageConventionCollection.AddFolderRouteModelConvention(folderPath, RewriteTenantPageRoute)
-                : pageConventionCollection.AddFolderRouteModelConvention(folderPath, AppendTenantPageRoute);
-        }
+    public static IPageRouteModelConvention AddFolderTenantRoute(this PageConventionCollection pageConventionCollection, string folderPath, bool rewrite = true)
+    {
+        return rewrite
+            ? pageConventionCollection.AddFolderRouteModelConvention(folderPath, RewriteTenantPageRoute)
+            : pageConventionCollection.AddFolderRouteModelConvention(folderPath, AppendTenantPageRoute);
+    }
 
-        public static IPageRouteModelConvention AddAreaFolderTenantRoute(this PageConventionCollection pageConventionCollection, string areaName, string folderPath, bool rewrite = true)
-        {
-            return rewrite
-                ? pageConventionCollection.AddAreaFolderRouteModelConvention(areaName, folderPath, RewriteTenantPageRoute)
-                : pageConventionCollection.AddAreaFolderRouteModelConvention(areaName, folderPath, AppendTenantPageRoute);
-        }
+    public static IPageRouteModelConvention AddAreaFolderTenantRoute(this PageConventionCollection pageConventionCollection, string areaName, string folderPath, bool rewrite = true)
+    {
+        return rewrite
+            ? pageConventionCollection.AddAreaFolderRouteModelConvention(areaName, folderPath, RewriteTenantPageRoute)
+            : pageConventionCollection.AddAreaFolderRouteModelConvention(areaName, folderPath, AppendTenantPageRoute);
+    }
 
 
 
-        private static void RewriteTenantPageRoute(PageRouteModel model)
+    private static void RewriteTenantPageRoute(PageRouteModel model)
+    {
+        var selectorCount = model.Selectors.Count;
+        for (var i = 0; i < selectorCount; i++)
         {
-            var selectorCount = model.Selectors.Count;
-            for (var i = 0; i < selectorCount; i++)
-            {
-                var selector = model.Selectors[i];
+            var selector = model.Selectors[i];
 
-                var template = selector.AttributeRouteModel.Template;
-                var tenantTemplates = AttributeRouteModel.CombineTemplates("{tenant}", template);
+            var template = selector.AttributeRouteModel.Template;
+            var tenantTemplates = AttributeRouteModel.CombineTemplates("{tenant}", template);
 
-                selector.AttributeRouteModel.Template = tenantTemplates;
-            }
+            selector.AttributeRouteModel.Template = tenantTemplates;
         }
+    }
 
-        private static void AppendTenantPageRoute(PageRouteModel model)
+    private static void AppendTenantPageRoute(PageRouteModel model)
+    {
+        var selectorCount = model.Selectors.Count;
+        for (var i = 0; i < selectorCount; i++)
         {
-            var selectorCount = model.Selectors.Count;
-            for (var i = 0; i < selectorCount; i++)
-            {
-                var selector = model.Selectors[i];
-                var appended = new SelectorModel(selector);
+            var selector = model.Selectors[i];
+            var appended = new SelectorModel(selector);
 
-                var template = appended.AttributeRouteModel.Template;
-                var tenantTemplates = AttributeRouteModel.CombineTemplates("{tenant}", template);
+            var template = appended.AttributeRouteModel.Template;
+            var tenantTemplates = AttributeRouteModel.CombineTemplates("{tenant}", template);
 
-                appended.AttributeRouteModel.Template = tenantTemplates;
-                model.Selectors.Add(appended);
-            }
+            appended.AttributeRouteModel.Template = tenantTemplates;
+            model.Selectors.Add(appended);
         }
     }
 }
diff --git a/service/src/InstructorIQ.Core/Multitenancy/ServiceCollectionExtensions.cs b/service/src/InstructorIQ.Core/Multitenancy/ServiceCollectionExtensions.cs
index 8100ca4c..4b4516df 100644
--- a/service/src/InstructorIQ.Core/Multitenancy/ServiceCollectionExtensions.cs
+++ b/service/src/InstructorIQ.Core/Multitenancy/ServiceCollectionExtensions.cs
@@ -1,32 +1,32 @@
-using System;
+using System;
+
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 
-namespace InstructorIQ.Core.Multitenancy
+namespace InstructorIQ.Core.Multitenancy;
+
+public static class ServiceCollectionExtensions
 {
-    public static class ServiceCollectionExtensions
+    public static IServiceCollection AddMultitenancy<TTenant, TResolver>(this IServiceCollection services)
+        where TResolver : class, ITenantContextResolver<TTenant>
+        where TTenant : class
     {
-        public static IServiceCollection AddMultitenancy<TTenant, TResolver>(this IServiceCollection services)
-            where TResolver : class, ITenantContextResolver<TTenant>
-            where TTenant : class
-        {
-            if (services == null)
-                throw new ArgumentNullException(nameof(services));
+        if (services == null)
+            throw new ArgumentNullException(nameof(services));
 
-            services.AddScoped<ITenantContextResolver<TTenant>, TResolver>();
+        services.AddScoped<ITenantContextResolver<TTenant>, TResolver>();
 
-            // No longer registered by default
-            services.TryAddSingleton<IHttpContextAccessor, HttpContextAccessor>();
+        // No longer registered by default
+        services.TryAddSingleton<IHttpContextAccessor, HttpContextAccessor>();
 
-            // Make Tenant and TenantContext injectable
-            services.AddScoped(prov => prov.GetService<IHttpContextAccessor>()?.HttpContext?.GetTenantContext<TTenant>());
-            services.AddScoped(prov => prov.GetService<TenantContext<TTenant>>()?.Tenant);
+        // Make Tenant and TenantContext injectable
+        services.AddScoped(prov => prov.GetService<IHttpContextAccessor>()?.HttpContext?.GetTenantContext<TTenant>());
+        services.AddScoped(prov => prov.GetService<TenantContext<TTenant>>()?.Tenant);
 
-            // Make ITenant injectable for handling null injection, similar to IOptions
-            services.AddScoped<ITenant<TTenant>>(prov => new TenantValue<TTenant>(prov.GetService<TTenant>()));
+        // Make ITenant injectable for handling null injection, similar to IOptions
+        services.AddScoped<ITenant<TTenant>>(prov => new TenantValue<TTenant>(prov.GetService<TTenant>()));
 
-            return services;
-        }
+        return services;
     }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.Core/Multitenancy/TenantContext.cs b/service/src/InstructorIQ.Core/Multitenancy/TenantContext.cs
index 0a2739d3..90fda9a3 100644
--- a/service/src/InstructorIQ.Core/Multitenancy/TenantContext.cs
+++ b/service/src/InstructorIQ.Core/Multitenancy/TenantContext.cs
@@ -1,63 +1,62 @@
-using System;
+using System;
 using System.Collections.Generic;
 
-namespace InstructorIQ.Core.Multitenancy
+namespace InstructorIQ.Core.Multitenancy;
+
+public class TenantContext<TTenant> : IDisposable
 {
-    public class TenantContext<TTenant> : IDisposable
+    private bool _disposed;
+
+    public TenantContext(TTenant tenant)
     {
-        private bool _disposed;
+        if (tenant == null)
+            throw new ArgumentNullException(nameof(tenant));
 
-        public TenantContext(TTenant tenant)
-        {
-            if (tenant == null)
-                throw new ArgumentNullException(nameof(tenant));
+        Tenant = tenant;
+        Properties = new Dictionary<string, object>();
+    }
 
-            Tenant = tenant;
-            Properties = new Dictionary<string, object>();
-        }
+    public string Id { get; } = Guid.NewGuid().ToString();
 
-        public string Id { get; } = Guid.NewGuid().ToString();
+    public TTenant Tenant { get; }
 
-        public TTenant Tenant { get; }
+    public IDictionary<string, object> Properties { get; }
 
-        public IDictionary<string, object> Properties { get; }
 
+    public void Dispose()
+    {
+        Dispose(true);
+        GC.SuppressFinalize(this);
+    }
 
-        public void Dispose()
-        {
-            Dispose(true);
-            GC.SuppressFinalize(this);
-        }
+    protected virtual void Dispose(bool disposing)
+    {
+        if (_disposed)
+            return;
 
-        protected virtual void Dispose(bool disposing)
+        if (disposing)
         {
-            if (_disposed)
-                return;
+            foreach (var prop in Properties)
+                TryDisposeProperty(prop.Value as IDisposable);
 
-            if (disposing)
-            {
-                foreach (var prop in Properties)
-                    TryDisposeProperty(prop.Value as IDisposable);
+            TryDisposeProperty(Tenant as IDisposable);
+        }
 
-                TryDisposeProperty(Tenant as IDisposable);
-            }
+        _disposed = true;
+    }
 
-            _disposed = true;
-        }
+    private void TryDisposeProperty(IDisposable obj)
+    {
+        if (obj == null)
+            return;
 
-        private void TryDisposeProperty(IDisposable obj)
+        try
+        {
+            obj.Dispose();
+        }
+        catch (ObjectDisposedException)
         {
-            if (obj == null)
-                return;
-
-            try
-            {
-                obj.Dispose();
-            }
-            catch (ObjectDisposedException)
-            {
 
-            }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.Core/Multitenancy/TenantContextResolver.cs b/service/src/InstructorIQ.Core/Multitenancy/TenantContextResolver.cs
index d5bd0863..c8cf21ff 100644
--- a/service/src/InstructorIQ.Core/Multitenancy/TenantContextResolver.cs
+++ b/service/src/InstructorIQ.Core/Multitenancy/TenantContextResolver.cs
@@ -1,88 +1,90 @@
-using System;
+using System;
 using System.Linq;
 using System.Threading.Tasks;
-using MediatR.CommandQuery.Queries;
+
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Domain.Queries;
 using InstructorIQ.Core.Extensions;
 using InstructorIQ.Core.Security;
+
 using MediatR;
+using MediatR.CommandQuery.Queries;
+
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Logging;
 
-namespace InstructorIQ.Core.Multitenancy
+namespace InstructorIQ.Core.Multitenancy;
+
+public class TenantContextResolver : ITenantContextResolver<TenantReadModel>
 {
-    public class TenantContextResolver : ITenantContextResolver<TenantReadModel>
+    public TenantContextResolver(IMediator mediator, ILoggerFactory loggerFactory, UserClaimManager userClaimManager, IHttpContextAccessor httpContextAccessor)
     {
-        public TenantContextResolver(IMediator mediator, ILoggerFactory loggerFactory, UserClaimManager userClaimManager, IHttpContextAccessor httpContextAccessor)
-        {
-            Mediator = mediator;
-            UserClaimManager = userClaimManager;
-            HttpContextAccessor = httpContextAccessor;
-            Logger = loggerFactory.CreateLogger(GetType());
-        }
+        Mediator = mediator;
+        UserClaimManager = userClaimManager;
+        HttpContextAccessor = httpContextAccessor;
+        Logger = loggerFactory.CreateLogger(GetType());
+    }
 
-        protected UserClaimManager UserClaimManager { get; }
+    protected UserClaimManager UserClaimManager { get; }
 
-        protected ILogger Logger { get; }
+    protected ILogger Logger { get; }
 
-        protected IMediator Mediator { get; }
+    protected IMediator Mediator { get; }
 
-        protected IHttpContextAccessor HttpContextAccessor { get; }
+    protected IHttpContextAccessor HttpContextAccessor { get; }
 
-        public async Task<TenantContext<TenantReadModel>> ResolveAsync()
-        {
-            return await ResolveAsync(HttpContextAccessor.HttpContext);
-        }
+    public async Task<TenantContext<TenantReadModel>> ResolveAsync()
+    {
+        return await ResolveAsync(HttpContextAccessor.HttpContext);
+    }
 
-        public async Task<TenantContext<TenantReadModel>> ResolveAsync(HttpContext context)
-        {
-            if (context == null)
-                return null;
+    public async Task<TenantContext<TenantReadModel>> ResolveAsync(HttpContext context)
+    {
+        if (context == null)
+            return null;
 
-            var tenant = await ResolveFromPath(context);
+        var tenant = await ResolveFromPath(context);
 
-            if (tenant == null)
-                tenant = await ResolveFromUser(context);
+        if (tenant == null)
+            tenant = await ResolveFromUser(context);
 
-            if (tenant == null)
-                return null;
+        if (tenant == null)
+            return null;
 
-            var tenantContext = new TenantContext<TenantReadModel>(tenant);
-            return tenantContext;
-        }
+        var tenantContext = new TenantContext<TenantReadModel>(tenant);
+        return tenantContext;
+    }
 
-        private async Task<TenantReadModel> ResolveFromUser(HttpContext context)
-        {
-            if (!context.User.Identity.IsAuthenticated)
-                return null;
+    private async Task<TenantReadModel> ResolveFromUser(HttpContext context)
+    {
+        if (!context.User.Identity.IsAuthenticated)
+            return null;
 
-            var slug = UserClaimManager.GetTenantSlug(context.User);
-            if (slug.IsNullOrEmpty())
-                return null;
+        var slug = UserClaimManager.GetTenantSlug(context.User);
+        if (slug.IsNullOrEmpty())
+            return null;
 
-            var query = new TenantSlugQuery(context.User, slug);
-            var tenant = await Mediator.Send(query);
+        var query = new TenantSlugQuery(context.User, slug);
+        var tenant = await Mediator.Send(query);
 
-            return tenant;
-        }
+        return tenant;
+    }
 
-        private async Task<TenantReadModel> ResolveFromPath(HttpContext context)
-        {
-            if (!context.Request.Path.HasValue)
-                return null;
+    private async Task<TenantReadModel> ResolveFromPath(HttpContext context)
+    {
+        if (!context.Request.Path.HasValue)
+            return null;
 
-            var slug = context.Request.Path.Value
-                .Split(new[] { '/' }, StringSplitOptions.RemoveEmptyEntries)
-                .FirstOrDefault();
+        var slug = context.Request.Path.Value
+            .Split(new[] { '/' }, StringSplitOptions.RemoveEmptyEntries)
+            .FirstOrDefault();
 
-            if (slug.IsNullOrEmpty())
-                return null;
+        if (slug.IsNullOrEmpty())
+            return null;
 
-            var query = new TenantSlugQuery(context.User, slug);
-            var tenant = await Mediator.Send(query);
+        var query = new TenantSlugQuery(context.User, slug);
+        var tenant = await Mediator.Send(query);
 
-            return tenant;
-        }
+        return tenant;
     }
 }
diff --git a/service/src/InstructorIQ.Core/Multitenancy/TenantResolutionMiddleware.cs b/service/src/InstructorIQ.Core/Multitenancy/TenantResolutionMiddleware.cs
index 626ce537..b30c374a 100644
--- a/service/src/InstructorIQ.Core/Multitenancy/TenantResolutionMiddleware.cs
+++ b/service/src/InstructorIQ.Core/Multitenancy/TenantResolutionMiddleware.cs
@@ -1,51 +1,51 @@
-using System;
+using System;
 using System.Threading.Tasks;
+
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Logging;
 
-namespace InstructorIQ.Core.Multitenancy
-{
-    public class TenantResolutionMiddleware<TTenant>
-    {
-        private readonly RequestDelegate _next;
-        private readonly ILogger _logger;
+namespace InstructorIQ.Core.Multitenancy;
 
-        public TenantResolutionMiddleware(RequestDelegate next, ILoggerFactory loggerFactory)
-        {
-            if (next == null)
-                throw new ArgumentNullException(nameof(next));
+public class TenantResolutionMiddleware<TTenant>
+{
+    private readonly RequestDelegate _next;
+    private readonly ILogger _logger;
 
-            if (loggerFactory == null)
-                throw new ArgumentNullException(nameof(loggerFactory));
+    public TenantResolutionMiddleware(RequestDelegate next, ILoggerFactory loggerFactory)
+    {
+        if (next == null)
+            throw new ArgumentNullException(nameof(next));
 
-            _next = next;
-            _logger = loggerFactory.CreateLogger<TenantResolutionMiddleware<TTenant>>();
-        }
+        if (loggerFactory == null)
+            throw new ArgumentNullException(nameof(loggerFactory));
 
-        public async Task Invoke(HttpContext context, ITenantContextResolver<TTenant> tenantContextResolver)
-        {
-            if (context == null)
-                throw new ArgumentNullException(nameof(context));
+        _next = next;
+        _logger = loggerFactory.CreateLogger<TenantResolutionMiddleware<TTenant>>();
+    }
 
-            if (tenantContextResolver == null)
-                throw new ArgumentNullException(nameof(tenantContextResolver));
+    public async Task Invoke(HttpContext context, ITenantContextResolver<TTenant> tenantContextResolver)
+    {
+        if (context == null)
+            throw new ArgumentNullException(nameof(context));
 
-            _logger.LogDebug("Resolving TenantContext using {loggerType}.", tenantContextResolver.GetType().Name);
+        if (tenantContextResolver == null)
+            throw new ArgumentNullException(nameof(tenantContextResolver));
 
-            var tenantContext = await tenantContextResolver.ResolveAsync(context);
+        _logger.LogDebug("Resolving TenantContext using {loggerType}.", tenantContextResolver.GetType().Name);
 
-            if (tenantContext != null)
-            {
-                _logger.LogDebug("TenantContext Resolved. Adding to HttpContext.");
-                context.SetTenantContext(tenantContext);
-            }
-            else
-            {
-                // return 404?
-                _logger.LogDebug("TenantContext Not Resolved.");
-            }
+        var tenantContext = await tenantContextResolver.ResolveAsync(context);
 
-            await _next.Invoke(context);
+        if (tenantContext != null)
+        {
+            _logger.LogDebug("TenantContext Resolved. Adding to HttpContext.");
+            context.SetTenantContext(tenantContext);
         }
+        else
+        {
+            // return 404?
+            _logger.LogDebug("TenantContext Not Resolved.");
+        }
+
+        await _next.Invoke(context);
     }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.Core/Multitenancy/TenantValue.cs b/service/src/InstructorIQ.Core/Multitenancy/TenantValue.cs
index 08641167..df7c6275 100644
--- a/service/src/InstructorIQ.Core/Multitenancy/TenantValue.cs
+++ b/service/src/InstructorIQ.Core/Multitenancy/TenantValue.cs
@@ -1,16 +1,15 @@
-using System;
+using System;
 
-namespace InstructorIQ.Core.Multitenancy
+namespace InstructorIQ.Core.Multitenancy;
+
+public class TenantValue<TTenant> : ITenant<TTenant>
 {
-    public class TenantValue<TTenant> : ITenant<TTenant>
+    public TenantValue(TTenant tenant)
     {
-        public TenantValue(TTenant tenant)
-        {
-            Value = tenant;
-        }
+        Value = tenant;
+    }
 
-        public TTenant Value { get; }
+    public TTenant Value { get; }
 
-        public bool HasValue => Value != null;
-    }
-}
\ No newline at end of file
+    public bool HasValue => Value != null;
+}
diff --git a/service/src/InstructorIQ.Core/Options/ConfigurationServiceModule.cs b/service/src/InstructorIQ.Core/Options/ConfigurationServiceModule.cs
index db840487..1cef0b74 100644
--- a/service/src/InstructorIQ.Core/Options/ConfigurationServiceModule.cs
+++ b/service/src/InstructorIQ.Core/Options/ConfigurationServiceModule.cs
@@ -3,37 +3,36 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace InstructorIQ.Core.Options
+namespace InstructorIQ.Core.Options;
+
+public class ConfigurationServiceModule
 {
-    public class ConfigurationServiceModule
+    public const string ConfigurationKey = "configuration";
+
+
+    [RegisterServices]
+    public void Register(IServiceCollection services)
     {
-        public const string ConfigurationKey = "configuration";
-
-
-        [RegisterServices]
-        public void Register(IServiceCollection services)
-        {
-            services
-                .AddOptions<StorageConfiguration>()
-                .Configure<IConfiguration>((settings, configuration) => configuration
-                    .GetSection(StorageConfiguration.ConfigurationName)
-                    .Bind(settings)
-                );
-
-            services
-                .AddOptions<SendGridConfiguration>()
-                .Configure<IConfiguration>((settings, configuration) => configuration
-                    .GetSection(SendGridConfiguration.ConfigurationName)
-                    .Bind(settings)
-                );
-
-            services
-                .AddOptions<SecurityOptions>()
-                .Configure<IConfiguration>((settings, configuration) => configuration
-                    .GetSection(SecurityOptions.ConfigurationName)
-                    .Bind(settings)
-                );
-
-        }
+        services
+            .AddOptions<StorageConfiguration>()
+            .Configure<IConfiguration>((settings, configuration) => configuration
+                .GetSection(StorageConfiguration.ConfigurationName)
+                .Bind(settings)
+            );
+
+        services
+            .AddOptions<SendGridConfiguration>()
+            .Configure<IConfiguration>((settings, configuration) => configuration
+                .GetSection(SendGridConfiguration.ConfigurationName)
+                .Bind(settings)
+            );
+
+        services
+            .AddOptions<SecurityOptions>()
+            .Configure<IConfiguration>((settings, configuration) => configuration
+                .GetSection(SecurityOptions.ConfigurationName)
+                .Bind(settings)
+            );
+
     }
 }
diff --git a/service/src/InstructorIQ.Core/Options/SecurityOptions.cs b/service/src/InstructorIQ.Core/Options/SecurityOptions.cs
index a687536b..0b90dff0 100644
--- a/service/src/InstructorIQ.Core/Options/SecurityOptions.cs
+++ b/service/src/InstructorIQ.Core/Options/SecurityOptions.cs
@@ -1,17 +1,16 @@
 using System;
 
-namespace InstructorIQ.Core.Options
+namespace InstructorIQ.Core.Options;
+
+public class SecurityOptions
 {
-    public class SecurityOptions
-    {
-        public const string ConfigurationName = "Security";
+    public const string ConfigurationName = "Security";
 
-        public SecurityOptions()
-        {
-            PasswordlessTokenLifespan = TimeSpan.FromHours(4);
-        }
+    public SecurityOptions()
+    {
+        PasswordlessTokenLifespan = TimeSpan.FromHours(4);
+    }
 
-        public TimeSpan PasswordlessTokenLifespan { get; set; }
+    public TimeSpan PasswordlessTokenLifespan { get; set; }
 
-    }
 }
diff --git a/service/src/InstructorIQ.Core/Options/SendGridConfiguration.cs b/service/src/InstructorIQ.Core/Options/SendGridConfiguration.cs
index f1a85561..cd02dc64 100644
--- a/service/src/InstructorIQ.Core/Options/SendGridConfiguration.cs
+++ b/service/src/InstructorIQ.Core/Options/SendGridConfiguration.cs
@@ -1,11 +1,10 @@
-namespace InstructorIQ.Core.Options
+namespace InstructorIQ.Core.Options;
+
+public class SendGridConfiguration
 {
-    public class SendGridConfiguration
-    {
-        public const string ConfigurationName = "SendGrid";
+    public const string ConfigurationName = "SendGrid";
 
-        public string FromName { get; set; }
-        public string FromEmail { get; set; }
-        public string ApiKey { get; set; }
-    }
+    public string FromName { get; set; }
+    public string FromEmail { get; set; }
+    public string ApiKey { get; set; }
 }
diff --git a/service/src/InstructorIQ.Core/Options/StorageConfiguration.cs b/service/src/InstructorIQ.Core/Options/StorageConfiguration.cs
index 5949b080..55b5660d 100644
--- a/service/src/InstructorIQ.Core/Options/StorageConfiguration.cs
+++ b/service/src/InstructorIQ.Core/Options/StorageConfiguration.cs
@@ -1,13 +1,12 @@
 using System;
 
-namespace InstructorIQ.Core.Options
+namespace InstructorIQ.Core.Options;
+
+public class StorageConfiguration
 {
-    public class StorageConfiguration
-    {
-        public const string ConfigurationName = "Storage";
+    public const string ConfigurationName = "Storage";
 
-        public string ConnectionString { get; set; }
+    public string ConnectionString { get; set; }
 
-        public string Container { get; set; }
-    }
+    public string Container { get; set; }
 }
diff --git a/service/src/InstructorIQ.Core/Security/IPrincipalTenantResolver.cs b/service/src/InstructorIQ.Core/Security/IPrincipalTenantResolver.cs
index 622a45f6..0f00bac8 100644
--- a/service/src/InstructorIQ.Core/Security/IPrincipalTenantResolver.cs
+++ b/service/src/InstructorIQ.Core/Security/IPrincipalTenantResolver.cs
@@ -1,11 +1,10 @@
-using System;
+using System;
 using System.Security.Principal;
 
-namespace InstructorIQ.Core.Security
+namespace InstructorIQ.Core.Security;
+
+public interface IPrincipalTenantResolver
 {
-    public interface IPrincipalTenantResolver
-    {
-        Guid? GetTenantId(IPrincipal principal);
-        Guid GetRequiredTenantId(IPrincipal principal);
-    }
-}
\ No newline at end of file
+    Guid? GetTenantId(IPrincipal principal);
+    Guid GetRequiredTenantId(IPrincipal principal);
+}
diff --git a/service/src/InstructorIQ.Core/Security/SecurityServiceModule.cs b/service/src/InstructorIQ.Core/Security/SecurityServiceModule.cs
index e1a539b2..69db6804 100644
--- a/service/src/InstructorIQ.Core/Security/SecurityServiceModule.cs
+++ b/service/src/InstructorIQ.Core/Security/SecurityServiceModule.cs
@@ -5,16 +5,15 @@
 using Microsoft.AspNetCore.Identity;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace InstructorIQ.Core.Security
+namespace InstructorIQ.Core.Security;
+
+public class SecurityServiceModule
 {
-    public class SecurityServiceModule
-    {
 
-        [RegisterServices]
-        public void Register(IServiceCollection services)
-        {
-            services.AddScoped<IUserClaimsPrincipalFactory<User>, UserClaimsPrincipalFactory>();
-            services.AddScoped<UserClaimManager>();
-        }
+    [RegisterServices]
+    public void Register(IServiceCollection services)
+    {
+        services.AddScoped<IUserClaimsPrincipalFactory<User>, UserClaimsPrincipalFactory>();
+        services.AddScoped<UserClaimManager>();
     }
 }
diff --git a/service/src/InstructorIQ.Core/Security/UserClaimManager.cs b/service/src/InstructorIQ.Core/Security/UserClaimManager.cs
index 8f1e2180..d52c5c35 100644
--- a/service/src/InstructorIQ.Core/Security/UserClaimManager.cs
+++ b/service/src/InstructorIQ.Core/Security/UserClaimManager.cs
@@ -1,102 +1,105 @@
-using System;
+using System;
 using System.Security.Claims;
 using System.Security.Principal;
+
 using EntityChange.Extensions;
+
 using InstructorIQ.Core.Data.Constants;
 using InstructorIQ.Core.Domain;
+
 using MediatR.CommandQuery;
+
 using Microsoft.AspNetCore.Identity;
 using Microsoft.Extensions.Options;
 
-namespace InstructorIQ.Core.Security
+namespace InstructorIQ.Core.Security;
+
+public class UserClaimManager : IPrincipalTenantResolver
 {
-    public class UserClaimManager : IPrincipalTenantResolver
+    public UserClaimManager(IOptions<IdentityOptions> optionsAccessor)
     {
-        public UserClaimManager(IOptions<IdentityOptions> optionsAccessor)
-        {
-            Options = optionsAccessor?.Value ?? new IdentityOptions();
-        }
-
-        public IdentityOptions Options { get; }
+        Options = optionsAccessor?.Value ?? new IdentityOptions();
+    }
 
-        public bool IsGlobalAdministrator(IPrincipal principal)
-        {
+    public IdentityOptions Options { get; }
 
-            return principal?.IsInRole(Role.GlobalAdministrator) ?? false;
-        }
+    public bool IsGlobalAdministrator(IPrincipal principal)
+    {
 
-        public bool IsTenantAdministrator(IPrincipal principal)
-        {
-            return principal?.IsInRole(Role.AdministratorName) ?? false;
-        }
+        return principal?.IsInRole(Role.GlobalAdministrator) ?? false;
+    }
 
+    public bool IsTenantAdministrator(IPrincipal principal)
+    {
+        return principal?.IsInRole(Role.AdministratorName) ?? false;
+    }
 
-        public string GetUserName(IPrincipal principal)
-        {
-            var claimPrincipal = principal as ClaimsPrincipal;
-            return claimPrincipal?.FindFirstValue(Options.ClaimsIdentity.UserNameClaimType);
-        }
 
-        public Guid? GetUserId(IPrincipal principal)
-        {
-            var claimPrincipal = principal as ClaimsPrincipal;
-            var userString = claimPrincipal?.FindFirstValue(Options.ClaimsIdentity.UserIdClaimType);
-            if (Guid.TryParse(userString, out var userId))
-                return userId;
+    public string GetUserName(IPrincipal principal)
+    {
+        var claimPrincipal = principal as ClaimsPrincipal;
+        return claimPrincipal?.FindFirstValue(Options.ClaimsIdentity.UserNameClaimType);
+    }
 
-            return null;
-        }
+    public Guid? GetUserId(IPrincipal principal)
+    {
+        var claimPrincipal = principal as ClaimsPrincipal;
+        var userString = claimPrincipal?.FindFirstValue(Options.ClaimsIdentity.UserIdClaimType);
+        if (Guid.TryParse(userString, out var userId))
+            return userId;
 
-        public string GetEmail(IPrincipal principal)
-        {
-            var claimPrincipal = principal as ClaimsPrincipal;
-            var email = claimPrincipal?.FindFirstValue(UserClaims.Email);
+        return null;
+    }
 
-            if (email.HasValue()) 
-                return email;
+    public string GetEmail(IPrincipal principal)
+    {
+        var claimPrincipal = principal as ClaimsPrincipal;
+        var email = claimPrincipal?.FindFirstValue(UserClaims.Email);
 
-            email = claimPrincipal?.FindFirstValue(Options.ClaimsIdentity.UserNameClaimType);
+        if (email.HasValue())
             return email;
-        }
-
-
-        public string GetDisplayName(IPrincipal principal)
-        {
-            var claimPrincipal = principal as ClaimsPrincipal;
-            return claimPrincipal?.FindFirstValue(UserClaims.DisplayName);
-        }
-
-        public Guid? GetTenantId(IPrincipal principal)
-        {
-            var claimPrincipal = principal as ClaimsPrincipal;
-            var tenantString = claimPrincipal?.FindFirstValue(UserClaims.TenantId);
-            if (Guid.TryParse(tenantString, out var tenantId))
-                return tenantId;
-
-            return null;
-        }
-
-        public Guid GetRequiredTenantId(IPrincipal principal)
-        {
-            var claimPrincipal = principal as ClaimsPrincipal;
-            var tenantString = claimPrincipal?.FindFirstValue(UserClaims.TenantId);
-            if (Guid.TryParse(tenantString, out var tenantId))
-                return tenantId;
-
-            throw new DomainException(500, "Could not find tenant identifier in current user token.");
-        }
-
-        public string GetTenantName(IPrincipal principal)
-        {
-            var claimPrincipal = principal as ClaimsPrincipal;
-            return claimPrincipal?.FindFirstValue(UserClaims.TenantName);
-        }
-
-        public string GetTenantSlug(IPrincipal principal)
-        {
-            var claimPrincipal = principal as ClaimsPrincipal;
-            return claimPrincipal?.FindFirstValue(UserClaims.TenantSlug);
-        }
 
+        email = claimPrincipal?.FindFirstValue(Options.ClaimsIdentity.UserNameClaimType);
+        return email;
     }
-}
\ No newline at end of file
+
+
+    public string GetDisplayName(IPrincipal principal)
+    {
+        var claimPrincipal = principal as ClaimsPrincipal;
+        return claimPrincipal?.FindFirstValue(UserClaims.DisplayName);
+    }
+
+    public Guid? GetTenantId(IPrincipal principal)
+    {
+        var claimPrincipal = principal as ClaimsPrincipal;
+        var tenantString = claimPrincipal?.FindFirstValue(UserClaims.TenantId);
+        if (Guid.TryParse(tenantString, out var tenantId))
+            return tenantId;
+
+        return null;
+    }
+
+    public Guid GetRequiredTenantId(IPrincipal principal)
+    {
+        var claimPrincipal = principal as ClaimsPrincipal;
+        var tenantString = claimPrincipal?.FindFirstValue(UserClaims.TenantId);
+        if (Guid.TryParse(tenantString, out var tenantId))
+            return tenantId;
+
+        throw new DomainException(500, "Could not find tenant identifier in current user token.");
+    }
+
+    public string GetTenantName(IPrincipal principal)
+    {
+        var claimPrincipal = principal as ClaimsPrincipal;
+        return claimPrincipal?.FindFirstValue(UserClaims.TenantName);
+    }
+
+    public string GetTenantSlug(IPrincipal principal)
+    {
+        var claimPrincipal = principal as ClaimsPrincipal;
+        return claimPrincipal?.FindFirstValue(UserClaims.TenantSlug);
+    }
+
+}
diff --git a/service/src/InstructorIQ.Core/Security/UserClaims.cs b/service/src/InstructorIQ.Core/Security/UserClaims.cs
index f2d398a9..393c18b4 100644
--- a/service/src/InstructorIQ.Core/Security/UserClaims.cs
+++ b/service/src/InstructorIQ.Core/Security/UserClaims.cs
@@ -1,12 +1,11 @@
-namespace InstructorIQ.Core.Security
+namespace InstructorIQ.Core.Security;
+
+public static class UserClaims
 {
-    public static class UserClaims
-    {
-        public const string Email = "email";
-        public const string DisplayName = "display_name";
-        public const string TenantId = "tenant_id";
-        public const string TenantSlug = "tenant_slug";
-        public const string TenantName = "tenant";
-        public const string GlobalAdmin = "global_admin";
-    }
+    public const string Email = "email";
+    public const string DisplayName = "display_name";
+    public const string TenantId = "tenant_id";
+    public const string TenantSlug = "tenant_slug";
+    public const string TenantName = "tenant";
+    public const string GlobalAdmin = "global_admin";
 }
diff --git a/service/src/InstructorIQ.Core/Security/UserClaimsPrincipalFactory.cs b/service/src/InstructorIQ.Core/Security/UserClaimsPrincipalFactory.cs
index 79918564..ff5253f8 100644
--- a/service/src/InstructorIQ.Core/Security/UserClaimsPrincipalFactory.cs
+++ b/service/src/InstructorIQ.Core/Security/UserClaimsPrincipalFactory.cs
@@ -1,69 +1,71 @@
-using System.Security.Claims;
+using System.Security.Claims;
 using System.Threading.Tasks;
+
 using InstructorIQ.Core.Data.Entities;
 using InstructorIQ.Core.Domain.Commands;
 using InstructorIQ.Core.Domain.Models;
+
 using MediatR;
+
 using Microsoft.AspNetCore.Identity;
 using Microsoft.Extensions.Options;
 
-namespace InstructorIQ.Core.Security
+namespace InstructorIQ.Core.Security;
+
+public class UserClaimsPrincipalFactory : UserClaimsPrincipalFactory<User, Role>
 {
-    public class UserClaimsPrincipalFactory : UserClaimsPrincipalFactory<User, Role>
+    public UserClaimsPrincipalFactory(
+        UserManager<User> userManager,
+        RoleManager<Role> roleManager,
+        IOptions<IdentityOptions> options,
+        IMediator mediator)
+        : base(userManager, roleManager, options)
     {
-        public UserClaimsPrincipalFactory(
-            UserManager<User> userManager,
-            RoleManager<Role> roleManager,
-            IOptions<IdentityOptions> options,
-            IMediator mediator)
-            : base(userManager, roleManager, options)
-        {
-            Mediator = mediator;
-        }
-
-        protected IMediator Mediator { get; }
-
-        protected override async Task<ClaimsIdentity> GenerateClaimsAsync(User user)
-        {
-            var identity = await base.GenerateClaimsAsync(user);
-            identity.AddClaim(new Claim(UserClaims.DisplayName, user.DisplayName ?? ""));
+        Mediator = mediator;
+    }
 
-            if (user.IsGlobalAdministrator)
-                identity.AddClaim(new Claim(Options.ClaimsIdentity.RoleClaimType, Data.Constants.Role.GlobalAdministrator));
+    protected IMediator Mediator { get; }
 
-            // temp principal
-            var principal = new ClaimsPrincipal(identity);
+    protected override async Task<ClaimsIdentity> GenerateClaimsAsync(User user)
+    {
+        var identity = await base.GenerateClaimsAsync(user);
+        identity.AddClaim(new Claim(UserClaims.DisplayName, user.DisplayName ?? ""));
 
-            var command = new TenantUserResolveCommand(principal, user);
-            var tenantUserModel = await Mediator.Send(command);
+        if (user.IsGlobalAdministrator)
+            identity.AddClaim(new Claim(Options.ClaimsIdentity.RoleClaimType, Data.Constants.Role.GlobalAdministrator));
 
-            if (tenantUserModel == null)
-                return identity;
+        // temp principal
+        var principal = new ClaimsPrincipal(identity);
 
-            AddTenantClaims(tenantUserModel, identity);
-            AddTenantRoles(tenantUserModel, identity);
+        var command = new TenantUserResolveCommand(principal, user);
+        var tenantUserModel = await Mediator.Send(command);
 
+        if (tenantUserModel == null)
             return identity;
-        }
 
-        private void AddTenantRoles(TenantUserModel tenantUserModel, ClaimsIdentity identity)
-        {
-            if (tenantUserModel.Roles == null || tenantUserModel.Roles.Count == 0)
-                return;
+        AddTenantClaims(tenantUserModel, identity);
+        AddTenantRoles(tenantUserModel, identity);
 
-            foreach (var role in tenantUserModel.Roles)
-                identity.AddClaim(new Claim(Options.ClaimsIdentity.RoleClaimType, role));
-        }
+        return identity;
+    }
 
-        private static void AddTenantClaims(TenantUserModel tenantUserModel, ClaimsIdentity identity)
-        {
-            if (tenantUserModel.Tenant == null)
-                return;
+    private void AddTenantRoles(TenantUserModel tenantUserModel, ClaimsIdentity identity)
+    {
+        if (tenantUserModel.Roles == null || tenantUserModel.Roles.Count == 0)
+            return;
 
-            identity.AddClaim(new Claim(UserClaims.TenantId, tenantUserModel.Tenant.Id.ToString()));
-            identity.AddClaim(new Claim(UserClaims.TenantName, tenantUserModel.Tenant.Name));
-            identity.AddClaim(new Claim(UserClaims.TenantSlug, tenantUserModel.Tenant.Slug));
-        }
+        foreach (var role in tenantUserModel.Roles)
+            identity.AddClaim(new Claim(Options.ClaimsIdentity.RoleClaimType, role));
+    }
 
+    private static void AddTenantClaims(TenantUserModel tenantUserModel, ClaimsIdentity identity)
+    {
+        if (tenantUserModel.Tenant == null)
+            return;
+
+        identity.AddClaim(new Claim(UserClaims.TenantId, tenantUserModel.Tenant.Id.ToString()));
+        identity.AddClaim(new Claim(UserClaims.TenantName, tenantUserModel.Tenant.Name));
+        identity.AddClaim(new Claim(UserClaims.TenantSlug, tenantUserModel.Tenant.Slug));
     }
+
 }
diff --git a/service/src/InstructorIQ.Core/Security/UserPolicies.cs b/service/src/InstructorIQ.Core/Security/UserPolicies.cs
index 7fd3eeb2..b06efa79 100644
--- a/service/src/InstructorIQ.Core/Security/UserPolicies.cs
+++ b/service/src/InstructorIQ.Core/Security/UserPolicies.cs
@@ -1,13 +1,12 @@
-using System;
+using System;
 
-namespace InstructorIQ.Core.Security
+namespace InstructorIQ.Core.Security;
+
+public static class UserPolicies
 {
-    public static class UserPolicies
-    {
-        public const string UserPolicy = "UserPolicy";
-        public const string EditPolicy = "EditPolicy";
-        public const string InstructorPolicy = "InstructorPolicy";
-        public const string AdministratorPolicy = "AdministratorPolicy";
-        public const string GlobalAdministratorPolicy = "GlobalPolicy";
-    }
-}
\ No newline at end of file
+    public const string UserPolicy = "UserPolicy";
+    public const string EditPolicy = "EditPolicy";
+    public const string InstructorPolicy = "InstructorPolicy";
+    public const string AdministratorPolicy = "AdministratorPolicy";
+    public const string GlobalAdministratorPolicy = "GlobalPolicy";
+}
diff --git a/service/src/InstructorIQ.Core/Services/AssemblyMetadata.cs b/service/src/InstructorIQ.Core/Services/AssemblyMetadata.cs
index 459f16bf..ced3d6a9 100644
--- a/service/src/InstructorIQ.Core/Services/AssemblyMetadata.cs
+++ b/service/src/InstructorIQ.Core/Services/AssemblyMetadata.cs
@@ -1,35 +1,34 @@
-using System;
+using System;
 using System.Reflection;
 
-namespace InstructorIQ.Core.Services
+namespace InstructorIQ.Core.Services;
+
+public static class AssemblyMetadata
 {
-    public static class AssemblyMetadata
+    private static Lazy<string> _fileVersion = new Lazy<string>(() =>
     {
-        private static Lazy<string> _fileVersion = new Lazy<string>(() =>
-        {
-            var assembly = typeof(AssemblyMetadata).Assembly;
-            var attribute = assembly.GetCustomAttribute<AssemblyFileVersionAttribute>();
-            return attribute?.Version;
-        });
+        var assembly = typeof(AssemblyMetadata).Assembly;
+        var attribute = assembly.GetCustomAttribute<AssemblyFileVersionAttribute>();
+        return attribute?.Version;
+    });
 
-        private static Lazy<string> _assemblyVersion = new Lazy<string>(() =>
-        {
-            var assembly = typeof(AssemblyMetadata).Assembly;
-            var attribute = assembly.GetCustomAttribute<AssemblyVersionAttribute>();
-            return attribute?.Version;
-        });
+    private static Lazy<string> _assemblyVersion = new Lazy<string>(() =>
+    {
+        var assembly = typeof(AssemblyMetadata).Assembly;
+        var attribute = assembly.GetCustomAttribute<AssemblyVersionAttribute>();
+        return attribute?.Version;
+    });
 
-        private static Lazy<string> _informationVersion = new Lazy<string>(() =>
-        {
-            var assembly = typeof(AssemblyMetadata).Assembly;
-            var attribute = assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>();
-            return attribute?.InformationalVersion;
-        });
+    private static Lazy<string> _informationVersion = new Lazy<string>(() =>
+    {
+        var assembly = typeof(AssemblyMetadata).Assembly;
+        var attribute = assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>();
+        return attribute?.InformationalVersion;
+    });
 
-        public static string FileVersion => _fileVersion.Value;
+    public static string FileVersion => _fileVersion.Value;
 
-        public static string AssemblyVersion => _assemblyVersion.Value;
+    public static string AssemblyVersion => _assemblyVersion.Value;
 
-        public static string InformationalVersion => _informationVersion.Value;
-    }
+    public static string InformationalVersion => _informationVersion.Value;
 }
diff --git a/service/src/InstructorIQ.Core/Services/CleanupService.cs b/service/src/InstructorIQ.Core/Services/CleanupService.cs
index 2641856b..583d0a53 100644
--- a/service/src/InstructorIQ.Core/Services/CleanupService.cs
+++ b/service/src/InstructorIQ.Core/Services/CleanupService.cs
@@ -1,36 +1,37 @@
-using System.Threading;
+using System.Threading;
 using System.Threading.Tasks;
+
 using FluentCommand;
+
 using Microsoft.Extensions.Logging;
 
-namespace InstructorIQ.Core.Services
+namespace InstructorIQ.Core.Services;
+
+public class CleanupService : ICleanupService
 {
-    public class CleanupService : ICleanupService
+    private readonly ILogger<CleanupService> _logger;
+    private readonly IDataSession _dataSession;
+
+    public CleanupService(ILogger<CleanupService> logger, IDataSession dataSession)
+    {
+        _logger = logger;
+        _dataSession = dataSession;
+    }
+
+    public async Task ProcessAsync(CancellationToken cancellationToken = default)
     {
-        private readonly ILogger<CleanupService> _logger;
-        private readonly IDataSession _dataSession;
-
-        public CleanupService(ILogger<CleanupService> logger, IDataSession dataSession)
-        {
-            _logger = logger;
-            _dataSession = dataSession;
-        }
-
-        public async Task ProcessAsync(CancellationToken cancellationToken = default)
-        {
-            _logger.LogTrace("Processing cleanup job");
-
-            await _dataSession
-                .StoredProcedure("[Log].[PurgeLogs]")
-                .Parameter("@daysToKeep", 30)
-                .ExecuteAsync(cancellationToken);
-
-            await _dataSession
-                .StoredProcedure("[IQ].[PurgeEmailDelivery]")
-                .Parameter("@daysToKeep", 90)
-                .ExecuteAsync(cancellationToken);
-
-            _logger.LogTrace("Completed cleanup job");
-        }
+        _logger.LogTrace("Processing cleanup job");
+
+        await _dataSession
+            .StoredProcedure("[Log].[PurgeLogs]")
+            .Parameter("@daysToKeep", 30)
+            .ExecuteAsync(cancellationToken);
+
+        await _dataSession
+            .StoredProcedure("[IQ].[PurgeEmailDelivery]")
+            .Parameter("@daysToKeep", 90)
+            .ExecuteAsync(cancellationToken);
+
+        _logger.LogTrace("Completed cleanup job");
     }
 }
diff --git a/service/src/InstructorIQ.Core/Services/CookieStateService.cs b/service/src/InstructorIQ.Core/Services/CookieStateService.cs
index a001541f..90659b03 100644
--- a/service/src/InstructorIQ.Core/Services/CookieStateService.cs
+++ b/service/src/InstructorIQ.Core/Services/CookieStateService.cs
@@ -1,41 +1,41 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Text;
 using System.Text.Json;
 using System.Threading.Tasks;
+
 using Microsoft.AspNetCore.Http;
 
-namespace InstructorIQ.Core.Services
+namespace InstructorIQ.Core.Services;
+
+public class CookieStateService : IStateService
 {
-    public class CookieStateService : IStateService
+    private readonly IHttpContextAccessor _contextAccessor;
+
+    public CookieStateService(IHttpContextAccessor contextAccessor)
+    {
+        _contextAccessor = contextAccessor;
+    }
+
+    public void WriteState<T>(T state, string name)
     {
-        private readonly IHttpContextAccessor _contextAccessor;
-
-        public CookieStateService(IHttpContextAccessor contextAccessor)
-        {
-            _contextAccessor = contextAccessor;
-        }
-
-        public void WriteState<T>(T state, string name)
-        {
-            var type = typeof(T);
-            var key = $"_{name}_{type.Name}";
-            var json = JsonSerializer.Serialize(state);
-
-            var response = _contextAccessor.HttpContext.Response;
-            response.Cookies.Append(key, json);
-        }
-
-        public T ReadState<T>(string name)
-        {
-            var type = typeof(T);
-            var key = $"_{name}_{type.Name}";
-
-            var request = _contextAccessor.HttpContext.Request;
-            if (!request.Cookies.TryGetValue(key, out var json))
-                return default(T);
-
-            return JsonSerializer.Deserialize<T>(json);
-        }
+        var type = typeof(T);
+        var key = $"_{name}_{type.Name}";
+        var json = JsonSerializer.Serialize(state);
+
+        var response = _contextAccessor.HttpContext.Response;
+        response.Cookies.Append(key, json);
+    }
+
+    public T ReadState<T>(string name)
+    {
+        var type = typeof(T);
+        var key = $"_{name}_{type.Name}";
+
+        var request = _contextAccessor.HttpContext.Request;
+        if (!request.Cookies.TryGetValue(key, out var json))
+            return default(T);
+
+        return JsonSerializer.Deserialize<T>(json);
     }
 }
diff --git a/service/src/InstructorIQ.Core/Services/EmailTemplate.cs b/service/src/InstructorIQ.Core/Services/EmailTemplate.cs
index 674cb7f6..ab51e626 100644
--- a/service/src/InstructorIQ.Core/Services/EmailTemplate.cs
+++ b/service/src/InstructorIQ.Core/Services/EmailTemplate.cs
@@ -1,15 +1,14 @@
 using System;
 
-namespace InstructorIQ.Core.Services
+namespace InstructorIQ.Core.Services;
+
+public class EmailTemplate : IEmailTemplate
 {
-    public class EmailTemplate : IEmailTemplate
-    {
-        public string FromAddress { get; set; }
-        public string FromName { get; set; }
-        public string ReplyToAddress { get; set; }
-        public string ReplyToName { get; set; }
-        public string Subject { get; set; }
-        public string TextBody { get; set; }
-        public string HtmlBody { get; set; }
-    }
-}
\ No newline at end of file
+    public string FromAddress { get; set; }
+    public string FromName { get; set; }
+    public string ReplyToAddress { get; set; }
+    public string ReplyToName { get; set; }
+    public string Subject { get; set; }
+    public string TextBody { get; set; }
+    public string HtmlBody { get; set; }
+}
diff --git a/service/src/InstructorIQ.Core/Services/EmailTemplateService.cs b/service/src/InstructorIQ.Core/Services/EmailTemplateService.cs
index 68d308b9..c5b8cc9f 100644
--- a/service/src/InstructorIQ.Core/Services/EmailTemplateService.cs
+++ b/service/src/InstructorIQ.Core/Services/EmailTemplateService.cs
@@ -29,207 +29,206 @@
 using YamlDotNet.Serialization;
 using YamlDotNet.Serialization.NamingConventions;
 
-namespace InstructorIQ.Core.Services
+namespace InstructorIQ.Core.Services;
+
+public class EmailTemplateService : IEmailTemplateService
 {
-    public class EmailTemplateService : IEmailTemplateService
+    private readonly InstructorIQContext _dataContext;
+    private readonly IMemoryCache _cache;
+    private readonly IOptions<SendGridConfiguration> _sendGridOptions;
+    private readonly IHtmlService _htmlService;
+    private readonly ILogger<EmailTemplateService> _logger;
+    private readonly ISendGridClient _sendGridClient;
+
+    public EmailTemplateService(InstructorIQContext dataContext, IMemoryCache cache, IOptions<SendGridConfiguration> sendGridOptions, IHtmlService htmlService, ILogger<EmailTemplateService> logger, ISendGridClient sendGridClient)
     {
-        private readonly InstructorIQContext _dataContext;
-        private readonly IMemoryCache _cache;
-        private readonly IOptions<SendGridConfiguration> _sendGridOptions;
-        private readonly IHtmlService _htmlService;
-        private readonly ILogger<EmailTemplateService> _logger;
-        private readonly ISendGridClient _sendGridClient;
-
-        public EmailTemplateService(InstructorIQContext dataContext, IMemoryCache cache, IOptions<SendGridConfiguration> sendGridOptions, IHtmlService htmlService, ILogger<EmailTemplateService> logger, ISendGridClient sendGridClient)
-        {
-            _dataContext = dataContext;
-            _cache = cache;
-            _sendGridOptions = sendGridOptions;
-            _htmlService = htmlService;
-            _logger = logger;
-            _sendGridClient = sendGridClient;
-        }
+        _dataContext = dataContext;
+        _cache = cache;
+        _sendGridOptions = sendGridOptions;
+        _htmlService = htmlService;
+        _logger = logger;
+        _sendGridClient = sendGridClient;
+    }
 
 
-        public async Task<bool> SendResetPasswordEmail(UserResetPasswordEmail resetPassword)
-        {
-            var emailTemplate = await GetEmailTemplate(Templates.ResetPassword).ConfigureAwait(false);
+    public async Task<bool> SendResetPasswordEmail(UserResetPasswordEmail resetPassword)
+    {
+        var emailTemplate = await GetEmailTemplate(Templates.ResetPassword).ConfigureAwait(false);
 
-            await SendTemplate(emailTemplate, resetPassword).ConfigureAwait(false);
+        await SendTemplate(emailTemplate, resetPassword).ConfigureAwait(false);
 
-            return true;
-        }
+        return true;
+    }
 
-        public async Task<bool> SendPasswordlessLoginEmail(UserPasswordlessEmail loginEmail)
-        {
-            var emailTemplate = await GetEmailTemplate(Templates.PasswordlessLogin).ConfigureAwait(false);
+    public async Task<bool> SendPasswordlessLoginEmail(UserPasswordlessEmail loginEmail)
+    {
+        var emailTemplate = await GetEmailTemplate(Templates.PasswordlessLogin).ConfigureAwait(false);
 
-            await SendTemplate(emailTemplate, loginEmail).ConfigureAwait(false);
+        await SendTemplate(emailTemplate, loginEmail).ConfigureAwait(false);
 
-            return true;
-        }
+        return true;
+    }
 
-        public async Task<bool> SendUserInviteEmail(UserInviteEmail inviteEmail)
-        {
-            var emailTemplate = await GetEmailTemplate(Templates.UserInvite).ConfigureAwait(false);
+    public async Task<bool> SendUserInviteEmail(UserInviteEmail inviteEmail)
+    {
+        var emailTemplate = await GetEmailTemplate(Templates.UserInvite).ConfigureAwait(false);
 
-            // use model reply to address
-            emailTemplate.ReplyToAddress = inviteEmail.ReplyToAddress;
-            emailTemplate.ReplyToName = inviteEmail.ReplyToName;
+        // use model reply to address
+        emailTemplate.ReplyToAddress = inviteEmail.ReplyToAddress;
+        emailTemplate.ReplyToName = inviteEmail.ReplyToName;
 
-            await SendTemplate(emailTemplate, inviteEmail).ConfigureAwait(false);
+        await SendTemplate(emailTemplate, inviteEmail).ConfigureAwait(false);
 
-            return true;
-        }
+        return true;
+    }
 
-        public async Task<bool> SendSummaryEmail(SummaryReportEmail summaryEmail)
-        {
-            var emailTemplate = await GetEmailTemplate(Templates.SummaryReport).ConfigureAwait(false);
+    public async Task<bool> SendSummaryEmail(SummaryReportEmail summaryEmail)
+    {
+        var emailTemplate = await GetEmailTemplate(Templates.SummaryReport).ConfigureAwait(false);
 
-            // use model reply to address
-            emailTemplate.ReplyToAddress = summaryEmail.ReplyToAddress;
-            emailTemplate.ReplyToName = summaryEmail.ReplyToName;
+        // use model reply to address
+        emailTemplate.ReplyToAddress = summaryEmail.ReplyToAddress;
+        emailTemplate.ReplyToName = summaryEmail.ReplyToName;
 
-            await SendTemplate(emailTemplate, summaryEmail).ConfigureAwait(false);
+        await SendTemplate(emailTemplate, summaryEmail).ConfigureAwait(false);
 
-            return true;
-        }
+        return true;
+    }
 
-        public async Task<bool> SendUserLinkEmail(UserLinkEmail userLinkModel)
-        {
-            var emailTemplate = await GetEmailTemplate(Templates.UserLink).ConfigureAwait(false);
+    public async Task<bool> SendUserLinkEmail(UserLinkEmail userLinkModel)
+    {
+        var emailTemplate = await GetEmailTemplate(Templates.UserLink).ConfigureAwait(false);
 
-            // use model reply to address
-            emailTemplate.ReplyToAddress = userLinkModel.ReplyToAddress;
-            emailTemplate.ReplyToName = userLinkModel.ReplyToName;
+        // use model reply to address
+        emailTemplate.ReplyToAddress = userLinkModel.ReplyToAddress;
+        emailTemplate.ReplyToName = userLinkModel.ReplyToName;
 
-            await SendTemplate(emailTemplate, userLinkModel).ConfigureAwait(false);
+        await SendTemplate(emailTemplate, userLinkModel).ConfigureAwait(false);
 
-            return true;
-        }
+        return true;
+    }
 
 
-        public async Task SendTemplate<TModel>(IEmailTemplate emailTemplate, TModel emailModel)
-            where TModel : IEmailRecipient
-        {
-            if (emailTemplate == null)
-                throw new ArgumentNullException(nameof(emailTemplate));
+    public async Task SendTemplate<TModel>(IEmailTemplate emailTemplate, TModel emailModel)
+        where TModel : IEmailRecipient
+    {
+        if (emailTemplate == null)
+            throw new ArgumentNullException(nameof(emailTemplate));
 
-            if (emailModel == null)
-                throw new ArgumentNullException(nameof(emailModel));
+        if (emailModel == null)
+            throw new ArgumentNullException(nameof(emailModel));
 
-            try
-            {
-                var subject = ApplyTemplate(emailTemplate.Subject, emailModel);
-                var htmlBody = ApplyTemplate(emailTemplate.HtmlBody, emailModel);
-                var textBody = ApplyTemplate(emailTemplate.TextBody, emailModel);
+        try
+        {
+            var subject = ApplyTemplate(emailTemplate.Subject, emailModel);
+            var htmlBody = ApplyTemplate(emailTemplate.HtmlBody, emailModel);
+            var textBody = ApplyTemplate(emailTemplate.TextBody, emailModel);
 
-                // ensure text body has value
-                if (textBody.IsNullOrWhiteSpace() && htmlBody.HasValue())
-                    textBody = _htmlService.PlainText(htmlBody);
+            // ensure text body has value
+            if (textBody.IsNullOrWhiteSpace() && htmlBody.HasValue())
+                textBody = _htmlService.PlainText(htmlBody);
 
-                var message = new SendGridMessage();
-                message.Subject = subject;
+            var message = new SendGridMessage();
+            message.Subject = subject;
 
-                // first try reply to name, next try model from address, default to option address
-                var fromName = emailTemplate.ReplyToName.HasValue()
-                    ? emailTemplate.ReplyToName
-                    : emailTemplate.FromName.HasValue()
-                        ? emailTemplate.FromName
-                        : _sendGridOptions.Value.FromName;
+            // first try reply to name, next try model from address, default to option address
+            var fromName = emailTemplate.ReplyToName.HasValue()
+                ? emailTemplate.ReplyToName
+                : emailTemplate.FromName.HasValue()
+                    ? emailTemplate.FromName
+                    : _sendGridOptions.Value.FromName;
 
-                var fromEmail = emailTemplate.FromAddress.HasValue()
-                    ? emailTemplate.FromAddress
-                    : _sendGridOptions.Value.FromEmail;
+            var fromEmail = emailTemplate.FromAddress.HasValue()
+                ? emailTemplate.FromAddress
+                : _sendGridOptions.Value.FromEmail;
 
-                message.From = new EmailAddress(fromEmail, fromName);
+            message.From = new EmailAddress(fromEmail, fromName);
 
-                if (emailTemplate.ReplyToAddress.HasValue())
-                    message.ReplyTo = new EmailAddress(emailTemplate.ReplyToAddress, emailTemplate.ReplyToName);
+            if (emailTemplate.ReplyToAddress.HasValue())
+                message.ReplyTo = new EmailAddress(emailTemplate.ReplyToAddress, emailTemplate.ReplyToName);
 
-                message.AddTo(new EmailAddress(emailModel.RecipientAddress, emailModel.RecipientName));
+            message.AddTo(new EmailAddress(emailModel.RecipientAddress, emailModel.RecipientName));
 
-                message.PlainTextContent = textBody;
-                message.HtmlContent = htmlBody;
+            message.PlainTextContent = textBody;
+            message.HtmlContent = htmlBody;
 
-                _logger.LogInformation("Sending Email To: {email}, Subject: {subject} ...", emailModel.RecipientAddress, subject);
+            _logger.LogInformation("Sending Email To: {email}, Subject: {subject} ...", emailModel.RecipientAddress, subject);
 
-                var response = await _sendGridClient.SendEmailAsync(message).ConfigureAwait(false);
+            var response = await _sendGridClient.SendEmailAsync(message).ConfigureAwait(false);
 
-                _logger.LogInformation("Sent Email To: {email}, Subject: {subject}: Status Code: {statusCode}", emailModel.RecipientAddress, subject, response.StatusCode);
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Error Sending Email To: {email}; {message}", emailModel.RecipientAddress, ex.Message);
-                throw;
-            }
+            _logger.LogInformation("Sent Email To: {email}, Subject: {subject}: Status Code: {statusCode}", emailModel.RecipientAddress, subject, response.StatusCode);
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Error Sending Email To: {email}; {message}", emailModel.RecipientAddress, ex.Message);
+            throw;
         }
+    }
 
 
-        public string ApplyTemplate<TModel>(string handlebarTemplate, TModel model)
-        {
-            if (handlebarTemplate.IsNullOrWhiteSpace())
-                return string.Empty;
+    public string ApplyTemplate<TModel>(string handlebarTemplate, TModel model)
+    {
+        if (handlebarTemplate.IsNullOrWhiteSpace())
+            return string.Empty;
 
-            var compiledTemplate = Handlebars.Compile(handlebarTemplate);
-            return compiledTemplate(model);
-        }
+        var compiledTemplate = Handlebars.Compile(handlebarTemplate);
+        return compiledTemplate(model);
+    }
 
-        public async Task<IEmailTemplate> GetEmailTemplate(string templateKey)
+    public async Task<IEmailTemplate> GetEmailTemplate(string templateKey)
+    {
+        var cacheKey = "data-" + templateKey;
+        var emailTemplate = await _cache.GetOrCreateAsync(cacheKey, async entry =>
         {
-            var cacheKey = "data-" + templateKey;
-            var emailTemplate = await _cache.GetOrCreateAsync(cacheKey, async entry =>
-            {
-                entry.Priority = CacheItemPriority.NeverRemove;
+            entry.Priority = CacheItemPriority.NeverRemove;
 
-                var template = await GetDatabaseTemplate(templateKey);
-                if (template == null)
-                    template = GetResourceTemplate(templateKey);
+            var template = await GetDatabaseTemplate(templateKey);
+            if (template == null)
+                template = GetResourceTemplate(templateKey);
 
-                return template;
-            }).ConfigureAwait(false);
+            return template;
+        }).ConfigureAwait(false);
 
-            if (emailTemplate == null)
-                throw new DomainException(500, $"Could not find email template for key '{templateKey}'.");
+        if (emailTemplate == null)
+            throw new DomainException(500, $"Could not find email template for key '{templateKey}'.");
 
-            return emailTemplate;
-        }
+        return emailTemplate;
+    }
 
-        public async Task<IEmailTemplate> GetDatabaseTemplate(string templateKey)
-        {
-            var template = await _dataContext.EmailTemplates
-                .AsNoTracking()
-                .GetByKeyAsync(templateKey)
-                .ConfigureAwait(false);
+    public async Task<IEmailTemplate> GetDatabaseTemplate(string templateKey)
+    {
+        var template = await _dataContext.EmailTemplates
+            .AsNoTracking()
+            .GetByKeyAsync(templateKey)
+            .ConfigureAwait(false);
 
-            return template;
-        }
+        return template;
+    }
 
-        public IEmailTemplate GetResourceTemplate(string templateKey)
-        {
-            var assembly = Assembly.GetExecutingAssembly();
-            var resourceName = $"InstructorIQ.Core.Templates.{templateKey}.yml";
+    public IEmailTemplate GetResourceTemplate(string templateKey)
+    {
+        var assembly = Assembly.GetExecutingAssembly();
+        var resourceName = $"InstructorIQ.Core.Templates.{templateKey}.yml";
 
-            using var stream = assembly.GetManifestResourceStream(resourceName);
-            if (stream == null)
-                return null;
+        using var stream = assembly.GetManifestResourceStream(resourceName);
+        if (stream == null)
+            return null;
 
-            using var reader = new StreamReader(stream);
-            var deserializer = new DeserializerBuilder()
-                .WithNamingConvention(CamelCaseNamingConvention.Instance)
-                .Build();
+        using var reader = new StreamReader(stream);
+        var deserializer = new DeserializerBuilder()
+            .WithNamingConvention(CamelCaseNamingConvention.Instance)
+            .Build();
 
-            return deserializer.Deserialize<EmailTemplate>(reader);
-        }
+        return deserializer.Deserialize<EmailTemplate>(reader);
+    }
 
 
-        public static class Templates
-        {
-            public const string ResetPassword = "reset-password";
-            public const string PasswordlessLogin = "passwordless-login";
-            public const string UserInvite = "user-invite";
-            public const string SummaryReport = "summary-report";
-            public const string UserLink = "user-link";
-        }
+    public static class Templates
+    {
+        public const string ResetPassword = "reset-password";
+        public const string PasswordlessLogin = "passwordless-login";
+        public const string UserInvite = "user-invite";
+        public const string SummaryReport = "summary-report";
+        public const string UserLink = "user-link";
     }
 }
diff --git a/service/src/InstructorIQ.Core/Services/HtmlService.cs b/service/src/InstructorIQ.Core/Services/HtmlService.cs
index 347683c6..abcdeca4 100644
--- a/service/src/InstructorIQ.Core/Services/HtmlService.cs
+++ b/service/src/InstructorIQ.Core/Services/HtmlService.cs
@@ -1,22 +1,22 @@
-using AngleSharp.Dom;
+using AngleSharp.Dom;
 using AngleSharp.Html.Parser;
+
 using InstructorIQ.Core.Extensions;
 
-namespace InstructorIQ.Core.Services
+namespace InstructorIQ.Core.Services;
+
+public class HtmlService : IHtmlService
 {
-    public class HtmlService : IHtmlService
+    public string PlainText(string htmlText)
     {
-        public string PlainText(string htmlText)
-        {
-            if (htmlText.IsNullOrWhiteSpace())
-                return string.Empty;
+        if (htmlText.IsNullOrWhiteSpace())
+            return string.Empty;
 
-            var htmlParser = new HtmlParser();
-            var document = htmlParser.ParseDocument(htmlText);
-            var text = document.Body.Text();
-
-            return text;
-        }
+        var htmlParser = new HtmlParser();
+        var document = htmlParser.ParseDocument(htmlText);
+        var text = document.Body.Text();
 
+        return text;
     }
+
 }
diff --git a/service/src/InstructorIQ.Core/Services/ICleanupService.cs b/service/src/InstructorIQ.Core/Services/ICleanupService.cs
index b2f55f37..1111ac63 100644
--- a/service/src/InstructorIQ.Core/Services/ICleanupService.cs
+++ b/service/src/InstructorIQ.Core/Services/ICleanupService.cs
@@ -1,10 +1,9 @@
-using System.Threading;
+using System.Threading;
 using System.Threading.Tasks;
 
-namespace InstructorIQ.Core.Services
+namespace InstructorIQ.Core.Services;
+
+public interface ICleanupService
 {
-    public interface ICleanupService
-    {
-        Task ProcessAsync(CancellationToken cancellationToken = default);
-    }
-}
\ No newline at end of file
+    Task ProcessAsync(CancellationToken cancellationToken = default);
+}
diff --git a/service/src/InstructorIQ.Core/Services/IEmailTemplate.cs b/service/src/InstructorIQ.Core/Services/IEmailTemplate.cs
index ccdc23cc..a2a2e582 100644
--- a/service/src/InstructorIQ.Core/Services/IEmailTemplate.cs
+++ b/service/src/InstructorIQ.Core/Services/IEmailTemplate.cs
@@ -1,21 +1,20 @@
 using System;
 
-namespace InstructorIQ.Core.Services
+namespace InstructorIQ.Core.Services;
+
+public interface IEmailTemplate
 {
-    public interface IEmailTemplate
-    {
-        string FromAddress { get; set; }
+    string FromAddress { get; set; }
 
-        string FromName { get; set; }
+    string FromName { get; set; }
 
-        string ReplyToAddress { get; set; }
+    string ReplyToAddress { get; set; }
 
-        string ReplyToName { get; set; }
+    string ReplyToName { get; set; }
 
-        string Subject { get; set; }
+    string Subject { get; set; }
 
-        string TextBody { get; set; }
+    string TextBody { get; set; }
 
-        string HtmlBody { get; set; }
-    }
-}
\ No newline at end of file
+    string HtmlBody { get; set; }
+}
diff --git a/service/src/InstructorIQ.Core/Services/IEmailTemplateService.cs b/service/src/InstructorIQ.Core/Services/IEmailTemplateService.cs
index 9b42f155..71380275 100644
--- a/service/src/InstructorIQ.Core/Services/IEmailTemplateService.cs
+++ b/service/src/InstructorIQ.Core/Services/IEmailTemplateService.cs
@@ -1,24 +1,25 @@
 using System.Threading.Tasks;
+
 using InstructorIQ.Core.Models;
+
 using MimeKit;
 
-namespace InstructorIQ.Core.Services
+namespace InstructorIQ.Core.Services;
+
+public interface IEmailTemplateService
 {
-    public interface IEmailTemplateService
-    {
-        Task<bool> SendResetPasswordEmail(UserResetPasswordEmail resetPassword);
-        Task<bool> SendPasswordlessLoginEmail(UserPasswordlessEmail loginEmail);
-        Task<bool> SendUserInviteEmail(UserInviteEmail inviteEmail);
-        Task<bool> SendSummaryEmail(SummaryReportEmail summaryEmail);
-        Task<bool> SendUserLinkEmail(UserLinkEmail userLinkModel);
+    Task<bool> SendResetPasswordEmail(UserResetPasswordEmail resetPassword);
+    Task<bool> SendPasswordlessLoginEmail(UserPasswordlessEmail loginEmail);
+    Task<bool> SendUserInviteEmail(UserInviteEmail inviteEmail);
+    Task<bool> SendSummaryEmail(SummaryReportEmail summaryEmail);
+    Task<bool> SendUserLinkEmail(UserLinkEmail userLinkModel);
 
-        Task SendTemplate<TModel>(IEmailTemplate emailTemplate, TModel emailModel)
-            where TModel : IEmailRecipient;
+    Task SendTemplate<TModel>(IEmailTemplate emailTemplate, TModel emailModel)
+        where TModel : IEmailRecipient;
 
-        Task<IEmailTemplate> GetEmailTemplate(string templateKey);
-        Task<IEmailTemplate> GetDatabaseTemplate(string templateKey);
-        IEmailTemplate GetResourceTemplate(string templateKey);
+    Task<IEmailTemplate> GetEmailTemplate(string templateKey);
+    Task<IEmailTemplate> GetDatabaseTemplate(string templateKey);
+    IEmailTemplate GetResourceTemplate(string templateKey);
 
-        string ApplyTemplate<TModel>(string handlebarTemplate, TModel model);
-    }
+    string ApplyTemplate<TModel>(string handlebarTemplate, TModel model);
 }
diff --git a/service/src/InstructorIQ.Core/Services/IHtmlService.cs b/service/src/InstructorIQ.Core/Services/IHtmlService.cs
index 84db4118..cc069e37 100644
--- a/service/src/InstructorIQ.Core/Services/IHtmlService.cs
+++ b/service/src/InstructorIQ.Core/Services/IHtmlService.cs
@@ -1,7 +1,6 @@
-namespace InstructorIQ.Core.Services
+namespace InstructorIQ.Core.Services;
+
+public interface IHtmlService
 {
-    public interface IHtmlService
-    {
-        string PlainText(string htmlText);
-    }
-}
\ No newline at end of file
+    string PlainText(string htmlText);
+}
diff --git a/service/src/InstructorIQ.Core/Services/IImportProcessService.cs b/service/src/InstructorIQ.Core/Services/IImportProcessService.cs
index 715db81b..d6729737 100644
--- a/service/src/InstructorIQ.Core/Services/IImportProcessService.cs
+++ b/service/src/InstructorIQ.Core/Services/IImportProcessService.cs
@@ -1,11 +1,10 @@
-using System;
+using System;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace InstructorIQ.Core.Services
+namespace InstructorIQ.Core.Services;
+
+public interface IImportProcessService
 {
-    public interface IImportProcessService
-    {
-        Task ImportMembersAsync(Guid id, CancellationToken cancellationToken = default(CancellationToken));
-    }
-}
\ No newline at end of file
+    Task ImportMembersAsync(Guid id, CancellationToken cancellationToken = default(CancellationToken));
+}
diff --git a/service/src/InstructorIQ.Core/Services/IStateService.cs b/service/src/InstructorIQ.Core/Services/IStateService.cs
index b1eb0f1b..f5fd9824 100644
--- a/service/src/InstructorIQ.Core/Services/IStateService.cs
+++ b/service/src/InstructorIQ.Core/Services/IStateService.cs
@@ -1,8 +1,7 @@
-namespace InstructorIQ.Core.Services
+namespace InstructorIQ.Core.Services;
+
+public interface IStateService
 {
-    public interface IStateService
-    {
-        void WriteState<T>(T state, string name);
-        T ReadState<T>(string name);
-    }
-}
\ No newline at end of file
+    void WriteState<T>(T state, string name);
+    T ReadState<T>(string name);
+}
diff --git a/service/src/InstructorIQ.Core/Services/IStorageService.cs b/service/src/InstructorIQ.Core/Services/IStorageService.cs
index dabbddff..92eb0a5f 100644
--- a/service/src/InstructorIQ.Core/Services/IStorageService.cs
+++ b/service/src/InstructorIQ.Core/Services/IStorageService.cs
@@ -2,11 +2,10 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace InstructorIQ.Core.Services
+namespace InstructorIQ.Core.Services;
+
+public interface IStorageService
 {
-    public interface IStorageService
-    {
-        Task<Stream> OpenReadAsync(string blobName, CancellationToken cancellationToken);
-        Task UploadAsync(string blobName, Stream stream, CancellationToken cancellationToken);
-    }
+    Task<Stream> OpenReadAsync(string blobName, CancellationToken cancellationToken);
+    Task UploadAsync(string blobName, Stream stream, CancellationToken cancellationToken);
 }
diff --git a/service/src/InstructorIQ.Core/Services/ImportProcessService.cs b/service/src/InstructorIQ.Core/Services/ImportProcessService.cs
index 1174d1ce..6f9a6d7f 100644
--- a/service/src/InstructorIQ.Core/Services/ImportProcessService.cs
+++ b/service/src/InstructorIQ.Core/Services/ImportProcessService.cs
@@ -24,146 +24,145 @@
 
 using StringExtensions = InstructorIQ.Core.Extensions.StringExtensions;
 
-namespace InstructorIQ.Core.Services
+namespace InstructorIQ.Core.Services;
+
+public class ImportProcessService : IImportProcessService
 {
-    public class ImportProcessService : IImportProcessService
+    private readonly InstructorIQContext _context;
+    private readonly IStorageService _storageService;
+    private readonly IDataSession _dataSession;
+    private readonly ILogger<ImportProcessService> _logger;
+    private readonly IMediator _mediator;
+
+    public ImportProcessService(InstructorIQContext context, IStorageService storageService, IDataSession dataSession, ILogger<ImportProcessService> logger, IMediator mediator)
     {
-        private readonly InstructorIQContext _context;
-        private readonly IStorageService _storageService;
-        private readonly IDataSession _dataSession;
-        private readonly ILogger<ImportProcessService> _logger;
-        private readonly IMediator _mediator;
+        _context = context;
+        _storageService = storageService;
+        _dataSession = dataSession;
+        _logger = logger;
+        _mediator = mediator;
+    }
 
-        public ImportProcessService(InstructorIQContext context, IStorageService storageService, IDataSession dataSession, ILogger<ImportProcessService> logger, IMediator mediator)
-        {
-            _context = context;
-            _storageService = storageService;
-            _dataSession = dataSession;
-            _logger = logger;
-            _mediator = mediator;
-        }
+    public async Task ImportMembersAsync(Guid id, CancellationToken cancellationToken = default(CancellationToken))
+    {
+        ImportJob importJob = null;
 
-        public async Task ImportMembersAsync(Guid id, CancellationToken cancellationToken = default(CancellationToken))
+        try
         {
-            ImportJob importJob = null;
-
-            try
+            importJob = await _context.ImportJobs.FindAsync(id);
+            if (importJob == null)
             {
-                importJob = await _context.ImportJobs.FindAsync(id);
-                if (importJob == null)
-                {
-                    _logger.LogError("Invalid import job identifier: {id}", id);
-                    return;
-                }
+                _logger.LogError("Invalid import job identifier: {id}", id);
+                return;
+            }
 
-                var importModel = JsonConvert.DeserializeObject<MemberImportJobModel>(importJob.MappingJson);
+            var importModel = JsonConvert.DeserializeObject<MemberImportJobModel>(importJob.MappingJson);
 
-                var dataList = await LoadData(importJob, importModel, cancellationToken);
+            var dataList = await LoadData(importJob, importModel, cancellationToken);
 
-                await ImportUsers(importJob, dataList, cancellationToken);
+            await ImportUsers(importJob, dataList, cancellationToken);
 
-                var message = $"Processed member import request '{importModel.Name}'; Imported: {dataList.Count}";
+            var message = $"Processed member import request '{importModel.Name}'; Imported: {dataList.Count}";
 
-                await SendNotification(importJob, message, cancellationToken);
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Error processing import '{id}': {message}", id, ex.Message);
+            await SendNotification(importJob, message, cancellationToken);
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Error processing import '{id}': {message}", id, ex.Message);
 
-                if (importJob == null)
-                    throw;
+            if (importJob == null)
+                throw;
 
-                var message = $"Error Processing member import request; {ex.GetBaseException().Message}";
-                await SendNotification(importJob, message, cancellationToken);
+            var message = $"Error Processing member import request; {ex.GetBaseException().Message}";
+            await SendNotification(importJob, message, cancellationToken);
 
-                throw;
-            }
+            throw;
         }
+    }
 
-        private async Task SendNotification(ImportJob importJob, string message, CancellationToken cancellationToken)
+    private async Task SendNotification(ImportJob importJob, string message, CancellationToken cancellationToken)
+    {
+        var createModel = new NotificationCreateModel
         {
-            var createModel = new NotificationCreateModel
-            {
-                Created = DateTimeOffset.UtcNow,
-                CreatedBy = importJob.CreatedBy,
-                Updated = DateTimeOffset.UtcNow,
-                UpdatedBy = importJob.CreatedBy,
-                TenantId = importJob.TenantId,
-                UserName = importJob.CreatedBy,
-                Type = importJob.Type,
-                Message = message
-            };
-
-            var command = new EntityCreateCommand<NotificationCreateModel, NotificationReadModel>(null, createModel);
-            var result = await _mediator.Send(command, cancellationToken);
-        }
+            Created = DateTimeOffset.UtcNow,
+            CreatedBy = importJob.CreatedBy,
+            Updated = DateTimeOffset.UtcNow,
+            UpdatedBy = importJob.CreatedBy,
+            TenantId = importJob.TenantId,
+            UserName = importJob.CreatedBy,
+            Type = importJob.Type,
+            Message = message
+        };
+
+        var command = new EntityCreateCommand<NotificationCreateModel, NotificationReadModel>(null, createModel);
+        var result = await _mediator.Send(command, cancellationToken);
+    }
 
-        private async Task ImportUsers(ImportJob importJob, List<MemberImportModel> dataList, CancellationToken cancellationToken)
+    private async Task ImportUsers(ImportJob importJob, List<MemberImportModel> dataList, CancellationToken cancellationToken)
+    {
+        if (dataList.Count == 0)
         {
-            if (dataList.Count == 0)
-            {
-                _logger.LogWarning("No data to import");
-                return;
-            }
-
-            var dataTable = dataList.ToDataTable();
-
-            await _dataSession.StoredProcedure("[IQ].[ImportUsers]")
-                .SqlParameter("@userTable", dataTable)
-                .Parameter("@tenantId", importJob.TenantId)
-                .Parameter("@roleName", Data.Constants.Role.MemberName)
-                .ExecuteAsync(cancellationToken);
+            _logger.LogWarning("No data to import");
+            return;
         }
 
-        private async Task<List<MemberImportModel>> LoadData(ImportJob importJob, MemberImportJobModel importModel, CancellationToken cancellationToken)
-        {
-            var dataList = new List<MemberImportModel>();
+        var dataTable = dataList.ToDataTable();
 
-            var configuration = new CsvConfiguration(CultureInfo.CurrentCulture) { HasHeaderRecord = true };
+        await _dataSession.StoredProcedure("[IQ].[ImportUsers]")
+            .SqlParameter("@userTable", dataTable)
+            .Parameter("@tenantId", importJob.TenantId)
+            .Parameter("@roleName", Data.Constants.Role.MemberName)
+            .ExecuteAsync(cancellationToken);
+    }
 
-            using var blobStream = await _storageService.OpenReadAsync(importJob.StorageFile, cancellationToken);
-            using var reader = new StreamReader(blobStream);
-            using var csv = new CsvReader(reader, configuration);
+    private async Task<List<MemberImportModel>> LoadData(ImportJob importJob, MemberImportJobModel importModel, CancellationToken cancellationToken)
+    {
+        var dataList = new List<MemberImportModel>();
 
-            csv.Read();
-            csv.ReadHeader();
+        var configuration = new CsvConfiguration(CultureInfo.CurrentCulture) { HasHeaderRecord = true };
 
-            while (csv.Read())
-            {
-                var item = new MemberImportModel();
-                item.Email = csv.GetField(importModel.EmailMapping);
+        using var blobStream = await _storageService.OpenReadAsync(importJob.StorageFile, cancellationToken);
+        using var reader = new StreamReader(blobStream);
+        using var csv = new CsvReader(reader, configuration);
 
-                if (StringExtensions.IsNullOrEmpty(item.Email))
-                    continue;
+        csv.Read();
+        csv.ReadHeader();
 
-                if (StringExtensions.HasValue(importModel.DisplayNameMapping))
-                    item.DisplayName = csv.GetField(importModel.DisplayNameMapping);
+        while (csv.Read())
+        {
+            var item = new MemberImportModel();
+            item.Email = csv.GetField(importModel.EmailMapping);
 
-                if (StringExtensions.HasValue(importModel.SortNameMapping))
-                    item.SortName = csv.GetField(importModel.SortNameMapping);
+            if (StringExtensions.IsNullOrEmpty(item.Email))
+                continue;
 
-                if (StringExtensions.HasValue(importModel.GivenNameMapping))
-                    item.GivenName = csv.GetField(importModel.GivenNameMapping);
+            if (StringExtensions.HasValue(importModel.DisplayNameMapping))
+                item.DisplayName = csv.GetField(importModel.DisplayNameMapping);
 
-                if (StringExtensions.HasValue(importModel.FamilyNameMapping))
-                    item.FamilyName = csv.GetField(importModel.FamilyNameMapping);
+            if (StringExtensions.HasValue(importModel.SortNameMapping))
+                item.SortName = csv.GetField(importModel.SortNameMapping);
 
-                if (StringExtensions.HasValue(importModel.JobTitleMapping))
-                    item.JobTitle = csv.GetField(importModel.JobTitleMapping);
+            if (StringExtensions.HasValue(importModel.GivenNameMapping))
+                item.GivenName = csv.GetField(importModel.GivenNameMapping);
 
-                if (StringExtensions.HasValue(importModel.PhoneNumberMapping))
-                    item.PhoneNumber = csv.GetField(importModel.PhoneNumberMapping);
+            if (StringExtensions.HasValue(importModel.FamilyNameMapping))
+                item.FamilyName = csv.GetField(importModel.FamilyNameMapping);
 
-                if (StringExtensions.IsNullOrEmpty(item.DisplayName))
-                    item.DisplayName = $"{item.GivenName} {item.FamilyName}".Trim();
+            if (StringExtensions.HasValue(importModel.JobTitleMapping))
+                item.JobTitle = csv.GetField(importModel.JobTitleMapping);
 
-                if (StringExtensions.IsNullOrEmpty(item.SortName))
-                    item.SortName = $"{item.FamilyName}, {item.GivenName}".Trim();
+            if (StringExtensions.HasValue(importModel.PhoneNumberMapping))
+                item.PhoneNumber = csv.GetField(importModel.PhoneNumberMapping);
 
-                dataList.Add(item);
-            }
+            if (StringExtensions.IsNullOrEmpty(item.DisplayName))
+                item.DisplayName = $"{item.GivenName} {item.FamilyName}".Trim();
 
-            return dataList;
+            if (StringExtensions.IsNullOrEmpty(item.SortName))
+                item.SortName = $"{item.FamilyName}, {item.GivenName}".Trim();
+
+            dataList.Add(item);
         }
+
+        return dataList;
     }
 }
diff --git a/service/src/InstructorIQ.Core/Services/RegisterServiceModule.cs b/service/src/InstructorIQ.Core/Services/RegisterServiceModule.cs
index 2e68705b..bf37b1c2 100644
--- a/service/src/InstructorIQ.Core/Services/RegisterServiceModule.cs
+++ b/service/src/InstructorIQ.Core/Services/RegisterServiceModule.cs
@@ -1,45 +1,52 @@
 using System;
 
-using EntityChange;
+using Azure.Data.Tables;
 
-using Injectio.Attributes;
+using EntityChange;
 
 using InstructorIQ.Core.Options;
 
 using MediatR.CommandQuery.Definitions;
 
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Options;
 
 using SendGrid.Extensions.DependencyInjection;
 
-namespace InstructorIQ.Core.Services
+namespace InstructorIQ.Core.Services;
+
+public class RegisterServiceModule
 {
-    public class RegisterServiceModule
+
+    [RegisterServices]
+    public void Register(IServiceCollection services)
     {
+        services.TryAddTransient<IEmailTemplateService, EmailTemplateService>();
+        services.TryAddTransient<ITenantResolver<Guid>, TenantResolver>();
+        services.TryAddTransient<IImportProcessService, ImportProcessService>();
 
-        [RegisterServices]
-        public void Register(IServiceCollection services)
-        {
-            services.TryAddTransient<IEmailTemplateService, EmailTemplateService>();
-            services.TryAddTransient<ITenantResolver<Guid>, TenantResolver>();
-            services.TryAddTransient<IImportProcessService, ImportProcessService>();
+        services.TryAddSingleton<IStorageService, StorageService>();
+        services.TryAddSingleton<IEntityComparer, EntityComparer>();
+        services.TryAddSingleton<IHtmlService, HtmlService>();
+        services.TryAddSingleton<IStateService, CookieStateService>();
+        services.TryAddSingleton<ICleanupService, CleanupService>();
 
-            services.TryAddSingleton<IStorageService, StorageService>();
-            services.TryAddSingleton<IEntityComparer, EntityComparer>();
-            services.TryAddSingleton<IHtmlService, HtmlService>();
-            services.TryAddSingleton<IStateService, CookieStateService>();
-            services.TryAddSingleton<ICleanupService, CleanupService>();
+        services.TryAddSingleton<TableServiceClient>(sp =>
+        {
+            var configuration = sp.GetRequiredService<IConfiguration>();
+            var connectionString = configuration.GetConnectionString("StorageAccount");
+            return new TableServiceClient(connectionString);
+        });
 
-            services.AddMemoryCache();
+        services.AddMemoryCache();
 
-            services.AddSendGrid((serviceProvider, options) =>
-            {
-                var configuration = serviceProvider.GetRequiredService<IOptions<SendGridConfiguration>>();
-                options.ApiKey = configuration.Value.ApiKey;
-            });
+        services.AddSendGrid((serviceProvider, options) =>
+        {
+            var configuration = serviceProvider.GetRequiredService<IOptions<SendGridConfiguration>>();
+            options.ApiKey = configuration.Value.ApiKey;
+        });
 
-        }
     }
 }
diff --git a/service/src/InstructorIQ.Core/Services/SelectItemFactory.cs b/service/src/InstructorIQ.Core/Services/SelectItemFactory.cs
index fb067ac3..7d5860b0 100644
--- a/service/src/InstructorIQ.Core/Services/SelectItemFactory.cs
+++ b/service/src/InstructorIQ.Core/Services/SelectItemFactory.cs
@@ -1,183 +1,184 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
+
 using InstructorIQ.Core.Data.Constants;
+
 using Microsoft.AspNetCore.Mvc.Rendering;
 
-namespace InstructorIQ.Core.Services
+namespace InstructorIQ.Core.Services;
+
+public class SelectItemFactory
 {
-    public class SelectItemFactory
+    private static readonly Lazy<IReadOnlyCollection<SelectListItem>> _years;
+    private static readonly Lazy<IReadOnlyCollection<SelectListItem>> _months;
+    private static readonly Lazy<IReadOnlyCollection<SelectListItem>> _boolean;
+    private static readonly Lazy<IReadOnlyCollection<SelectListItem>> _templateTypes;
+    private static readonly Lazy<IReadOnlyCollection<SelectListItem>> _states;
+    private static readonly Lazy<IReadOnlyCollection<SelectListItem>> _timeZones;
+
+    static SelectItemFactory()
     {
-        private static readonly Lazy<IReadOnlyCollection<SelectListItem>> _years;
-        private static readonly Lazy<IReadOnlyCollection<SelectListItem>> _months;
-        private static readonly Lazy<IReadOnlyCollection<SelectListItem>> _boolean;
-        private static readonly Lazy<IReadOnlyCollection<SelectListItem>> _templateTypes;
-        private static readonly Lazy<IReadOnlyCollection<SelectListItem>> _states;
-        private static readonly Lazy<IReadOnlyCollection<SelectListItem>> _timeZones;
-
-        static SelectItemFactory()
-        {
-            _years = new Lazy<IReadOnlyCollection<SelectListItem>>(BuildYears);
-            _months = new Lazy<IReadOnlyCollection<SelectListItem>>(BuildMonths);
-            _boolean = new Lazy<IReadOnlyCollection<SelectListItem>>(BuildBoolean);
-            _templateTypes = new Lazy<IReadOnlyCollection<SelectListItem>>(BuildTemplateTypes);
-            _states = new Lazy<IReadOnlyCollection<SelectListItem>>(BuildStates);
-            _timeZones = new Lazy<IReadOnlyCollection<SelectListItem>>(BuildTimeZones);
-        }
-
-
-        public static IReadOnlyCollection<SelectListItem> Years()
-        {
-            return _years.Value;
-        }
+        _years = new Lazy<IReadOnlyCollection<SelectListItem>>(BuildYears);
+        _months = new Lazy<IReadOnlyCollection<SelectListItem>>(BuildMonths);
+        _boolean = new Lazy<IReadOnlyCollection<SelectListItem>>(BuildBoolean);
+        _templateTypes = new Lazy<IReadOnlyCollection<SelectListItem>>(BuildTemplateTypes);
+        _states = new Lazy<IReadOnlyCollection<SelectListItem>>(BuildStates);
+        _timeZones = new Lazy<IReadOnlyCollection<SelectListItem>>(BuildTimeZones);
+    }
 
-        public static IReadOnlyCollection<SelectListItem> Months()
-        {
-            return _months.Value;
-        }
 
-        public static IReadOnlyCollection<SelectListItem> Boolean()
-        {
-            return _boolean.Value;
-        }
+    public static IReadOnlyCollection<SelectListItem> Years()
+    {
+        return _years.Value;
+    }
 
-        public static IReadOnlyCollection<SelectListItem> TemplateTypes()
-        {
-            return _templateTypes.Value;
-        }
+    public static IReadOnlyCollection<SelectListItem> Months()
+    {
+        return _months.Value;
+    }
 
-        public static IReadOnlyCollection<SelectListItem> States()
-        {
-            return _states.Value;
-        }
+    public static IReadOnlyCollection<SelectListItem> Boolean()
+    {
+        return _boolean.Value;
+    }
 
-        public static IReadOnlyCollection<SelectListItem> TimeZones()
-        {
-            return _timeZones.Value;
-        }
+    public static IReadOnlyCollection<SelectListItem> TemplateTypes()
+    {
+        return _templateTypes.Value;
+    }
 
+    public static IReadOnlyCollection<SelectListItem> States()
+    {
+        return _states.Value;
+    }
 
-        private static IReadOnlyCollection<SelectListItem> BuildTemplateTypes()
-        {
-            var values = new List<SelectListItem>
-            {
-                new SelectListItem("Editor", TemplateType.Editor),
-            };
+    public static IReadOnlyCollection<SelectListItem> TimeZones()
+    {
+        return _timeZones.Value;
+    }
 
-            return values;
-        }
 
-        private static IReadOnlyCollection<SelectListItem> BuildBoolean()
+    private static IReadOnlyCollection<SelectListItem> BuildTemplateTypes()
+    {
+        var values = new List<SelectListItem>
         {
-            var values = new List<SelectListItem>
-            {
-                new SelectListItem("No", false.ToString()),
-                new SelectListItem("Yes", true.ToString())
-            };
+            new SelectListItem("Editor", TemplateType.Editor),
+        };
 
-            return values;
-        }
+        return values;
+    }
 
-        private static IReadOnlyCollection<SelectListItem> BuildMonths()
+    private static IReadOnlyCollection<SelectListItem> BuildBoolean()
+    {
+        var values = new List<SelectListItem>
         {
-            var months = Enumerable
-                .Range(1, 12)
-                .Select(x => new SelectListItem
-                {
-                    Value = x.ToString(),
-                    Text = CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(x)
-                })
-                .ToList();
-
-            return months;
-        }
+            new SelectListItem("No", false.ToString()),
+            new SelectListItem("Yes", true.ToString())
+        };
 
-        private static IReadOnlyCollection<SelectListItem> BuildYears()
-        {
-            var years = new List<SelectListItem>();
-            var year = DateTime.Now.Year;
-            var start = year - 5;
-            var end = year + 5;
+        return values;
+    }
 
-            for (int i = start; i <= end; i++)
+    private static IReadOnlyCollection<SelectListItem> BuildMonths()
+    {
+        var months = Enumerable
+            .Range(1, 12)
+            .Select(x => new SelectListItem
             {
-                var c = i.ToString();
-                years.Add(new SelectListItem(c, c));
-            }
+                Value = x.ToString(),
+                Text = CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(x)
+            })
+            .ToList();
 
-            return years;
-        }
+        return months;
+    }
 
-        private static IReadOnlyCollection<SelectListItem> BuildStates()
+    private static IReadOnlyCollection<SelectListItem> BuildYears()
+    {
+        var years = new List<SelectListItem>();
+        var year = DateTime.Now.Year;
+        var start = year - 5;
+        var end = year + 5;
+
+        for (int i = start; i <= end; i++)
         {
-            var values = new List<SelectListItem>
-            {
-                new SelectListItem("AL - Alabama", "AL"),
-                new SelectListItem("AK - Alaska", "AK"),
-                new SelectListItem("AZ - Arizona", "AZ"),
-                new SelectListItem("AR - Arkansas", "AR"),
-                new SelectListItem("CA - California", "CA"),
-                new SelectListItem("CO - Colorado", "CO"),
-                new SelectListItem("CT - Connecticut", "CT"),
-                new SelectListItem("DE - Delaware", "DE"),
-                new SelectListItem("DC - District Of Columbia", "DC"),
-                new SelectListItem("FL - Florida", "FL"),
-                new SelectListItem("GA - Georgia", "GA"),
-                new SelectListItem("HI - Hawaii", "HI"),
-                new SelectListItem("ID - Idaho", "ID"),
-                new SelectListItem("IL - Illinois", "IL"),
-                new SelectListItem("IN - Indiana", "IN"),
-                new SelectListItem("IA - Iowa", "IA"),
-                new SelectListItem("KS - Kansas", "KS"),
-                new SelectListItem("KY - Kentucky", "KY"),
-                new SelectListItem("LA - Louisiana", "LA"),
-                new SelectListItem("ME - Maine", "ME"),
-                new SelectListItem("MD - Maryland", "MD"),
-                new SelectListItem("MA - Massachusetts", "MA"),
-                new SelectListItem("MI - Michigan", "MI"),
-                new SelectListItem("MN - Minnesota", "MN"),
-                new SelectListItem("MS - Mississippi", "MS"),
-                new SelectListItem("MO - Missouri", "MO"),
-                new SelectListItem("MT - Montana", "MT"),
-                new SelectListItem("NE - Nebraska", "NE"),
-                new SelectListItem("NV - Nevada", "NV"),
-                new SelectListItem("NH - New Hampshire", "NH"),
-                new SelectListItem("NJ - New Jersey", "NJ"),
-                new SelectListItem("NM - New Mexico", "NM"),
-                new SelectListItem("NY - New York", "NY"),
-                new SelectListItem("NC - North Carolina", "NC"),
-                new SelectListItem("ND - North Dakota", "ND"),
-                new SelectListItem("OH - Ohio", "OH"),
-                new SelectListItem("OK - Oklahoma", "OK"),
-                new SelectListItem("OR - Oregon", "OR"),
-                new SelectListItem("PA - Pennsylvania", "PA"),
-                new SelectListItem("RI - Rhode Island", "RI"),
-                new SelectListItem("SC - South Carolina", "SC"),
-                new SelectListItem("SD - South Dakota", "SD"),
-                new SelectListItem("TN - Tennessee", "TN"),
-                new SelectListItem("TX - Texas", "TX"),
-                new SelectListItem("UT - Utah", "UT"),
-                new SelectListItem("VT - Vermont", "VT"),
-                new SelectListItem("VA - Virginia", "VA"),
-                new SelectListItem("WA - Washington", "WA"),
-                new SelectListItem("WV - West Virginia", "WV"),
-                new SelectListItem("WI - Wisconsin", "WI"),
-                new SelectListItem("WY - Wyoming", "WY")
-            };
-
-            return values;
+            var c = i.ToString();
+            years.Add(new SelectListItem(c, c));
         }
 
-        private static IReadOnlyCollection<SelectListItem> BuildTimeZones()
+        return years;
+    }
+
+    private static IReadOnlyCollection<SelectListItem> BuildStates()
+    {
+        var values = new List<SelectListItem>
         {
-            var zones = new List<SelectListItem>();
+            new SelectListItem("AL - Alabama", "AL"),
+            new SelectListItem("AK - Alaska", "AK"),
+            new SelectListItem("AZ - Arizona", "AZ"),
+            new SelectListItem("AR - Arkansas", "AR"),
+            new SelectListItem("CA - California", "CA"),
+            new SelectListItem("CO - Colorado", "CO"),
+            new SelectListItem("CT - Connecticut", "CT"),
+            new SelectListItem("DE - Delaware", "DE"),
+            new SelectListItem("DC - District Of Columbia", "DC"),
+            new SelectListItem("FL - Florida", "FL"),
+            new SelectListItem("GA - Georgia", "GA"),
+            new SelectListItem("HI - Hawaii", "HI"),
+            new SelectListItem("ID - Idaho", "ID"),
+            new SelectListItem("IL - Illinois", "IL"),
+            new SelectListItem("IN - Indiana", "IN"),
+            new SelectListItem("IA - Iowa", "IA"),
+            new SelectListItem("KS - Kansas", "KS"),
+            new SelectListItem("KY - Kentucky", "KY"),
+            new SelectListItem("LA - Louisiana", "LA"),
+            new SelectListItem("ME - Maine", "ME"),
+            new SelectListItem("MD - Maryland", "MD"),
+            new SelectListItem("MA - Massachusetts", "MA"),
+            new SelectListItem("MI - Michigan", "MI"),
+            new SelectListItem("MN - Minnesota", "MN"),
+            new SelectListItem("MS - Mississippi", "MS"),
+            new SelectListItem("MO - Missouri", "MO"),
+            new SelectListItem("MT - Montana", "MT"),
+            new SelectListItem("NE - Nebraska", "NE"),
+            new SelectListItem("NV - Nevada", "NV"),
+            new SelectListItem("NH - New Hampshire", "NH"),
+            new SelectListItem("NJ - New Jersey", "NJ"),
+            new SelectListItem("NM - New Mexico", "NM"),
+            new SelectListItem("NY - New York", "NY"),
+            new SelectListItem("NC - North Carolina", "NC"),
+            new SelectListItem("ND - North Dakota", "ND"),
+            new SelectListItem("OH - Ohio", "OH"),
+            new SelectListItem("OK - Oklahoma", "OK"),
+            new SelectListItem("OR - Oregon", "OR"),
+            new SelectListItem("PA - Pennsylvania", "PA"),
+            new SelectListItem("RI - Rhode Island", "RI"),
+            new SelectListItem("SC - South Carolina", "SC"),
+            new SelectListItem("SD - South Dakota", "SD"),
+            new SelectListItem("TN - Tennessee", "TN"),
+            new SelectListItem("TX - Texas", "TX"),
+            new SelectListItem("UT - Utah", "UT"),
+            new SelectListItem("VT - Vermont", "VT"),
+            new SelectListItem("VA - Virginia", "VA"),
+            new SelectListItem("WA - Washington", "WA"),
+            new SelectListItem("WV - West Virginia", "WV"),
+            new SelectListItem("WI - Wisconsin", "WI"),
+            new SelectListItem("WY - Wyoming", "WY")
+        };
+
+        return values;
+    }
 
-            foreach(var z in TimeZoneInfo.GetSystemTimeZones())
-                zones.Add(new SelectListItem(z.DisplayName, z.Id));
+    private static IReadOnlyCollection<SelectListItem> BuildTimeZones()
+    {
+        var zones = new List<SelectListItem>();
 
-            return zones;
-        }
+        foreach (var z in TimeZoneInfo.GetSystemTimeZones())
+            zones.Add(new SelectListItem(z.DisplayName, z.Id));
 
+        return zones;
     }
+
 }
diff --git a/service/src/InstructorIQ.Core/Services/StorageService.cs b/service/src/InstructorIQ.Core/Services/StorageService.cs
index 6b3c3269..b40938ab 100644
--- a/service/src/InstructorIQ.Core/Services/StorageService.cs
+++ b/service/src/InstructorIQ.Core/Services/StorageService.cs
@@ -8,40 +8,39 @@
 
 using Microsoft.Extensions.Options;
 
-namespace InstructorIQ.Core.Services
+namespace InstructorIQ.Core.Services;
+
+public class StorageService : IStorageService
 {
-    public class StorageService : IStorageService
-    {
-        private readonly IOptions<StorageConfiguration> _storageOptions;
+    private readonly IOptions<StorageConfiguration> _storageOptions;
 
-        public StorageService(IOptions<StorageConfiguration> storageOptions)
-        {
-            _storageOptions = storageOptions;
-        }
+    public StorageService(IOptions<StorageConfiguration> storageOptions)
+    {
+        _storageOptions = storageOptions;
+    }
 
-        public async Task UploadAsync(string blobName, Stream stream, CancellationToken cancellationToken)
-        {
-            var blob = await GetBlobClient(blobName, cancellationToken);
+    public async Task UploadAsync(string blobName, Stream stream, CancellationToken cancellationToken)
+    {
+        var blob = await GetBlobClient(blobName, cancellationToken);
 
-            await blob.UploadAsync(stream, cancellationToken);
-        }
+        await blob.UploadAsync(stream, cancellationToken);
+    }
 
-        public async Task<Stream> OpenReadAsync(string blobName, CancellationToken cancellationToken)
-        {
-            var blob = await GetBlobClient(blobName, cancellationToken);
+    public async Task<Stream> OpenReadAsync(string blobName, CancellationToken cancellationToken)
+    {
+        var blob = await GetBlobClient(blobName, cancellationToken);
 
-            return await blob.OpenReadAsync(cancellationToken: cancellationToken);
-        }
+        return await blob.OpenReadAsync(cancellationToken: cancellationToken);
+    }
 
 
-        private async Task<BlobClient> GetBlobClient(string blobName, CancellationToken cancellationToken)
-        {
-            var options = _storageOptions.Value;
+    private async Task<BlobClient> GetBlobClient(string blobName, CancellationToken cancellationToken)
+    {
+        var options = _storageOptions.Value;
 
-            var container = new BlobContainerClient(options.ConnectionString, options.Container);
-            await container.CreateIfNotExistsAsync(Azure.Storage.Blobs.Models.PublicAccessType.None, cancellationToken: cancellationToken);
+        var container = new BlobContainerClient(options.ConnectionString, options.Container);
+        await container.CreateIfNotExistsAsync(Azure.Storage.Blobs.Models.PublicAccessType.None, cancellationToken: cancellationToken);
 
-            return container.GetBlobClient(blobName);
-        }
+        return container.GetBlobClient(blobName);
     }
 }
diff --git a/service/src/InstructorIQ.Core/Services/TenantResolver.cs b/service/src/InstructorIQ.Core/Services/TenantResolver.cs
index 4e7a7067..c6dd105d 100644
--- a/service/src/InstructorIQ.Core/Services/TenantResolver.cs
+++ b/service/src/InstructorIQ.Core/Services/TenantResolver.cs
@@ -1,25 +1,26 @@
-using System;
+using System;
 using System.Security.Principal;
 using System.Threading.Tasks;
-using MediatR.CommandQuery.Definitions;
+
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Multitenancy;
 
-namespace InstructorIQ.Core.Services
+using MediatR.CommandQuery.Definitions;
+
+namespace InstructorIQ.Core.Services;
+
+public class TenantResolver : ITenantResolver<Guid>
 {
-    public class TenantResolver : ITenantResolver<Guid>
-    {
-        private readonly ITenant<TenantReadModel> _tenant;
+    private readonly ITenant<TenantReadModel> _tenant;
 
-        public TenantResolver(ITenant<TenantReadModel> tenant)
-        {
-            _tenant = tenant;
-        }
+    public TenantResolver(ITenant<TenantReadModel> tenant)
+    {
+        _tenant = tenant;
+    }
 
-        public Task<Guid> GetTenantId(IPrincipal principal)
-        {
-            var id = _tenant?.Value?.Id ?? Guid.Empty;
-            return Task.FromResult(id);
-        }
+    public Task<Guid> GetTenantId(IPrincipal principal)
+    {
+        var id = _tenant?.Value?.Id ?? Guid.Empty;
+        return Task.FromResult(id);
     }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.Core/Utility/DateTimeFactory.cs b/service/src/InstructorIQ.Core/Utility/DateTimeFactory.cs
index 1708bb3f..669c951f 100644
--- a/service/src/InstructorIQ.Core/Utility/DateTimeFactory.cs
+++ b/service/src/InstructorIQ.Core/Utility/DateTimeFactory.cs
@@ -1,79 +1,78 @@
-using System;
+using System;
 
-namespace InstructorIQ.Core.Utility
-{
-    public static class DateTimeFactory
-    {
-        public static string DefaultTimeZone { get; set; } = "Central Standard Time";
-
-        public static DateTimeOffset? Create(DateTime? date, TimeSpan? time, string timeZone)
-        {
-            var zone = TimeZoneInfo.FindSystemTimeZoneById(timeZone ?? DefaultTimeZone);
-            return Create(date, time, zone);
-        }
+namespace InstructorIQ.Core.Utility;
 
-        public static DateTimeOffset? Create(DateTime? date, TimeSpan? time, TimeZoneInfo timeZoneInfo)
-        {
-            if (date == null || time == null)
-                return default;
-
-            return Create(date.Value, time.Value, timeZoneInfo);
-        }
+public static class DateTimeFactory
+{
+    public static string DefaultTimeZone { get; set; } = "Central Standard Time";
 
+    public static DateTimeOffset? Create(DateTime? date, TimeSpan? time, string timeZone)
+    {
+        var zone = TimeZoneInfo.FindSystemTimeZoneById(timeZone ?? DefaultTimeZone);
+        return Create(date, time, zone);
+    }
 
-        public static DateTimeOffset Create(DateTime date, TimeSpan time, string timeZone)
-        {
-            var zone = TimeZoneInfo.FindSystemTimeZoneById(timeZone ?? DefaultTimeZone);
-            return Create(date, time, zone);
-        }
+    public static DateTimeOffset? Create(DateTime? date, TimeSpan? time, TimeZoneInfo timeZoneInfo)
+    {
+        if (date == null || time == null)
+            return default;
 
-        public static DateTimeOffset Create(DateTime date, TimeSpan time, TimeZoneInfo timeZoneInfo)
-        {
-            if (timeZoneInfo == null)
-                throw new ArgumentNullException(nameof(timeZoneInfo));
+        return Create(date.Value, time.Value, timeZoneInfo);
+    }
 
-            var offset = timeZoneInfo.GetUtcOffset(date);
 
-            return new DateTimeOffset(
-                date.Year,
-                date.Month,
-                date.Day,
-                time.Hours,
-                time.Minutes,
-                time.Seconds,
-                time.Milliseconds,
-                offset);
-        }
+    public static DateTimeOffset Create(DateTime date, TimeSpan time, string timeZone)
+    {
+        var zone = TimeZoneInfo.FindSystemTimeZoneById(timeZone ?? DefaultTimeZone);
+        return Create(date, time, zone);
+    }
 
+    public static DateTimeOffset Create(DateTime date, TimeSpan time, TimeZoneInfo timeZoneInfo)
+    {
+        if (timeZoneInfo == null)
+            throw new ArgumentNullException(nameof(timeZoneInfo));
+
+        var offset = timeZoneInfo.GetUtcOffset(date);
+
+        return new DateTimeOffset(
+            date.Year,
+            date.Month,
+            date.Day,
+            time.Hours,
+            time.Minutes,
+            time.Seconds,
+            time.Milliseconds,
+            offset);
+    }
 
-        public static DateTimeOffset Create(int year, int month, int day, int hour, int minute, int second, string timeZone)
-        {
-            return Create(year, month, day, hour, minute, second, 0, timeZone);
-        }
 
-        public static DateTimeOffset Create(int year, int month, int day, int hour, int minute, int second, int millisecond, string timeZone)
-        {
-            var zone = TimeZoneInfo.FindSystemTimeZoneById(timeZone ?? DefaultTimeZone);
-            return Create(year, month, day, hour, minute, second, millisecond, zone);
-        }
+    public static DateTimeOffset Create(int year, int month, int day, int hour, int minute, int second, string timeZone)
+    {
+        return Create(year, month, day, hour, minute, second, 0, timeZone);
+    }
 
+    public static DateTimeOffset Create(int year, int month, int day, int hour, int minute, int second, int millisecond, string timeZone)
+    {
+        var zone = TimeZoneInfo.FindSystemTimeZoneById(timeZone ?? DefaultTimeZone);
+        return Create(year, month, day, hour, minute, second, millisecond, zone);
+    }
 
-        public static DateTimeOffset Create(int year, int month, int day, int hour, int minute, int second, TimeZoneInfo timeZoneInfo)
-        {
-            return Create(year, month, day, hour, minute, second, 0, timeZoneInfo);
 
-        }
+    public static DateTimeOffset Create(int year, int month, int day, int hour, int minute, int second, TimeZoneInfo timeZoneInfo)
+    {
+        return Create(year, month, day, hour, minute, second, 0, timeZoneInfo);
 
-        public static DateTimeOffset Create(int year, int month, int day, int hour, int minute, int second, int millisecond, TimeZoneInfo timeZoneInfo)
-        {
-            if (timeZoneInfo == null)
-                throw new ArgumentNullException(nameof(timeZoneInfo));
+    }
 
-            var date = new DateTime(year, month, day, hour, minute, second, millisecond);
-            var offset = timeZoneInfo.GetUtcOffset(date);
+    public static DateTimeOffset Create(int year, int month, int day, int hour, int minute, int second, int millisecond, TimeZoneInfo timeZoneInfo)
+    {
+        if (timeZoneInfo == null)
+            throw new ArgumentNullException(nameof(timeZoneInfo));
 
-            return new DateTimeOffset(year, month, day, hour, minute, second, millisecond, offset);
-        }
+        var date = new DateTime(year, month, day, hour, minute, second, millisecond);
+        var offset = timeZoneInfo.GetUtcOffset(date);
 
+        return new DateTimeOffset(year, month, day, hour, minute, second, millisecond, offset);
     }
+
 }
diff --git a/service/src/InstructorIQ.Core/Utility/DisposableBag.cs b/service/src/InstructorIQ.Core/Utility/DisposableBag.cs
index 6fe00e02..aed9547d 100644
--- a/service/src/InstructorIQ.Core/Utility/DisposableBag.cs
+++ b/service/src/InstructorIQ.Core/Utility/DisposableBag.cs
@@ -1,37 +1,36 @@
-using System;
+using System;
 using System.Collections.Generic;
 
-namespace InstructorIQ.Core.Utility
+namespace InstructorIQ.Core.Utility;
+
+public class DisposableBag : IDisposable
 {
-    public class DisposableBag : IDisposable
-    {
-        private readonly Stack<IDisposable> _disposeStack = new Stack<IDisposable>();
+    private readonly Stack<IDisposable> _disposeStack = new Stack<IDisposable>();
 
-        public T Create<T>() where T : IDisposable, new()
-        {
-            var t = new T();
-            _disposeStack.Push(t);
+    public T Create<T>() where T : IDisposable, new()
+    {
+        var t = new T();
+        _disposeStack.Push(t);
 
-            return t;
-        }
+        return t;
+    }
 
-        public T Create<T>(Func<T> creator) where T : IDisposable
-        {
-            var t = creator();
-            _disposeStack.Push(t);
+    public T Create<T>(Func<T> creator) where T : IDisposable
+    {
+        var t = creator();
+        _disposeStack.Push(t);
 
-            return t;
-        }
+        return t;
+    }
 
 
-        public void Dispose()
+    public void Dispose()
+    {
+        while (_disposeStack.Count > 0)
         {
-            while (_disposeStack.Count > 0)
-            {
-                var d = _disposeStack.Pop();
-                d.Dispose();
-            }
-
+            var d = _disposeStack.Pop();
+            d.Dispose();
         }
+
     }
 }
diff --git a/service/src/InstructorIQ.WebApplication/Controllers/EventController.cs b/service/src/InstructorIQ.WebApplication/Controllers/EventController.cs
index b1213b9a..b2786355 100644
--- a/service/src/InstructorIQ.WebApplication/Controllers/EventController.cs
+++ b/service/src/InstructorIQ.WebApplication/Controllers/EventController.cs
@@ -1,89 +1,92 @@
-using System;
+using System;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+
 using Ical.Net.CalendarComponents;
 using Ical.Net.DataTypes;
 using Ical.Net.Serialization;
+
 using InstructorIQ.Core.Domain.Queries;
+
 using MediatR;
+
 using Microsoft.AspNetCore.Mvc;
 
-namespace InstructorIQ.WebApplication.Controllers
+namespace InstructorIQ.WebApplication.Controllers;
+
+[Route("api/event")]
+public class EventController : MediatorControllerBase
 {
-    [Route("api/event")]
-    public class EventController : MediatorControllerBase
+    public EventController(IMediator mediator) : base(mediator)
     {
-        public EventController(IMediator mediator) : base(mediator)
-        {
-        }
+    }
 
-        [HttpGet("{tenantId}")]
-        public async Task<IActionResult> Get(CancellationToken cancellationToken, Guid tenantId, DateTimeOffset start, DateTimeOffset end)
-        {
-            var command = new EventRangeQuery(User, tenantId, start, end);
-            var result = await Mediator.Send(command, cancellationToken);
+    [HttpGet("{tenantId}")]
+    public async Task<IActionResult> Get(CancellationToken cancellationToken, Guid tenantId, DateTimeOffset start, DateTimeOffset end)
+    {
+        var command = new EventRangeQuery(User, tenantId, start, end);
+        var result = await Mediator.Send(command, cancellationToken);
 
-            return Ok(result);
-        }
+        return Ok(result);
+    }
 
 
-        [HttpGet("ical/{tenant}", Name = "event-subscribe")]
-        public async Task<IActionResult> Get(CancellationToken cancellationToken, string tenant, DateTimeOffset? start, DateTimeOffset? end)
-        {
-            var query = new TenantSlugQuery(User, tenant);
-            var tenantModel = await Mediator.Send(query);
-            var tenantId = tenantModel.Id;
+    [HttpGet("ical/{tenant}", Name = "event-subscribe")]
+    public async Task<IActionResult> Get(CancellationToken cancellationToken, string tenant, DateTimeOffset? start, DateTimeOffset? end)
+    {
+        var query = new TenantSlugQuery(User, tenant);
+        var tenantModel = await Mediator.Send(query);
+        var tenantId = tenantModel.Id;
 
-            if (start == null)
-                start = DateTimeOffset.UtcNow.Subtract(TimeSpan.FromDays(60));
+        if (start == null)
+            start = DateTimeOffset.UtcNow.Subtract(TimeSpan.FromDays(60));
 
-            if (end == null)
-                end = start.Value.AddMonths(6);
+        if (end == null)
+            end = start.Value.AddMonths(6);
 
-            var command = new EventRangeQuery(User, tenantId, start.Value, end.Value);
-            var events = await Mediator.Send(command, cancellationToken);
+        var command = new EventRangeQuery(User, tenantId, start.Value, end.Value);
+        var events = await Mediator.Send(command, cancellationToken);
 
 
-            var calendar = new Ical.Net.Calendar();
-            calendar.Method = "PUBLISH";
-            calendar.AddTimeZone(tenantModel.TimeZone);
+        var calendar = new Ical.Net.Calendar();
+        calendar.Method = "PUBLISH";
+        calendar.AddTimeZone(tenantModel.TimeZone);
 
-            foreach (var e in events)
-            {
-                var calendarEvent = new CalendarEvent();
-                calendarEvent.Class = "PUBLIC";
-                calendarEvent.Uid = e.Id;
-                calendarEvent.Summary = e.Title;
-                calendarEvent.Description = e.Description;
-                calendarEvent.Location = e.Location;
-                calendarEvent.Categories.Add("Training");
+        foreach (var e in events)
+        {
+            var calendarEvent = new CalendarEvent();
+            calendarEvent.Class = "PUBLIC";
+            calendarEvent.Uid = e.Id;
+            calendarEvent.Summary = e.Title;
+            calendarEvent.Description = e.Description;
+            calendarEvent.Location = e.Location;
+            calendarEvent.Categories.Add("Training");
 
-                if (e.Start.HasValue)
-                    calendarEvent.Start = new CalDateTime(e.Start.Value.UtcDateTime) { HasTime = true };
+            if (e.Start.HasValue)
+                calendarEvent.Start = new CalDateTime(e.Start.Value.UtcDateTime) { HasTime = true };
 
-                if (e.End.HasValue)
-                    calendarEvent.End = new CalDateTime(e.End.Value.UtcDateTime) { HasTime = true };
+            if (e.End.HasValue)
+                calendarEvent.End = new CalDateTime(e.End.Value.UtcDateTime) { HasTime = true };
 
-                calendarEvent.LastModified = new CalDateTime(e.Modified.UtcDateTime);
+            calendarEvent.LastModified = new CalDateTime(e.Modified.UtcDateTime);
 
-                calendar.Events.Add(calendarEvent);
-            }
+            calendar.Events.Add(calendarEvent);
+        }
 
-            var serializationContext = new SerializationContext();
-            var calendarSerializer = new CalendarSerializer(serializationContext);
-            var calendarText = calendarSerializer.SerializeToString(calendar);
+        var serializationContext = new SerializationContext();
+        var calendarSerializer = new CalendarSerializer(serializationContext);
+        var calendarText = calendarSerializer.SerializeToString(calendar);
 
-            var contentType = "text/calendar; charset=utf-8";
+        var contentType = "text/calendar; charset=utf-8";
 
-            var contentDisposition = new System.Net.Mime.ContentDisposition();
-            contentDisposition.FileName = "training.ics";
-            contentDisposition.Inline = true;
+        var contentDisposition = new System.Net.Mime.ContentDisposition();
+        contentDisposition.FileName = "training.ics";
+        contentDisposition.Inline = true;
 
-            Response.Headers.Add("Content-Disposition", contentDisposition.ToString());
-            Response.Headers.Add("X-Content-Type-Options", "nosniff");
+        Response.Headers.Add("Content-Disposition", contentDisposition.ToString());
+        Response.Headers.Add("X-Content-Type-Options", "nosniff");
 
-            return Content(calendarText, contentType, Encoding.UTF8);
-        }
+        return Content(calendarText, contentType, Encoding.UTF8);
     }
 }
diff --git a/service/src/InstructorIQ.WebApplication/Controllers/MediatorControllerBase.cs b/service/src/InstructorIQ.WebApplication/Controllers/MediatorControllerBase.cs
index 82b4af59..a4504a92 100644
--- a/service/src/InstructorIQ.WebApplication/Controllers/MediatorControllerBase.cs
+++ b/service/src/InstructorIQ.WebApplication/Controllers/MediatorControllerBase.cs
@@ -1,17 +1,17 @@
-using MediatR;
+using MediatR;
+
 using Microsoft.AspNetCore.Mvc;
 
-namespace InstructorIQ.WebApplication.Controllers
+namespace InstructorIQ.WebApplication.Controllers;
+
+[ApiController]
+[Produces("application/json")]
+public abstract class MediatorControllerBase : ControllerBase
 {
-    [ApiController]
-    [Produces("application/json")]
-    public abstract class MediatorControllerBase : ControllerBase
+    protected MediatorControllerBase(IMediator mediator)
     {
-        protected MediatorControllerBase(IMediator mediator)
-        {
-            Mediator = mediator;
-        }
-
-        public IMediator Mediator { get; }
+        Mediator = mediator;
     }
-}
\ No newline at end of file
+
+    public IMediator Mediator { get; }
+}
diff --git a/service/src/InstructorIQ.WebApplication/Controllers/NotificationController.cs b/service/src/InstructorIQ.WebApplication/Controllers/NotificationController.cs
index f19f6fd6..c52880db 100644
--- a/service/src/InstructorIQ.WebApplication/Controllers/NotificationController.cs
+++ b/service/src/InstructorIQ.WebApplication/Controllers/NotificationController.cs
@@ -1,37 +1,39 @@
-using System;
+using System;
 using System.Threading;
 using System.Threading.Tasks;
+
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Domain.Queries;
 using InstructorIQ.Core.Security;
+
 using MediatR;
+
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
-namespace InstructorIQ.WebApplication.Controllers
-{
-    [Route("api/notification")]
-    public class NotificationController : MediatorControllerBase
-    {
-        private readonly UserClaimManager _userClaimManager;
+namespace InstructorIQ.WebApplication.Controllers;
 
-        public NotificationController(IMediator mediator, UserClaimManager userClaimManager) : base(mediator)
-        {
-            _userClaimManager = userClaimManager;
-        }
+[Route("api/notification")]
+public class NotificationController : MediatorControllerBase
+{
+    private readonly UserClaimManager _userClaimManager;
 
-        [Authorize]
-        [HttpGet("unread")]
-        public async Task<ActionResult<NotificationUnreadModel>> Get(CancellationToken cancellationToken)
-        {
-            var tenantId = _userClaimManager.GetTenantId(User) ?? Guid.Empty;
-            var userName = User.Identity.Name;
+    public NotificationController(IMediator mediator, UserClaimManager userClaimManager) : base(mediator)
+    {
+        _userClaimManager = userClaimManager;
+    }
 
-            var command = new NotificationUnreadQuery(User, userName, tenantId);
-            var result = await Mediator.Send(command, cancellationToken);
+    [Authorize]
+    [HttpGet("unread")]
+    public async Task<ActionResult<NotificationUnreadModel>> Get(CancellationToken cancellationToken)
+    {
+        var tenantId = _userClaimManager.GetTenantId(User) ?? Guid.Empty;
+        var userName = User.Identity.Name;
 
-            return Ok(result);
-        }
+        var command = new NotificationUnreadQuery(User, userName, tenantId);
+        var result = await Mediator.Send(command, cancellationToken);
 
+        return Ok(result);
     }
-}
\ No newline at end of file
+
+}
diff --git a/service/src/InstructorIQ.WebApplication/Controllers/TemplateController.cs b/service/src/InstructorIQ.WebApplication/Controllers/TemplateController.cs
index b1b2d144..894146a1 100644
--- a/service/src/InstructorIQ.WebApplication/Controllers/TemplateController.cs
+++ b/service/src/InstructorIQ.WebApplication/Controllers/TemplateController.cs
@@ -1,36 +1,38 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
+
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Security;
+
 using MediatR;
 using MediatR.CommandQuery.Queries;
+
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
-namespace InstructorIQ.WebApplication.Controllers
+namespace InstructorIQ.WebApplication.Controllers;
+
+[Route("api/template")]
+public class TemplateController : MediatorControllerBase
 {
-    [Route("api/template")]
-    public class TemplateController : MediatorControllerBase
-    {
-        private readonly UserClaimManager _userClaimManager;
+    private readonly UserClaimManager _userClaimManager;
 
-        public TemplateController(IMediator mediator, UserClaimManager userClaimManager) : base(mediator)
-        {
-            _userClaimManager = userClaimManager;
-        }
+    public TemplateController(IMediator mediator, UserClaimManager userClaimManager) : base(mediator)
+    {
+        _userClaimManager = userClaimManager;
+    }
 
-        [Authorize]
-        [HttpGet("editor")]
-        public async Task<ActionResult<IReadOnlyCollection<TemplateEditorModel>>> Get(CancellationToken cancellationToken)
-        {
-            var command = new EntitySelectQuery<TemplateEditorModel>(User, new EntitySelect());
-            var result = await Mediator.Send(command, cancellationToken);
+    [Authorize]
+    [HttpGet("editor")]
+    public async Task<ActionResult<IReadOnlyCollection<TemplateEditorModel>>> Get(CancellationToken cancellationToken)
+    {
+        var command = new EntitySelectQuery<TemplateEditorModel>(User, new EntitySelect());
+        var result = await Mediator.Send(command, cancellationToken);
 
-            return Ok(result);
-        }
+        return Ok(result);
+    }
 
 
-    }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.WebApplication/InstructorIQ.WebApplication.csproj b/service/src/InstructorIQ.WebApplication/InstructorIQ.WebApplication.csproj
index e17c2439..b21508fa 100644
--- a/service/src/InstructorIQ.WebApplication/InstructorIQ.WebApplication.csproj
+++ b/service/src/InstructorIQ.WebApplication/InstructorIQ.WebApplication.csproj
@@ -13,17 +13,17 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="AngleSharp" Version="0.17.1" />
+    <PackageReference Include="AngleSharp" Version="1.0.1" />
     <PackageReference Include="BuildBundlerMinifier" Version="3.2.449" />
     <PackageReference Include="CommonMark.NET" Version="0.15.1" />
-    <PackageReference Include="FluentValidation.AspNetCore" Version="11.2.2" />
+    <PackageReference Include="FluentValidation.AspNetCore" Version="11.3.0" />
     <PackageReference Include="Humanizer" Version="2.14.1" />
     <PackageReference Include="Ical.Net" Version="4.2.0" />
-    <PackageReference Include="Injectio" Version="2.0.43" PrivateAssets="all" />
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="7.0.0" />
-    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="7.0.1" />
-    <PackageReference Include="NetEscapades.AspNetCore.SecurityHeaders" Version="0.17.0" />
+    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="7.0.5" />
+    <PackageReference Include="NetEscapades.AspNetCore.SecurityHeaders" Version="0.18.0" />
     <PackageReference Include="Serilog.AspNetCore" Version="6.1.0" />
+    <PackageReference Include="Serilog.Sinks.AzureTableStorage" Version="8.0.30-beta" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/service/src/InstructorIQ.WebApplication/Models/EntityCreateModelBase.cs b/service/src/InstructorIQ.WebApplication/Models/EntityCreateModelBase.cs
index 963db610..0ffaa527 100644
--- a/service/src/InstructorIQ.WebApplication/Models/EntityCreateModelBase.cs
+++ b/service/src/InstructorIQ.WebApplication/Models/EntityCreateModelBase.cs
@@ -1,21 +1,22 @@
-using InstructorIQ.Core.Domain.Models;
+using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Multitenancy;
+
 using MediatR;
+
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 
-namespace InstructorIQ.WebApplication.Models
+namespace InstructorIQ.WebApplication.Models;
+
+public abstract class EntityCreateModelBase<TEntity> : MediatorModelBase
+    where TEntity : new()
 {
-    public abstract class EntityCreateModelBase<TEntity> : MediatorModelBase
-        where TEntity : new()
+    protected EntityCreateModelBase(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
+        : base(tenant, mediator, loggerFactory)
     {
-        protected EntityCreateModelBase(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
-            : base(tenant, mediator, loggerFactory)
-        {
-            Entity = new TEntity();
-        }
-
-        [BindProperty]
-        public TEntity Entity { get; set; }
+        Entity = new TEntity();
     }
-}
\ No newline at end of file
+
+    [BindProperty]
+    public TEntity Entity { get; set; }
+}
diff --git a/service/src/InstructorIQ.WebApplication/Models/EntityIdentifierModelBase.cs b/service/src/InstructorIQ.WebApplication/Models/EntityIdentifierModelBase.cs
index af76c9e2..6c0e27d5 100644
--- a/service/src/InstructorIQ.WebApplication/Models/EntityIdentifierModelBase.cs
+++ b/service/src/InstructorIQ.WebApplication/Models/EntityIdentifierModelBase.cs
@@ -1,41 +1,43 @@
-using System;
+using System;
 using System.Threading.Tasks;
-using MediatR.CommandQuery.Queries;
+
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Multitenancy;
+
 using MediatR;
+using MediatR.CommandQuery.Queries;
+
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 
-namespace InstructorIQ.WebApplication.Models
+namespace InstructorIQ.WebApplication.Models;
+
+public abstract class EntityIdentifierModelBase<TModel> : MediatorModelBase
+    where TModel : new()
 {
-    public abstract class EntityIdentifierModelBase<TModel> : MediatorModelBase
-        where TModel : new()
+    protected EntityIdentifierModelBase(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
+        : base(tenant, mediator, loggerFactory)
     {
-        protected EntityIdentifierModelBase(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
-            : base(tenant, mediator, loggerFactory)
-        {
-            Entity = new TModel();
-        }
+        Entity = new TModel();
+    }
 
-        [BindProperty(SupportsGet = true)]
-        public Guid Id { get; set; }
+    [BindProperty(SupportsGet = true)]
+    public Guid Id { get; set; }
 
-        [BindProperty]
-        public TModel Entity { get; set; }
+    [BindProperty]
+    public TModel Entity { get; set; }
 
 
-        public virtual async Task<IActionResult> OnGetAsync()
-        {
-            var command = new EntityIdentifierQuery<Guid, TModel>(User, Id);
+    public virtual async Task<IActionResult> OnGetAsync()
+    {
+        var command = new EntityIdentifierQuery<Guid, TModel>(User, Id);
 
-            var result = await Mediator.Send(command);
-            if (result == null)
-                return NotFound();
+        var result = await Mediator.Send(command);
+        if (result == null)
+            return NotFound();
 
-            Entity = result;
+        Entity = result;
 
-            return Page();
-        }
+        return Page();
     }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.WebApplication/Models/EntityPagedModelBase.cs b/service/src/InstructorIQ.WebApplication/Models/EntityPagedModelBase.cs
index d224133e..d9410f65 100644
--- a/service/src/InstructorIQ.WebApplication/Models/EntityPagedModelBase.cs
+++ b/service/src/InstructorIQ.WebApplication/Models/EntityPagedModelBase.cs
@@ -1,83 +1,85 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Threading.Tasks;
+
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Multitenancy;
+
 using MediatR;
 using MediatR.CommandQuery.Queries;
+
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 
-namespace InstructorIQ.WebApplication.Models
+namespace InstructorIQ.WebApplication.Models;
+
+public abstract class EntityPagedModelBase<TEntity> : MediatorModelBase
 {
-    public abstract class EntityPagedModelBase<TEntity> : MediatorModelBase
+    protected EntityPagedModelBase(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
+        : base(tenant, mediator, loggerFactory)
     {
-        protected EntityPagedModelBase(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
-            : base(tenant, mediator, loggerFactory)
-        {
-            Items = new List<TEntity>();
-        }
+        Items = new List<TEntity>();
+    }
 
-        [BindProperty(Name = "p", SupportsGet = true)]
-        public int PageNumber { get; set; } = 1;
+    [BindProperty(Name = "p", SupportsGet = true)]
+    public int PageNumber { get; set; } = 1;
 
-        [BindProperty(Name = "z", SupportsGet = true)]
-        public int PageSize { get; set; } = 10;
+    [BindProperty(Name = "z", SupportsGet = true)]
+    public int PageSize { get; set; } = 10;
 
-        [BindProperty(Name = "s", SupportsGet = true)]
-        public string Sort { get; set; }
+    [BindProperty(Name = "s", SupportsGet = true)]
+    public string Sort { get; set; }
 
-        [BindProperty(Name = "q", SupportsGet = true)]
-        public string Query { get; set; }
+    [BindProperty(Name = "q", SupportsGet = true)]
+    public string Query { get; set; }
 
 
-        public long Total { get; set; }
+    public long Total { get; set; }
 
-        public IReadOnlyCollection<TEntity> Items { get; set; }
+    public IReadOnlyCollection<TEntity> Items { get; set; }
 
 
-        public virtual async Task<IActionResult> OnGetAsync()
-        {
-            var query = CreateQuery();
-            var command = new EntityPagedQuery<TEntity>(User, query);
+    public virtual async Task<IActionResult> OnGetAsync()
+    {
+        var query = CreateQuery();
+        var command = new EntityPagedQuery<TEntity>(User, query);
 
-            var result = await Mediator.Send(command);
-            Total = result.Total;
-            Items = result.Data;
+        var result = await Mediator.Send(command);
+        Total = result.Total;
+        Items = result.Data;
 
-            return Page();
-        }
+        return Page();
+    }
 
 
-        protected virtual EntityQuery CreateQuery()
-        {
-            var query = new EntityQuery(null, PageNumber, PageSize, Sort);
+    protected virtual EntityQuery CreateQuery()
+    {
+        var query = new EntityQuery(null, PageNumber, PageSize, Sort);
 
-            if (string.IsNullOrWhiteSpace(Query))
-                return query;
+        if (string.IsNullOrWhiteSpace(Query))
+            return query;
 
-            query.Filter = CreateFilter();
+        query.Filter = CreateFilter();
 
-            return query;
-        }
+        return query;
+    }
 
-        protected virtual EntityFilter CreateFilter()
+    protected virtual EntityFilter CreateFilter()
+    {
+        var filter = new EntityFilter
         {
-            var filter = new EntityFilter
+            Logic = EntityFilterLogic.Or,
+            Filters = new List<EntityFilter>
             {
-                Logic = EntityFilterLogic.Or,
-                Filters = new List<EntityFilter>
+                new EntityFilter
                 {
-                    new EntityFilter
-                    {
-                        Name = "Name",
-                        Value = Query,
-                        Operator = EntityFilterOperators.Contains
-                    }
+                    Name = "Name",
+                    Value = Query,
+                    Operator = EntityFilterOperators.Contains
                 }
-            };
-
-            return filter;
-        }
+            }
+        };
 
+        return filter;
     }
-}
\ No newline at end of file
+
+}
diff --git a/service/src/InstructorIQ.WebApplication/Models/ExportModelBase.cs b/service/src/InstructorIQ.WebApplication/Models/ExportModelBase.cs
index 6f86abce..8c9e046f 100644
--- a/service/src/InstructorIQ.WebApplication/Models/ExportModelBase.cs
+++ b/service/src/InstructorIQ.WebApplication/Models/ExportModelBase.cs
@@ -1,40 +1,43 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
 using System.Text;
+
 using CsvHelper;
+
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Multitenancy;
+
 using MediatR;
+
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 
-namespace InstructorIQ.WebApplication.Models
+namespace InstructorIQ.WebApplication.Models;
+
+public abstract class ExportModelBase : MediatorModelBase
 {
-    public abstract class ExportModelBase : MediatorModelBase
+    protected ExportModelBase(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
+        : base(tenant, mediator, loggerFactory)
     {
-        protected ExportModelBase(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory) 
-            : base(tenant, mediator, loggerFactory)
-        {
-        }
-
-        public FileContentResult Export<T>(IEnumerable<T> items, string fileName)
-        {
-            byte[] buffer;
+    }
 
-            var configuration = new CsvHelper.Configuration.CsvConfiguration(CultureInfo.CurrentCulture) { HasHeaderRecord = true };
+    public FileContentResult Export<T>(IEnumerable<T> items, string fileName)
+    {
+        byte[] buffer;
 
-            using (var memoryStream = new MemoryStream())
-            using (var writer = new StreamWriter(memoryStream, Encoding.UTF8, 1024, true))
-            using (var csv = new CsvWriter(writer, configuration))
-            {
-                csv.WriteRecords(items);
-                writer.Flush();
+        var configuration = new CsvHelper.Configuration.CsvConfiguration(CultureInfo.CurrentCulture) { HasHeaderRecord = true };
 
-                buffer = memoryStream.ToArray();
-            }
+        using (var memoryStream = new MemoryStream())
+        using (var writer = new StreamWriter(memoryStream, Encoding.UTF8, 1024, true))
+        using (var csv = new CsvWriter(writer, configuration))
+        {
+            csv.WriteRecords(items);
+            writer.Flush();
 
-            return File(buffer, "text/csv", fileName);
+            buffer = memoryStream.ToArray();
         }
+
+        return File(buffer, "text/csv", fileName);
     }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.WebApplication/Models/MediatorModelBase.cs b/service/src/InstructorIQ.WebApplication/Models/MediatorModelBase.cs
index ceda10bc..3bedc193 100644
--- a/service/src/InstructorIQ.WebApplication/Models/MediatorModelBase.cs
+++ b/service/src/InstructorIQ.WebApplication/Models/MediatorModelBase.cs
@@ -1,35 +1,37 @@
-using System;
+using System;
+
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Multitenancy;
+
 using MediatR;
+
 using Microsoft.AspNetCore.Mvc.RazorPages;
 using Microsoft.Extensions.Logging;
 
-namespace InstructorIQ.WebApplication.Models
+namespace InstructorIQ.WebApplication.Models;
+
+public abstract class MediatorModelBase : PageModel
 {
-    public abstract class MediatorModelBase : PageModel
+    protected MediatorModelBase(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
     {
-        protected MediatorModelBase(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
-        {
-            Tenant = tenant;
-            Mediator = mediator;
-            Logger = loggerFactory.CreateLogger(GetType());
-        }
+        Tenant = tenant;
+        Mediator = mediator;
+        Logger = loggerFactory.CreateLogger(GetType());
+    }
 
-        public ITenant<TenantReadModel> Tenant { get; }
+    public ITenant<TenantReadModel> Tenant { get; }
 
-        public string TenantRoute => Tenant?.Value?.Slug ?? string.Empty;
+    public string TenantRoute => Tenant?.Value?.Slug ?? string.Empty;
 
 
-        protected ILogger Logger { get; }
+    protected ILogger Logger { get; }
 
-        protected IMediator Mediator { get; }
+    protected IMediator Mediator { get; }
 
 
-        protected void ShowAlert(string message, string type = "success")
-        {
-            TempData["alert.type"] = type;
-            TempData["alert.message"] = message;
-        }
+    protected void ShowAlert(string message, string type = "success")
+    {
+        TempData["alert.type"] = type;
+        TempData["alert.message"] = message;
     }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.WebApplication/Pages/Account/AccessDenied.cshtml.cs b/service/src/InstructorIQ.WebApplication/Pages/Account/AccessDenied.cshtml.cs
index 2f3acc15..0d042a4e 100644
--- a/service/src/InstructorIQ.WebApplication/Pages/Account/AccessDenied.cshtml.cs
+++ b/service/src/InstructorIQ.WebApplication/Pages/Account/AccessDenied.cshtml.cs
@@ -1,17 +1,17 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
-namespace InstructorIQ.WebApplication.Pages.Account
+namespace InstructorIQ.WebApplication.Pages.Account;
+
+public class AccessDeniedModel : PageModel
 {
-    public class AccessDeniedModel : PageModel
+    public void OnGet()
     {
-        public void OnGet()
-        {
 
-        }
     }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.WebApplication/Pages/Account/ConfirmEmail.cshtml.cs b/service/src/InstructorIQ.WebApplication/Pages/Account/ConfirmEmail.cshtml.cs
index a23c9104..2bfcead8 100644
--- a/service/src/InstructorIQ.WebApplication/Pages/Account/ConfirmEmail.cshtml.cs
+++ b/service/src/InstructorIQ.WebApplication/Pages/Account/ConfirmEmail.cshtml.cs
@@ -1,36 +1,36 @@
-using System;
+using System;
 using System.Threading.Tasks;
+
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
-namespace InstructorIQ.WebApplication.Pages.Account
+namespace InstructorIQ.WebApplication.Pages.Account;
+
+[AllowAnonymous]
+public class ConfirmEmailModel : PageModel
 {
-    [AllowAnonymous]
-    public class ConfirmEmailModel : PageModel
-    {
-        private readonly UserManager<Core.Data.Entities.User> _userManager;
+    private readonly UserManager<Core.Data.Entities.User> _userManager;
 
-        public ConfirmEmailModel(UserManager<Core.Data.Entities.User> userManager)
-        {
-            _userManager = userManager;
-        }
+    public ConfirmEmailModel(UserManager<Core.Data.Entities.User> userManager)
+    {
+        _userManager = userManager;
+    }
 
-        public async Task<IActionResult> OnGetAsync(string userId, string code)
-        {
-            if (userId == null || code == null)
-                return RedirectToPage("/Index");
+    public async Task<IActionResult> OnGetAsync(string userId, string code)
+    {
+        if (userId == null || code == null)
+            return RedirectToPage("/Index");
 
-            var user = await _userManager.FindByIdAsync(userId);
-            if (user == null)
-                return NotFound($"Unable to load user with ID '{userId}'.");
+        var user = await _userManager.FindByIdAsync(userId);
+        if (user == null)
+            return NotFound($"Unable to load user with ID '{userId}'.");
 
-            var result = await _userManager.ConfirmEmailAsync(user, code);
-            if (!result.Succeeded)
-                throw new InvalidOperationException($"Error confirming email for user with ID '{userId}':");
+        var result = await _userManager.ConfirmEmailAsync(user, code);
+        if (!result.Succeeded)
+            throw new InvalidOperationException($"Error confirming email for user with ID '{userId}':");
 
-            return Page();
-        }
+        return Page();
     }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.WebApplication/Pages/Account/ForgotPassword.cshtml.cs b/service/src/InstructorIQ.WebApplication/Pages/Account/ForgotPassword.cshtml.cs
index 361e17dd..e6fbc646 100644
--- a/service/src/InstructorIQ.WebApplication/Pages/Account/ForgotPassword.cshtml.cs
+++ b/service/src/InstructorIQ.WebApplication/Pages/Account/ForgotPassword.cshtml.cs
@@ -1,76 +1,77 @@
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 using System.Threading.Tasks;
+
 using InstructorIQ.Core.Extensions;
 using InstructorIQ.Core.Models;
 using InstructorIQ.Core.Services;
+
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 using Microsoft.Extensions.Options;
 
-namespace InstructorIQ.WebApplication.Pages.Account
+namespace InstructorIQ.WebApplication.Pages.Account;
+
+[AllowAnonymous]
+public class ForgotPasswordModel : PageModel
 {
-    [AllowAnonymous]
-    public class ForgotPasswordModel : PageModel
+    private readonly UserManager<Core.Data.Entities.User> _userManager;
+    private readonly IEmailTemplateService _templateService;
+    private readonly IOptions<DataProtectionTokenProviderOptions> _tokenOptions;
+
+    public ForgotPasswordModel(UserManager<Core.Data.Entities.User> userManager, IEmailTemplateService templateService, IOptions<DataProtectionTokenProviderOptions> tokenOptions)
     {
-        private readonly UserManager<Core.Data.Entities.User> _userManager;
-        private readonly IEmailTemplateService _templateService;
-        private readonly IOptions<DataProtectionTokenProviderOptions> _tokenOptions;
+        _userManager = userManager;
+        _templateService = templateService;
+        _tokenOptions = tokenOptions;
+    }
 
-        public ForgotPasswordModel(UserManager<Core.Data.Entities.User> userManager, IEmailTemplateService templateService, IOptions<DataProtectionTokenProviderOptions> tokenOptions)
-        {
-            _userManager = userManager;
-            _templateService = templateService;
-            _tokenOptions = tokenOptions;
-        }
+    [BindProperty]
+    public InputModel Input { get; set; }
+
+    public class InputModel
+    {
+        [Required]
+        [EmailAddress]
+        public string Email { get; set; }
+    }
 
-        [BindProperty]
-        public InputModel Input { get; set; }
+    public async Task<IActionResult> OnPostAsync()
+    {
+        if (!ModelState.IsValid)
+            return Page();
 
-        public class InputModel
+        var user = await _userManager.FindByEmailAsync(Input.Email);
+        if (user == null)
         {
-            [Required]
-            [EmailAddress]
-            public string Email { get; set; }
+            ModelState.AddModelError("Input.Email", "Email address not registered.");
+            return Page();
         }
 
-        public async Task<IActionResult> OnPostAsync()
-        {
-            if (!ModelState.IsValid)
-                return Page();
-
-            var user = await _userManager.FindByEmailAsync(Input.Email);
-            if (user == null)
-            {
-                ModelState.AddModelError("Input.Email", "Email address not registered.");
-                return Page();
-            }
-
-            // fix issue where imported uses have null security stamp
-            var securityStamp = await _userManager.GetSecurityStampAsync(user);
-            if (securityStamp.IsNullOrEmpty())
-                await _userManager.UpdateSecurityStampAsync(user);
+        // fix issue where imported uses have null security stamp
+        var securityStamp = await _userManager.GetSecurityStampAsync(user);
+        if (securityStamp.IsNullOrEmpty())
+            await _userManager.UpdateSecurityStampAsync(user);
 
-            var code = await _userManager.GeneratePasswordResetTokenAsync(user);
-            var resetLink = Url.Page(
-                "/Account/ResetPassword",
-                pageHandler: null,
-                values: new { code },
-                protocol: Request.Scheme);
+        var code = await _userManager.GeneratePasswordResetTokenAsync(user);
+        var resetLink = Url.Page(
+            "/Account/ResetPassword",
+            pageHandler: null,
+            values: new { code },
+            protocol: Request.Scheme);
 
-            var model = new UserResetPasswordEmail
-            {
-                RecipientName = user.DisplayName,
-                RecipientAddress = user.Email,
-                Link = resetLink,
-                ExpireHours = (int)_tokenOptions.Value.TokenLifespan.TotalHours
-            };
-            Request.ReadUserAgent(model);
+        var model = new UserResetPasswordEmail
+        {
+            RecipientName = user.DisplayName,
+            RecipientAddress = user.Email,
+            Link = resetLink,
+            ExpireHours = (int)_tokenOptions.Value.TokenLifespan.TotalHours
+        };
+        Request.ReadUserAgent(model);
 
-            var result = await _templateService.SendResetPasswordEmail(model);
+        var result = await _templateService.SendResetPasswordEmail(model);
 
-            return RedirectToPage("./ForgotPasswordConfirmation");
-        }
+        return RedirectToPage("./ForgotPasswordConfirmation");
     }
 }
diff --git a/service/src/InstructorIQ.WebApplication/Pages/Account/ForgotPasswordConfirmation.cshtml.cs b/service/src/InstructorIQ.WebApplication/Pages/Account/ForgotPasswordConfirmation.cshtml.cs
index 2bd824f0..31d89245 100644
--- a/service/src/InstructorIQ.WebApplication/Pages/Account/ForgotPasswordConfirmation.cshtml.cs
+++ b/service/src/InstructorIQ.WebApplication/Pages/Account/ForgotPasswordConfirmation.cshtml.cs
@@ -1,14 +1,13 @@
-using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
-namespace InstructorIQ.WebApplication.Pages.Account
+namespace InstructorIQ.WebApplication.Pages.Account;
+
+[AllowAnonymous]
+public class ForgotPasswordConfirmationModel : PageModel
 {
-    [AllowAnonymous]
-    public class ForgotPasswordConfirmationModel : PageModel
+    public void OnGet()
     {
-        public void OnGet()
-        {
 
-        }
     }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.WebApplication/Pages/Account/Link.cshtml.cs b/service/src/InstructorIQ.WebApplication/Pages/Account/Link.cshtml.cs
index b1beaa9b..4a277709 100644
--- a/service/src/InstructorIQ.WebApplication/Pages/Account/Link.cshtml.cs
+++ b/service/src/InstructorIQ.WebApplication/Pages/Account/Link.cshtml.cs
@@ -1,71 +1,73 @@
-using System;
+using System;
 using System.Threading.Tasks;
+
 using InstructorIQ.Core.Domain.Commands;
 using InstructorIQ.Core.Domain.Models;
+
 using MediatR;
+
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 using Microsoft.Extensions.Logging;
 
-namespace InstructorIQ.WebApplication.Pages.Account
+namespace InstructorIQ.WebApplication.Pages.Account;
+
+public class LinkModel : PageModel
 {
-    public class LinkModel : PageModel
+    private readonly IMediator _mediator;
+    private readonly SignInManager<Core.Data.Entities.User> _signInManager;
+    private readonly ILogger<LoginModel> _logger;
+
+    public LinkModel(IMediator mediator, SignInManager<Core.Data.Entities.User> signInManager, ILogger<LoginModel> logger)
     {
-        private readonly IMediator _mediator;
-        private readonly SignInManager<Core.Data.Entities.User> _signInManager;
-        private readonly ILogger<LoginModel> _logger;
+        _mediator = mediator;
+        _signInManager = signInManager;
+        _logger = logger;
+    }
 
-        public LinkModel(IMediator mediator, SignInManager<Core.Data.Entities.User> signInManager, ILogger<LoginModel> logger)
-        {
-            _mediator = mediator;
-            _signInManager = signInManager;
-            _logger = logger;
-        }
+    [BindProperty(SupportsGet = true)]
+    public string Token { get; set; }
 
-        [BindProperty(SupportsGet = true)]
-        public string Token { get; set; }
+    public async Task<IActionResult> OnGetAsync()
+    {
+        if (string.IsNullOrEmpty(Token))
+            return RedirectToPage("/Account/Login");
 
-        public async Task<IActionResult> OnGetAsync()
-        {
-            if (string.IsNullOrEmpty(Token))
-                return RedirectToPage("/Account/Login");
+        var validateCommand = new LinkTokenValidateCommand(User, Token);
+        var linkToken = await _mediator.Send(validateCommand);
+        if (linkToken == null)
+            return Page();
 
-            var validateCommand = new LinkTokenValidateCommand(User, Token);
-            var linkToken = await _mediator.Send(validateCommand);
-            if (linkToken == null)
-                return Page();
+        var userManager = _signInManager.UserManager;
+        var user = await userManager.FindByNameAsync(linkToken.UserName);
+        if (user == null)
+            return Page();
 
-            var userManager = _signInManager.UserManager;
-            var user = await userManager.FindByNameAsync(linkToken.UserName);
-            if (user == null)
-                return Page();
+        await UpdateTenant(user, linkToken);
 
-            await UpdateTenant(user, linkToken);
-            
-            await _signInManager.SignInAsync(user, true);
+        await _signInManager.SignInAsync(user, true);
 
-            _logger.LogInformation("User '{userName}' logged in with link.", user.UserName);
+        _logger.LogInformation("User '{userName}' logged in with link.", user.UserName);
 
-            return LocalRedirect(linkToken.Url ?? "/");
-        }
+        return LocalRedirect(linkToken.Url ?? "/");
+    }
 
-        private async Task UpdateTenant(Core.Data.Entities.User user, LinkTokenReadModel linkToken)
-        {
-            if (!linkToken.TenantId.HasValue)
-                return;
+    private async Task UpdateTenant(Core.Data.Entities.User user, LinkTokenReadModel linkToken)
+    {
+        if (!linkToken.TenantId.HasValue)
+            return;
 
-            if (user.LastTenantId == linkToken.TenantId)
-                return;
+        if (user.LastTenantId == linkToken.TenantId)
+            return;
 
-            var userManager = _signInManager.UserManager;
+        var userManager = _signInManager.UserManager;
 
-            // change tenant id
-            user.LastTenantId = linkToken.TenantId;
-            var identityResult = await userManager.UpdateAsync(user);
+        // change tenant id
+        user.LastTenantId = linkToken.TenantId;
+        var identityResult = await userManager.UpdateAsync(user);
 
-            if (!identityResult.Succeeded)
-                throw new InvalidOperationException($"Unexpected error occurred updating user '{linkToken.UserName}'.");
-        }
+        if (!identityResult.Succeeded)
+            throw new InvalidOperationException($"Unexpected error occurred updating user '{linkToken.UserName}'.");
     }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.WebApplication/Pages/Account/Lockout.cshtml.cs b/service/src/InstructorIQ.WebApplication/Pages/Account/Lockout.cshtml.cs
index ad8fff06..c9533974 100644
--- a/service/src/InstructorIQ.WebApplication/Pages/Account/Lockout.cshtml.cs
+++ b/service/src/InstructorIQ.WebApplication/Pages/Account/Lockout.cshtml.cs
@@ -1,19 +1,19 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
-namespace InstructorIQ.WebApplication.Pages.Account
+namespace InstructorIQ.WebApplication.Pages.Account;
+
+[AllowAnonymous]
+public class LockoutModel : PageModel
 {
-    [AllowAnonymous]
-    public class LockoutModel : PageModel
+    public void OnGet()
     {
-        public void OnGet()
-        {
 
-        }
     }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.WebApplication/Pages/Account/Login.cshtml.cs b/service/src/InstructorIQ.WebApplication/Pages/Account/Login.cshtml.cs
index 5f7e5d86..83271c84 100644
--- a/service/src/InstructorIQ.WebApplication/Pages/Account/Login.cshtml.cs
+++ b/service/src/InstructorIQ.WebApplication/Pages/Account/Login.cshtml.cs
@@ -1,8 +1,9 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Threading.Tasks;
+
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Identity;
@@ -10,83 +11,82 @@
 using Microsoft.AspNetCore.Mvc.RazorPages;
 using Microsoft.Extensions.Logging;
 
-namespace InstructorIQ.WebApplication.Pages.Account
+namespace InstructorIQ.WebApplication.Pages.Account;
+
+[AllowAnonymous]
+public class LoginModel : PageModel
 {
-    [AllowAnonymous]
-    public class LoginModel : PageModel
-    {
-        private readonly SignInManager<Core.Data.Entities.User> _signInManager;
-        private readonly ILogger<LoginModel> _logger;
+    private readonly SignInManager<Core.Data.Entities.User> _signInManager;
+    private readonly ILogger<LoginModel> _logger;
 
-        public LoginModel(SignInManager<Core.Data.Entities.User> signInManager, ILogger<LoginModel> logger)
-        {
-            _signInManager = signInManager;
-            _logger = logger;
-        }
+    public LoginModel(SignInManager<Core.Data.Entities.User> signInManager, ILogger<LoginModel> logger)
+    {
+        _signInManager = signInManager;
+        _logger = logger;
+    }
 
-        [BindProperty]
-        public InputModel Input { get; set; }
+    [BindProperty]
+    public InputModel Input { get; set; }
 
-        public IList<AuthenticationScheme> ExternalLogins { get; set; }
+    public IList<AuthenticationScheme> ExternalLogins { get; set; }
 
-        [BindProperty(SupportsGet = true)]
-        public string ReturnUrl { get; set; }
+    [BindProperty(SupportsGet = true)]
+    public string ReturnUrl { get; set; }
 
-        [TempData]
-        public string ErrorMessage { get; set; }
+    [TempData]
+    public string ErrorMessage { get; set; }
 
-        public class InputModel
-        {
-            [Required]
-            [EmailAddress]
-            public string Email { get; set; }
+    public class InputModel
+    {
+        [Required]
+        [EmailAddress]
+        public string Email { get; set; }
 
-            [Required]
-            [DataType(DataType.Password)]
-            public string Password { get; set; }
+        [Required]
+        [DataType(DataType.Password)]
+        public string Password { get; set; }
 
-            [Display(Name = "Remember me?")]
-            public bool RememberMe { get; set; }
-        }
+        [Display(Name = "Remember me?")]
+        public bool RememberMe { get; set; }
+    }
 
-        public async Task OnGetAsync()
+    public async Task OnGetAsync()
+    {
+        if (!string.IsNullOrEmpty(ErrorMessage))
         {
-            if (!string.IsNullOrEmpty(ErrorMessage))
-            {
-                ModelState.AddModelError(string.Empty, ErrorMessage);
-            }
-
-            ReturnUrl ??= Url.Content("~/");
-
-            // Clear the existing external cookie to ensure a clean login process
-            await HttpContext.SignOutAsync(IdentityConstants.ExternalScheme);
-
-            var authenticationSchemes = await _signInManager.GetExternalAuthenticationSchemesAsync();
-            ExternalLogins = authenticationSchemes.ToList();
+            ModelState.AddModelError(string.Empty, ErrorMessage);
         }
 
-        public async Task<IActionResult> OnPostAsync()
-        {
-            ReturnUrl ??= Url.Content("~/");
+        ReturnUrl ??= Url.Content("~/");
 
-            if (!ModelState.IsValid)
-                return Page();
+        // Clear the existing external cookie to ensure a clean login process
+        await HttpContext.SignOutAsync(IdentityConstants.ExternalScheme);
 
-            var result = await _signInManager.PasswordSignInAsync(Input.Email, Input.Password, Input.RememberMe, true);
-            if (result.Succeeded)
-            {
-                _logger.LogInformation("User logged in.");
-                return LocalRedirect(ReturnUrl);
-            }
+        var authenticationSchemes = await _signInManager.GetExternalAuthenticationSchemesAsync();
+        ExternalLogins = authenticationSchemes.ToList();
+    }
 
-            if (result.IsLockedOut)
-            {
-                _logger.LogWarning("User account locked out.");
-                return RedirectToPage("./Lockout");
-            }
+    public async Task<IActionResult> OnPostAsync()
+    {
+        ReturnUrl ??= Url.Content("~/");
 
-            ModelState.AddModelError(string.Empty, "Invalid login attempt.");
+        if (!ModelState.IsValid)
             return Page();
+
+        var result = await _signInManager.PasswordSignInAsync(Input.Email, Input.Password, Input.RememberMe, true);
+        if (result.Succeeded)
+        {
+            _logger.LogInformation("User logged in.");
+            return LocalRedirect(ReturnUrl);
+        }
+
+        if (result.IsLockedOut)
+        {
+            _logger.LogWarning("User account locked out.");
+            return RedirectToPage("./Lockout");
         }
+
+        ModelState.AddModelError(string.Empty, "Invalid login attempt.");
+        return Page();
     }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.WebApplication/Pages/Account/Logout.cshtml.cs b/service/src/InstructorIQ.WebApplication/Pages/Account/Logout.cshtml.cs
index 6bed9a9e..04ef683d 100644
--- a/service/src/InstructorIQ.WebApplication/Pages/Account/Logout.cshtml.cs
+++ b/service/src/InstructorIQ.WebApplication/Pages/Account/Logout.cshtml.cs
@@ -1,33 +1,33 @@
-using System.Threading.Tasks;
+using System.Threading.Tasks;
+
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 using Microsoft.Extensions.Logging;
 
-namespace InstructorIQ.WebApplication.Pages.Account
+namespace InstructorIQ.WebApplication.Pages.Account;
+
+[AllowAnonymous]
+public class LogoutModel : PageModel
 {
-    [AllowAnonymous]
-    public class LogoutModel : PageModel
-    {
-        private readonly SignInManager<Core.Data.Entities.User> _signInManager;
-        private readonly ILogger<LogoutModel> _logger;
+    private readonly SignInManager<Core.Data.Entities.User> _signInManager;
+    private readonly ILogger<LogoutModel> _logger;
 
-        public LogoutModel(SignInManager<Core.Data.Entities.User> signInManager, ILogger<LogoutModel> logger)
-        {
-            _signInManager = signInManager;
-            _logger = logger;
-        }
+    public LogoutModel(SignInManager<Core.Data.Entities.User> signInManager, ILogger<LogoutModel> logger)
+    {
+        _signInManager = signInManager;
+        _logger = logger;
+    }
 
-        public async Task<IActionResult> OnGet(string returnUrl = null, string tenant = null)
-        {
-            await _signInManager.SignOutAsync();
-            _logger.LogInformation("User logged out.");
+    public async Task<IActionResult> OnGet(string returnUrl = null, string tenant = null)
+    {
+        await _signInManager.SignOutAsync();
+        _logger.LogInformation("User logged out.");
 
-            if (returnUrl != null)
-                return LocalRedirect(returnUrl);
+        if (returnUrl != null)
+            return LocalRedirect(returnUrl);
 
-            return RedirectToPage("/Index", new { tenant });
-        }
+        return RedirectToPage("/Index", new { tenant });
     }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.WebApplication/Pages/Account/Passwordless.cshtml.cs b/service/src/InstructorIQ.WebApplication/Pages/Account/Passwordless.cshtml.cs
index 16925ed8..3f4ea06c 100644
--- a/service/src/InstructorIQ.WebApplication/Pages/Account/Passwordless.cshtml.cs
+++ b/service/src/InstructorIQ.WebApplication/Pages/Account/Passwordless.cshtml.cs
@@ -1,6 +1,7 @@
-using System;
+using System;
 using System.ComponentModel.DataAnnotations;
 using System.Threading.Tasks;
+
 using InstructorIQ.Core.Domain.Commands;
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Extensions;
@@ -8,7 +9,9 @@
 using InstructorIQ.Core.Options;
 using InstructorIQ.Core.Security;
 using InstructorIQ.Core.Services;
+
 using MediatR;
+
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Identity;
@@ -17,107 +20,106 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 
-namespace InstructorIQ.WebApplication.Pages.Account
+namespace InstructorIQ.WebApplication.Pages.Account;
+
+[AllowAnonymous]
+public class PasswordlessModel : PageModel
 {
-    [AllowAnonymous]
-    public class PasswordlessModel : PageModel
+    private readonly IMediator _mediator;
+    private readonly UserManager<Core.Data.Entities.User> _userManager;
+    private readonly IEmailTemplateService _templateService;
+    private readonly ILogger<LoginModel> _logger;
+    private readonly IOptions<SecurityOptions> _securityOptions;
+
+    public PasswordlessModel(UserManager<Core.Data.Entities.User> userManager, IEmailTemplateService templateService, ILogger<LoginModel> logger, IOptions<SecurityOptions> securityOptions, IMediator mediator)
     {
-        private readonly IMediator _mediator;
-        private readonly UserManager<Core.Data.Entities.User> _userManager;
-        private readonly IEmailTemplateService _templateService;
-        private readonly ILogger<LoginModel> _logger;
-        private readonly IOptions<SecurityOptions> _securityOptions;
+        _userManager = userManager;
+        _logger = logger;
+        _securityOptions = securityOptions;
+        _mediator = mediator;
+        _templateService = templateService;
+    }
 
-        public PasswordlessModel(UserManager<Core.Data.Entities.User> userManager, IEmailTemplateService templateService, ILogger<LoginModel> logger, IOptions<SecurityOptions> securityOptions, IMediator mediator)
-        {
-            _userManager = userManager;
-            _logger = logger;
-            _securityOptions = securityOptions;
-            _mediator = mediator;
-            _templateService = templateService;
-        }
+    [BindProperty]
+    public InputModel Input { get; set; }
 
-        [BindProperty]
-        public InputModel Input { get; set; }
+    [BindProperty(SupportsGet = true)]
+    public string ReturnUrl { get; set; }
 
-        [BindProperty(SupportsGet = true)]
-        public string ReturnUrl { get; set; }
 
+    public class InputModel
+    {
+        [Required]
+        [EmailAddress]
+        public string Email { get; set; }
+    }
 
-        public class InputModel
-        {
-            [Required]
-            [EmailAddress]
-            public string Email { get; set; }
-        }
 
+    public async Task OnGetAsync()
+    {
+        ReturnUrl = ReturnUrl ?? Url.Content("~/");
 
-        public async Task OnGetAsync()
-        {
-            ReturnUrl = ReturnUrl ?? Url.Content("~/");
+        // Clear the existing external cookie to ensure a clean login process
+        await HttpContext.SignOutAsync(IdentityConstants.ExternalScheme);
+    }
 
-            // Clear the existing external cookie to ensure a clean login process
-            await HttpContext.SignOutAsync(IdentityConstants.ExternalScheme);
-        }
+    public async Task<IActionResult> OnPostAsync()
+    {
+        if (!ModelState.IsValid)
+            return Page();
 
-        public async Task<IActionResult> OnPostAsync()
+        var user = await _userManager.FindByEmailAsync(Input.Email);
+        if (user == null)
         {
-            if (!ModelState.IsValid)
-                return Page();
+            ModelState.AddModelError("Input.Email", "Email address not registered.");
+            return Page();
+        }
 
-            var user = await _userManager.FindByEmailAsync(Input.Email);
-            if (user == null)
-            {
-                ModelState.AddModelError("Input.Email", "Email address not registered.");
-                return Page();
-            }
+        // fix issue where imported uses have null security stamp
+        var securityStamp = await _userManager.GetSecurityStampAsync(user);
+        if (securityStamp.IsNullOrEmpty())
+            await _userManager.UpdateSecurityStampAsync(user);
 
-            // fix issue where imported uses have null security stamp
-            var securityStamp = await _userManager.GetSecurityStampAsync(user);
-            if (securityStamp.IsNullOrEmpty())
-                await _userManager.UpdateSecurityStampAsync(user);
+        var token = _userManager.GenerateNewAuthenticatorKey();
 
-            var token = _userManager.GenerateNewAuthenticatorKey();
+        await CreateLinkToken(user, token);
 
-            await CreateLinkToken(user, token);
+        await SendEmail(user, token);
 
-            await SendEmail(user, token);
+        return RedirectToPage("./PasswordlessConfirmation");
+    }
 
-            return RedirectToPage("./PasswordlessConfirmation");
-        }
+    private async Task SendEmail(Core.Data.Entities.User user, string token)
+    {
+        var loginLink = Url.Page(
+            "/Account/Link",
+            pageHandler: null,
+            values: new { token },
+            protocol: Request.Scheme);
 
-        private async Task SendEmail(Core.Data.Entities.User user, string token)
+        var model = new UserPasswordlessEmail
         {
-            var loginLink = Url.Page(
-                "/Account/Link",
-                pageHandler: null,
-                values: new {token},
-                protocol: Request.Scheme);
-
-            var model = new UserPasswordlessEmail
-            {
-                RecipientName = user.DisplayName,
-                RecipientAddress = user.Email,
-                Link = loginLink,
-                ExpireHours = (int) _securityOptions.Value.PasswordlessTokenLifespan.TotalHours
-            };
-            Request.ReadUserAgent(model);
-
-            var result = await _templateService.SendPasswordlessLoginEmail(model);
-        }
+            RecipientName = user.DisplayName,
+            RecipientAddress = user.Email,
+            Link = loginLink,
+            ExpireHours = (int)_securityOptions.Value.PasswordlessTokenLifespan.TotalHours
+        };
+        Request.ReadUserAgent(model);
+
+        var result = await _templateService.SendPasswordlessLoginEmail(model);
+    }
 
-        private async Task CreateLinkToken(Core.Data.Entities.User user, string token)
+    private async Task CreateLinkToken(Core.Data.Entities.User user, string token)
+    {
+        var createModel = new LinkTokenCreateModel
         {
-            var createModel = new LinkTokenCreateModel
-            {
-                Expires = DateTimeOffset.UtcNow.Add(_securityOptions.Value.PasswordlessTokenLifespan),
-                Url = ReturnUrl,
-                UserName = user.UserName,
-                TenantId = user.LastTenantId
-            };
-
-            var createCommand = new LinkTokenCreateCommand(User, createModel, token);
-            var linkToken = await _mediator.Send(createCommand);
-        }
+            Expires = DateTimeOffset.UtcNow.Add(_securityOptions.Value.PasswordlessTokenLifespan),
+            Url = ReturnUrl,
+            UserName = user.UserName,
+            TenantId = user.LastTenantId
+        };
+
+        var createCommand = new LinkTokenCreateCommand(User, createModel, token);
+        var linkToken = await _mediator.Send(createCommand);
     }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.WebApplication/Pages/Account/PasswordlessConfirmation.cshtml.cs b/service/src/InstructorIQ.WebApplication/Pages/Account/PasswordlessConfirmation.cshtml.cs
index fc511b08..90078b43 100644
--- a/service/src/InstructorIQ.WebApplication/Pages/Account/PasswordlessConfirmation.cshtml.cs
+++ b/service/src/InstructorIQ.WebApplication/Pages/Account/PasswordlessConfirmation.cshtml.cs
@@ -1,17 +1,17 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
-namespace InstructorIQ.WebApplication.Pages.Account
+namespace InstructorIQ.WebApplication.Pages.Account;
+
+public class PasswordlessConfirmationModel : PageModel
 {
-    public class PasswordlessConfirmationModel : PageModel
+    public void OnGet()
     {
-        public void OnGet()
-        {
 
-        }
     }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.WebApplication/Pages/Account/Register.cshtml.cs b/service/src/InstructorIQ.WebApplication/Pages/Account/Register.cshtml.cs
index 4afed87f..e203303f 100644
--- a/service/src/InstructorIQ.WebApplication/Pages/Account/Register.cshtml.cs
+++ b/service/src/InstructorIQ.WebApplication/Pages/Account/Register.cshtml.cs
@@ -1,101 +1,101 @@
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 using System.Threading.Tasks;
+
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 using Microsoft.Extensions.Logging;
 
-namespace InstructorIQ.WebApplication.Pages.Account
+namespace InstructorIQ.WebApplication.Pages.Account;
+
+[AllowAnonymous]
+public class RegisterModel : PageModel
 {
-    [AllowAnonymous]
-    public class RegisterModel : PageModel
+    private readonly SignInManager<Core.Data.Entities.User> _signInManager;
+    private readonly UserManager<Core.Data.Entities.User> _userManager;
+    private readonly ILogger<RegisterModel> _logger;
+
+    public RegisterModel(
+        UserManager<Core.Data.Entities.User> userManager,
+        SignInManager<Core.Data.Entities.User> signInManager,
+        ILogger<RegisterModel> logger)
     {
-        private readonly SignInManager<Core.Data.Entities.User> _signInManager;
-        private readonly UserManager<Core.Data.Entities.User> _userManager;
-        private readonly ILogger<RegisterModel> _logger;
-
-        public RegisterModel(
-            UserManager<Core.Data.Entities.User> userManager,
-            SignInManager<Core.Data.Entities.User> signInManager,
-            ILogger<RegisterModel> logger)
-        {
-            _userManager = userManager;
-            _signInManager = signInManager;
-            _logger = logger;
-        }
+        _userManager = userManager;
+        _signInManager = signInManager;
+        _logger = logger;
+    }
 
-        [BindProperty]
-        public InputModel Input { get; set; }
+    [BindProperty]
+    public InputModel Input { get; set; }
 
-        public string ReturnUrl { get; set; }
+    public string ReturnUrl { get; set; }
 
-        public class InputModel
-        {
-            [Required]
-            [Display(Name = "Display Name")]
-            public string DisplayName { get; set; }
-
-            [Required]
-            [EmailAddress]
-            [Display(Name = "Email Address")]
-            public string Email { get; set; }
-
-            [Required]
-            [StringLength(100, ErrorMessage = "The {0} must be at least {2} and at max {1} characters long.", MinimumLength = 6)]
-            [DataType(DataType.Password)]
-            [Display(Name = "Password")]
-            public string Password { get; set; }
-
-            [DataType(DataType.Password)]
-            [Display(Name = "Confirm password")]
-            [Compare("Password", ErrorMessage = "The password and confirmation password do not match.")]
-            public string ConfirmPassword { get; set; }
-        }
+    public class InputModel
+    {
+        [Required]
+        [Display(Name = "Display Name")]
+        public string DisplayName { get; set; }
+
+        [Required]
+        [EmailAddress]
+        [Display(Name = "Email Address")]
+        public string Email { get; set; }
+
+        [Required]
+        [StringLength(100, ErrorMessage = "The {0} must be at least {2} and at max {1} characters long.", MinimumLength = 6)]
+        [DataType(DataType.Password)]
+        [Display(Name = "Password")]
+        public string Password { get; set; }
+
+        [DataType(DataType.Password)]
+        [Display(Name = "Confirm password")]
+        [Compare("Password", ErrorMessage = "The password and confirmation password do not match.")]
+        public string ConfirmPassword { get; set; }
+    }
 
-        public void OnGet(string returnUrl = null)
-        {
-            ReturnUrl = returnUrl;
-        }
+    public void OnGet(string returnUrl = null)
+    {
+        ReturnUrl = returnUrl;
+    }
 
-        public async Task<IActionResult> OnPostAsync(string returnUrl = null)
-        {
-            returnUrl = returnUrl ?? Url.Content("~/");
+    public async Task<IActionResult> OnPostAsync(string returnUrl = null)
+    {
+        returnUrl = returnUrl ?? Url.Content("~/");
 
-            if (!ModelState.IsValid)
-                return Page();
+        if (!ModelState.IsValid)
+            return Page();
 
-            var user = new Core.Data.Entities.User
-            {
-                DisplayName = Input.DisplayName,
-                UserName = Input.Email,
-                Email = Input.Email
-            };
+        var user = new Core.Data.Entities.User
+        {
+            DisplayName = Input.DisplayName,
+            UserName = Input.Email,
+            Email = Input.Email
+        };
 
-            var result = await _userManager.CreateAsync(user, Input.Password);
+        var result = await _userManager.CreateAsync(user, Input.Password);
 
-            if (result.Succeeded)
-            {
-                _logger.LogInformation("User created a new account with password.");
+        if (result.Succeeded)
+        {
+            _logger.LogInformation("User created a new account with password.");
 
-                var code = await _userManager.GenerateEmailConfirmationTokenAsync(user);
-                var callbackUrl = Url.Page(
-                    "/Account/ConfirmEmail",
-                    pageHandler: null,
-                    values: new { userId = user.Id, code = code },
-                    protocol: Request.Scheme);
+            var code = await _userManager.GenerateEmailConfirmationTokenAsync(user);
+            var callbackUrl = Url.Page(
+                "/Account/ConfirmEmail",
+                pageHandler: null,
+                values: new { userId = user.Id, code = code },
+                protocol: Request.Scheme);
 
-                //await _emailSender.SendEmailAsync(Input.Email, "Confirm your email",
-                //    $"Please confirm your account by <a href='{HtmlEncoder.Default.Encode(callbackUrl)}'>clicking here</a>.");
+            //await _emailSender.SendEmailAsync(Input.Email, "Confirm your email",
+            //    $"Please confirm your account by <a href='{HtmlEncoder.Default.Encode(callbackUrl)}'>clicking here</a>.");
 
-                await _signInManager.SignInAsync(user, isPersistent: false);
-                return LocalRedirect(returnUrl);
-            }
+            await _signInManager.SignInAsync(user, isPersistent: false);
+            return LocalRedirect(returnUrl);
+        }
 
-            foreach (var error in result.Errors)
-                ModelState.AddModelError(string.Empty, error.Description);
+        foreach (var error in result.Errors)
+            ModelState.AddModelError(string.Empty, error.Description);
 
-            return Page();
-        }
+        return Page();
     }
 }
diff --git a/service/src/InstructorIQ.WebApplication/Pages/Account/ResetPassword.cshtml.cs b/service/src/InstructorIQ.WebApplication/Pages/Account/ResetPassword.cshtml.cs
index b1b4cea0..e0bc2cd6 100644
--- a/service/src/InstructorIQ.WebApplication/Pages/Account/ResetPassword.cshtml.cs
+++ b/service/src/InstructorIQ.WebApplication/Pages/Account/ResetPassword.cshtml.cs
@@ -1,80 +1,80 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Threading.Tasks;
+
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
-namespace InstructorIQ.WebApplication.Pages.Account
+namespace InstructorIQ.WebApplication.Pages.Account;
+
+[AllowAnonymous]
+public class ResetPasswordModel : PageModel
 {
-    [AllowAnonymous]
-    public class ResetPasswordModel : PageModel
+    private readonly UserManager<Core.Data.Entities.User> _userManager;
+
+    public ResetPasswordModel(UserManager<Core.Data.Entities.User> userManager)
     {
-        private readonly UserManager<Core.Data.Entities.User> _userManager;
+        _userManager = userManager;
+        Input = new InputModel();
+    }
 
-        public ResetPasswordModel(UserManager<Core.Data.Entities.User> userManager)
-        {
-            _userManager = userManager;
-            Input = new InputModel();
-        }
+    [BindProperty(SupportsGet = true)]
+    public string Code { get; set; }
 
-        [BindProperty(SupportsGet = true)]
-        public string Code { get; set; }
+    [BindProperty]
+    public InputModel Input { get; set; }
 
-        [BindProperty]
-        public InputModel Input { get; set; }
+    public class InputModel
+    {
+        [Required]
+        [EmailAddress]
+        public string Email { get; set; }
 
-        public class InputModel
-        {
-            [Required]
-            [EmailAddress]
-            public string Email { get; set; }
-
-            [Required]
-            [StringLength(100, ErrorMessage = "The {0} must be at least {2} and at max {1} characters long.", MinimumLength = 6)]
-            [DataType(DataType.Password)]
-            public string Password { get; set; }
-
-            [DataType(DataType.Password)]
-            [Display(Name = "Confirm password")]
-            [Compare("Password", ErrorMessage = "The password and confirmation password do not match.")]
-            public string ConfirmPassword { get; set; }
-        }
+        [Required]
+        [StringLength(100, ErrorMessage = "The {0} must be at least {2} and at max {1} characters long.", MinimumLength = 6)]
+        [DataType(DataType.Password)]
+        public string Password { get; set; }
 
-        public IActionResult OnGet()
-        {
-            if (Code == null)
-                return BadRequest("A code must be supplied for password reset.");
+        [DataType(DataType.Password)]
+        [Display(Name = "Confirm password")]
+        [Compare("Password", ErrorMessage = "The password and confirmation password do not match.")]
+        public string ConfirmPassword { get; set; }
+    }
 
-            
+    public IActionResult OnGet()
+    {
+        if (Code == null)
+            return BadRequest("A code must be supplied for password reset.");
+
+
+        return Page();
+    }
+
+    public async Task<IActionResult> OnPostAsync()
+    {
+        if (!ModelState.IsValid)
+        {
             return Page();
         }
 
-        public async Task<IActionResult> OnPostAsync()
+        var user = await _userManager.FindByEmailAsync(Input.Email);
+        if (user == null)
         {
-            if (!ModelState.IsValid)
-            {
-                return Page();
-            }
-
-            var user = await _userManager.FindByEmailAsync(Input.Email);
-            if (user == null)
-            {
-                ModelState.AddModelError("Input.Email", "Email address not registered.");
-                return Page();
-            }
+            ModelState.AddModelError("Input.Email", "Email address not registered.");
+            return Page();
+        }
 
-            var result = await _userManager.ResetPasswordAsync(user, Code, Input.Password);
-            if (result.Succeeded)
-                return RedirectToPage("./ResetPasswordConfirmation");
+        var result = await _userManager.ResetPasswordAsync(user, Code, Input.Password);
+        if (result.Succeeded)
+            return RedirectToPage("./ResetPasswordConfirmation");
 
-            foreach (var error in result.Errors)
-                ModelState.AddModelError(string.Empty, error.Description);
+        foreach (var error in result.Errors)
+            ModelState.AddModelError(string.Empty, error.Description);
 
-            return Page();
-        }
+        return Page();
     }
 }
diff --git a/service/src/InstructorIQ.WebApplication/Pages/Account/ResetPasswordConfirmation.cshtml.cs b/service/src/InstructorIQ.WebApplication/Pages/Account/ResetPasswordConfirmation.cshtml.cs
index 61c03372..ce767f0a 100644
--- a/service/src/InstructorIQ.WebApplication/Pages/Account/ResetPasswordConfirmation.cshtml.cs
+++ b/service/src/InstructorIQ.WebApplication/Pages/Account/ResetPasswordConfirmation.cshtml.cs
@@ -1,14 +1,13 @@
-using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
-namespace InstructorIQ.WebApplication.Pages.Account
+namespace InstructorIQ.WebApplication.Pages.Account;
+
+[AllowAnonymous]
+public class ResetPasswordConfirmationModel : PageModel
 {
-    [AllowAnonymous]
-    public class ResetPasswordConfirmationModel : PageModel
+    public void OnGet()
     {
-        public void OnGet()
-        {
 
-        }
     }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.WebApplication/Pages/Attendance/Index.cshtml.cs b/service/src/InstructorIQ.WebApplication/Pages/Attendance/Index.cshtml.cs
index b22bccdb..403fc443 100644
--- a/service/src/InstructorIQ.WebApplication/Pages/Attendance/Index.cshtml.cs
+++ b/service/src/InstructorIQ.WebApplication/Pages/Attendance/Index.cshtml.cs
@@ -1,86 +1,88 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 using System.Threading.Tasks;
+
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Domain.Queries;
 using InstructorIQ.Core.Extensions;
 using InstructorIQ.Core.Multitenancy;
 using InstructorIQ.WebApplication.Models;
+
 using MediatR;
+
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 
-namespace InstructorIQ.WebApplication.Pages.Attendance
+namespace InstructorIQ.WebApplication.Pages.Attendance;
+
+public class IndexModel : MediatorModelBase
 {
-    public class IndexModel : MediatorModelBase
+    public IndexModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
+        : base(tenant, mediator, loggerFactory)
     {
-        public IndexModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
-            : base(tenant, mediator, loggerFactory)
-        {
-            Year = DateTime.Now.Year;
-            Week = DateTime.Now.GetWeekOfYear();
-        }
+        Year = DateTime.Now.Year;
+        Week = DateTime.Now.GetWeekOfYear();
+    }
 
-        [BindProperty(Name = "year", SupportsGet = true)]
-        public int Year { get; set; }
+    [BindProperty(Name = "year", SupportsGet = true)]
+    public int Year { get; set; }
 
-        [BindProperty(Name = "week", SupportsGet = true)]
-        public int Week { get; set; }
+    [BindProperty(Name = "week", SupportsGet = true)]
+    public int Week { get; set; }
 
-        public int PreviousYear { get; set; }
-        public int PreviousWeek { get; set; }
+    public int PreviousYear { get; set; }
+    public int PreviousWeek { get; set; }
 
-        public int NextYear { get; set; }
-        public int NextWeek { get; set; }
+    public int NextYear { get; set; }
+    public int NextWeek { get; set; }
 
-        public IReadOnlyCollection<SessionCalendarModel> Items { get; set; }
+    public IReadOnlyCollection<SessionCalendarModel> Items { get; set; }
 
 
-        public virtual async Task<IActionResult> OnGetAsync()
-        {
-            if (Tenant == null || !Tenant.HasValue)
-                return RedirectToPage("/Index");
+    public virtual async Task<IActionResult> OnGetAsync()
+    {
+        if (Tenant == null || !Tenant.HasValue)
+            return RedirectToPage("/Index");
 
-            var week = Week;
-            var year = Year;
+        var week = Week;
+        var year = Year;
 
-            var now = DateTime.Now;
-            var formatInfo = DateTimeFormatInfo.CurrentInfo;
+        var now = DateTime.Now;
+        var formatInfo = DateTimeFormatInfo.CurrentInfo;
 
-            if (week == 0)
-                year = now.GetWeekOfYear(formatInfo);
+        if (week == 0)
+            year = now.GetWeekOfYear(formatInfo);
 
-            if (year == 0)
-                year = now.Year;
+        if (year == 0)
+            year = now.Year;
 
-            var startDate = formatInfo.GetFirstDayOfWeek(year, week);
-            var endDate = startDate.AddDays(6);
+        var startDate = formatInfo.GetFirstDayOfWeek(year, week);
+        var endDate = startDate.AddDays(6);
 
-            ConfigureNext(formatInfo, startDate);
+        ConfigureNext(formatInfo, startDate);
 
-            var command = new SessionCalendarQuery(User, Tenant.Value.Id, startDate, endDate);
-            var result = await Mediator.Send(command);
+        var command = new SessionCalendarQuery(User, Tenant.Value.Id, startDate, endDate);
+        var result = await Mediator.Send(command);
 
-            Items = result
-                .OrderBy(r => r.StartDate)
-                .ThenBy(r => r.StartTime)
-                .ThenBy(r => r.TopicTitle)
-                .ToList();
+        Items = result
+            .OrderBy(r => r.StartDate)
+            .ThenBy(r => r.StartTime)
+            .ThenBy(r => r.TopicTitle)
+            .ToList();
 
-            return Page();
-        }
+        return Page();
+    }
 
-        private void ConfigureNext(DateTimeFormatInfo formatInfo, DateTime startDate)
-        {
-            var previousDate = formatInfo.Calendar.AddWeeks(startDate, -1);
-            PreviousYear = previousDate.Year;
-            PreviousWeek = previousDate.GetWeekOfYear(formatInfo);
+    private void ConfigureNext(DateTimeFormatInfo formatInfo, DateTime startDate)
+    {
+        var previousDate = formatInfo.Calendar.AddWeeks(startDate, -1);
+        PreviousYear = previousDate.Year;
+        PreviousWeek = previousDate.GetWeekOfYear(formatInfo);
 
-            var nextDate = formatInfo.Calendar.AddWeeks(startDate, 1);
-            NextYear = nextDate.Year;
-            NextWeek = nextDate.GetWeekOfYear(formatInfo);
-        }
+        var nextDate = formatInfo.Calendar.AddWeeks(startDate, 1);
+        NextYear = nextDate.Year;
+        NextWeek = nextDate.GetWeekOfYear(formatInfo);
     }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.WebApplication/Pages/Attendance/Session.cshtml.cs b/service/src/InstructorIQ.WebApplication/Pages/Attendance/Session.cshtml.cs
index 9e46ae40..9ee4e8be 100644
--- a/service/src/InstructorIQ.WebApplication/Pages/Attendance/Session.cshtml.cs
+++ b/service/src/InstructorIQ.WebApplication/Pages/Attendance/Session.cshtml.cs
@@ -1,77 +1,79 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Domain.Queries;
 using InstructorIQ.Core.Multitenancy;
 using InstructorIQ.WebApplication.Models;
+
 using MediatR;
 using MediatR.CommandQuery.Queries;
+
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 
-namespace InstructorIQ.WebApplication.Pages.Attendance
+namespace InstructorIQ.WebApplication.Pages.Attendance;
+
+public class SessionModel : EntityIdentifierModelBase<SessionReadModel>
 {
-    public class SessionModel : EntityIdentifierModelBase<SessionReadModel>
+    public SessionModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
+        : base(tenant, mediator, loggerFactory)
     {
-        public SessionModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
-            : base(tenant, mediator, loggerFactory)
-        {
-        }
+    }
 
-        public IReadOnlyCollection<MemberReadModel> Members { get; set; }
+    public IReadOnlyCollection<MemberReadModel> Members { get; set; }
 
-        public IReadOnlyCollection<AttendanceSessionModel> Attendances { get; set; }
+    public IReadOnlyCollection<AttendanceSessionModel> Attendances { get; set; }
 
-        public override async Task<IActionResult> OnGetAsync()
-        {
-            await base.OnGetAsync();
-            if (Entity == null)
-                return NotFound();
+    public override async Task<IActionResult> OnGetAsync()
+    {
+        await base.OnGetAsync();
+        if (Entity == null)
+            return NotFound();
 
-            await LoadMembers();
-            await LoadAttendances();
+        await LoadMembers();
+        await LoadAttendances();
 
-            return Page();
-        }
+        return Page();
+    }
 
-        private async Task LoadMembers()
-        {
-            var command = new MemberSelectQuery(User, Tenant.Value.Id);
-            command.RoleId = Core.Data.Constants.Role.Attendee;
+    private async Task LoadMembers()
+    {
+        var command = new MemberSelectQuery(User, Tenant.Value.Id);
+        command.RoleId = Core.Data.Constants.Role.Attendee;
 
-            var members = await Mediator.Send(command);
+        var members = await Mediator.Send(command);
 
-            Members = members
-                .OrderBy(m => m.SortName)
-                .ToList();
-        }
+        Members = members
+            .OrderBy(m => m.SortName)
+            .ToList();
+    }
 
-        private async Task LoadAttendances()
-        {
-            var filter = new EntityFilter
-            {
-                Operator = EntityFilterOperators.Equal,
-                Name = nameof(AttendanceSessionModel.SessionId),
-                Value = Id
-            };
-            var select = new EntitySelect(filter);
-            var command = new EntitySelectQuery<AttendanceSessionModel>(User, select);
-            var results = await Mediator.Send(command);
-
-            Attendances = results.ToList();
-        }
-
-        public AttendanceSessionModel GetAttendee(string username)
+    private async Task LoadAttendances()
+    {
+        var filter = new EntityFilter
         {
-            return Attendances
-                .FirstOrDefault(a => string.Equals(
-                    a.AttendeeEmail,
-                    username,
-                    StringComparison.OrdinalIgnoreCase
-                ));
-        }
+            Operator = EntityFilterOperators.Equal,
+            Name = nameof(AttendanceSessionModel.SessionId),
+            Value = Id
+        };
+        var select = new EntitySelect(filter);
+        var command = new EntitySelectQuery<AttendanceSessionModel>(User, select);
+        var results = await Mediator.Send(command);
 
+        Attendances = results.ToList();
     }
-}
\ No newline at end of file
+
+    public AttendanceSessionModel GetAttendee(string username)
+    {
+        return Attendances
+            .FirstOrDefault(a => string.Equals(
+                a.AttendeeEmail,
+                username,
+                StringComparison.OrdinalIgnoreCase
+            ));
+    }
+
+}
diff --git a/service/src/InstructorIQ.WebApplication/Pages/Attendance/Signature.cshtml.cs b/service/src/InstructorIQ.WebApplication/Pages/Attendance/Signature.cshtml.cs
index 08e5e619..efdf3858 100644
--- a/service/src/InstructorIQ.WebApplication/Pages/Attendance/Signature.cshtml.cs
+++ b/service/src/InstructorIQ.WebApplication/Pages/Attendance/Signature.cshtml.cs
@@ -1,82 +1,84 @@
-using System;
+using System;
 using System.Threading.Tasks;
+
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Multitenancy;
 using InstructorIQ.WebApplication.Models;
+
 using MediatR;
 using MediatR.CommandQuery.Commands;
 using MediatR.CommandQuery.Queries;
+
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 
-namespace InstructorIQ.WebApplication.Pages.Attendance
+namespace InstructorIQ.WebApplication.Pages.Attendance;
+
+public class SignatureModel : EntityIdentifierModelBase<MemberReadModel>
 {
-    public class SignatureModel : EntityIdentifierModelBase<MemberReadModel>
+    public SignatureModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
+        : base(tenant, mediator, loggerFactory)
     {
-        public SignatureModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
-            : base(tenant, mediator, loggerFactory)
-        {
-        }
+    }
 
-        [BindProperty]
-        public AttendanceCreateModel Attendance { get; set; }
+    [BindProperty]
+    public AttendanceCreateModel Attendance { get; set; }
 
-        [BindProperty(SupportsGet = true)]
-        public Guid SessionId { get; set; }
+    [BindProperty(SupportsGet = true)]
+    public Guid SessionId { get; set; }
 
-        public SessionReadModel Session { get; set; }
+    public SessionReadModel Session { get; set; }
 
-        public override async Task<IActionResult> OnGetAsync()
-        {
-            await base.OnGetAsync();
-            await LoadSession();
+    public override async Task<IActionResult> OnGetAsync()
+    {
+        await base.OnGetAsync();
+        await LoadSession();
 
-            if (Entity == null || Session == null)
-                return NotFound();
+        if (Entity == null || Session == null)
+            return NotFound();
+
+        Attendance = new AttendanceCreateModel
+        {
+            AttendeeEmail = Entity.UserName,
+            AttendeeName = Entity.SortName,
+            SessionId = Session.Id,
+            TenantId = Tenant.Value.Id,
+        };
 
-            Attendance = new AttendanceCreateModel
-            {
-                AttendeeEmail = Entity.UserName,
-                AttendeeName = Entity.SortName,
-                SessionId = Session.Id,
-                TenantId = Tenant.Value.Id,
-            };
+        return Page();
+    }
 
+    public async Task<IActionResult> OnPostAsync()
+    {
+        if (!ModelState.IsValid)
             return Page();
-        }
 
-        public async Task<IActionResult> OnPostAsync()
-        {
-            if (!ModelState.IsValid)
-                return Page();
-
-            var createModel = new AttendanceCreateModel();
-
-            // only update input fields
-            await TryUpdateModelAsync(
-                createModel,
-                nameof(Attendance),
-                p => p.SessionId,
-                p => p.TenantId,
-                p => p.Signature,
-                p => p.SignatureType,
-                p => p.AttendeeEmail,
-                p => p.AttendeeName
-            );
-            createModel.Attended = DateTimeOffset.UtcNow;
-
-            var command = new EntityCreateCommand<AttendanceCreateModel, AttendanceReadModel>(User, createModel);
-            var result = await Mediator.Send(command);
-
-            return RedirectToPage("/attendance/session", new { id = result.SessionId, tenant = TenantRoute });
-        }
-
-        private async Task LoadSession()
-        {
-            var command = new EntityIdentifierQuery<Guid, SessionReadModel>(User, SessionId);
-            var result = await Mediator.Send(command);
+        var createModel = new AttendanceCreateModel();
+
+        // only update input fields
+        await TryUpdateModelAsync(
+            createModel,
+            nameof(Attendance),
+            p => p.SessionId,
+            p => p.TenantId,
+            p => p.Signature,
+            p => p.SignatureType,
+            p => p.AttendeeEmail,
+            p => p.AttendeeName
+        );
+        createModel.Attended = DateTimeOffset.UtcNow;
+
+        var command = new EntityCreateCommand<AttendanceCreateModel, AttendanceReadModel>(User, createModel);
+        var result = await Mediator.Send(command);
+
+        return RedirectToPage("/attendance/session", new { id = result.SessionId, tenant = TenantRoute });
+    }
+
+    private async Task LoadSession()
+    {
+        var command = new EntityIdentifierQuery<Guid, SessionReadModel>(User, SessionId);
+        var result = await Mediator.Send(command);
 
-            Session = result;
-        }
+        Session = result;
     }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.WebApplication/Pages/Attendance/Signed.cshtml.cs b/service/src/InstructorIQ.WebApplication/Pages/Attendance/Signed.cshtml.cs
index 93a7022e..2182357f 100644
--- a/service/src/InstructorIQ.WebApplication/Pages/Attendance/Signed.cshtml.cs
+++ b/service/src/InstructorIQ.WebApplication/Pages/Attendance/Signed.cshtml.cs
@@ -1,79 +1,81 @@
-using System;
+using System;
 using System.Threading.Tasks;
+
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Domain.Queries;
 using InstructorIQ.Core.Multitenancy;
 using InstructorIQ.WebApplication.Models;
+
 using MediatR;
 using MediatR.CommandQuery.Commands;
 using MediatR.CommandQuery.Queries;
+
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 
-namespace InstructorIQ.WebApplication.Pages.Attendance
+namespace InstructorIQ.WebApplication.Pages.Attendance;
+
+public class SignedModel : EntityIdentifierModelBase<AttendanceReadModel>
 {
-    public class SignedModel : EntityIdentifierModelBase<AttendanceReadModel>
+    public SignedModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
+        : base(tenant, mediator, loggerFactory)
     {
-        public SignedModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
-            : base(tenant, mediator, loggerFactory)
-        {
-        }
+    }
 
-        [BindProperty(SupportsGet = true)]
-        public Guid SessionId { get; set; }
+    [BindProperty(SupportsGet = true)]
+    public Guid SessionId { get; set; }
 
-        [BindProperty(SupportsGet = true)]
-        public string Route { get; set; }
+    [BindProperty(SupportsGet = true)]
+    public string Route { get; set; }
 
-        public SessionReadModel Session { get; set; }
+    public SessionReadModel Session { get; set; }
 
-        public MemberReadModel Member { get; set; }
+    public MemberReadModel Member { get; set; }
 
-        public override async Task<IActionResult> OnGetAsync()
-        {
-            await base.OnGetAsync();
-            if (Entity == null)
-                return NotFound();
+    public override async Task<IActionResult> OnGetAsync()
+    {
+        await base.OnGetAsync();
+        if (Entity == null)
+            return NotFound();
 
-            await LoadSession();
-            await LoadUser(Entity.AttendeeEmail);
+        await LoadSession();
+        await LoadUser(Entity.AttendeeEmail);
 
-            if (Session == null || Member == null)
-                return NotFound();
+        if (Session == null || Member == null)
+            return NotFound();
 
-            return Page();
-        }
+        return Page();
+    }
 
-        public async Task<IActionResult> OnPostDeleteEntity()
-        {
-            var command = new EntityDeleteCommand<Guid, AttendanceSessionModel>(User, Id);
-            var result = await Mediator.Send(command);
+    public async Task<IActionResult> OnPostDeleteEntity()
+    {
+        var command = new EntityDeleteCommand<Guid, AttendanceSessionModel>(User, Id);
+        var result = await Mediator.Send(command);
 
-            if (Route == "user")
-                return RedirectToPage("/attendance/user", new { tenant = TenantRoute });
+        if (Route == "user")
+            return RedirectToPage("/attendance/user", new { tenant = TenantRoute });
 
-            if (Route == "topic")
-                return RedirectToPage("/attendance/topic", new { tenant = TenantRoute });
+        if (Route == "topic")
+            return RedirectToPage("/attendance/topic", new { tenant = TenantRoute });
 
-            return RedirectToPage("/attendance/session", new { id = SessionId, tenant = TenantRoute });
-        }
+        return RedirectToPage("/attendance/session", new { id = SessionId, tenant = TenantRoute });
+    }
 
-        private async Task LoadSession()
-        {
-            var command = new EntityIdentifierQuery<Guid, SessionReadModel>(User, SessionId);
-            var result = await Mediator.Send(command);
+    private async Task LoadSession()
+    {
+        var command = new EntityIdentifierQuery<Guid, SessionReadModel>(User, SessionId);
+        var result = await Mediator.Send(command);
 
-            Session = result;
-        }
+        Session = result;
+    }
 
-        private async Task LoadUser(string username)
-        {
-            var command = new MemberUserNameQuery(User, username);
-            var result = await Mediator.Send(command);
+    private async Task LoadUser(string username)
+    {
+        var command = new MemberUserNameQuery(User, username);
+        var result = await Mediator.Send(command);
 
-            Member = result;
+        Member = result;
 
-        }
     }
 }
diff --git a/service/src/InstructorIQ.WebApplication/Pages/Attendance/Topic.cshtml.cs b/service/src/InstructorIQ.WebApplication/Pages/Attendance/Topic.cshtml.cs
index 0f83248e..4510cdfb 100644
--- a/service/src/InstructorIQ.WebApplication/Pages/Attendance/Topic.cshtml.cs
+++ b/service/src/InstructorIQ.WebApplication/Pages/Attendance/Topic.cshtml.cs
@@ -1,7 +1,8 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Domain.Queries;
 using InstructorIQ.Core.Extensions;
@@ -10,140 +11,141 @@
 using InstructorIQ.Core.Security;
 using InstructorIQ.Core.Services;
 using InstructorIQ.WebApplication.Models;
+
 using MediatR;
 using MediatR.CommandQuery.Queries;
+
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 using Microsoft.Extensions.Logging;
 
-namespace InstructorIQ.WebApplication.Pages.Attendance
+namespace InstructorIQ.WebApplication.Pages.Attendance;
+
+[Authorize(Policy = UserPolicies.UserPolicy)]
+public class TopicModel : MediatorModelBase
 {
-    [Authorize(Policy = UserPolicies.UserPolicy)]
-    public class TopicModel : MediatorModelBase
+    private readonly IStateService _stateService;
+
+    public TopicModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory, IStateService stateService)
+        : base(tenant, mediator, loggerFactory)
     {
-        private readonly IStateService _stateService;
+        _stateService = stateService;
+    }
 
-        public TopicModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory, IStateService stateService)
-            : base(tenant, mediator, loggerFactory)
-        {
-            _stateService = stateService;
-        }
 
+    [BindProperty(Name = "q", SupportsGet = true)]
+    public string Query { get; set; }
 
-        [BindProperty(Name = "q", SupportsGet = true)]
-        public string Query { get; set; }
+    [BindProperty(Name = "year", SupportsGet = true)]
+    public int? Year { get; set; }
 
-        [BindProperty(Name = "year", SupportsGet = true)]
-        public int? Year { get; set; }
+    [BindProperty(Name = "month", SupportsGet = true)]
+    public int? Month { get; set; }
 
-        [BindProperty(Name = "month", SupportsGet = true)]
-        public int? Month { get; set; }
+    [BindProperty(Name = "topicId", SupportsGet = true)]
+    public Guid? TopicId { get; set; }
 
-        [BindProperty(Name = "topicId", SupportsGet = true)]
-        public Guid? TopicId { get; set; }
 
+    public IReadOnlyCollection<TopicDropdownModel> Topics { get; set; }
 
-        public IReadOnlyCollection<TopicDropdownModel> Topics { get; set; }
+    public IReadOnlyCollection<AttendanceSessionModel> Items { get; set; }
 
-        public IReadOnlyCollection<AttendanceSessionModel> Items { get; set; }
 
+    public async Task<IActionResult> OnGetAsync()
+    {
+        ReadHistory();
 
-        public async Task<IActionResult> OnGetAsync()
-        {
-            ReadHistory();
+        var loadTask = LoadItems();
+        var loadTopicsTask = LoadTopics();
 
-            var loadTask = LoadItems();
-            var loadTopicsTask = LoadTopics();
+        // load all in parallel
+        await Task.WhenAll(
+            loadTask,
+            loadTopicsTask
+        );
 
-            // load all in parallel
-            await Task.WhenAll(
-                loadTask,
-                loadTopicsTask
-            );
+        Items = loadTask.Result;
+        Topics = loadTopicsTask.Result;
 
-            Items = loadTask.Result;
-            Topics = loadTopicsTask.Result;
+        WriteHistory();
 
-            WriteHistory();
+        return Page();
+    }
 
-            return Page();
-        }
 
+    private async Task<IReadOnlyCollection<TopicDropdownModel>> LoadTopics()
+    {
+        var select = new EntitySelect();
 
-        private async Task<IReadOnlyCollection<TopicDropdownModel>> LoadTopics()
+        if (Year.HasValue)
         {
-            var select = new EntitySelect();
+            var filter = new EntityFilter();
+            filter.Name = nameof(Core.Data.Entities.Topic.CalendarYear);
+            filter.Value = Year.Value;
 
-            if (Year.HasValue)
-            {
-                var filter = new EntityFilter();
-                filter.Name = nameof(Core.Data.Entities.Topic.CalendarYear);
-                filter.Value = Year.Value;
+            select.Filter = filter;
+        }
 
-                select.Filter = filter;
-            }
+        var query = new EntitySelectQuery<TopicDropdownModel>(User, select);
+        var topics = await Mediator.Send(query);
 
-            var query = new EntitySelectQuery<TopicDropdownModel>(User, select);
-            var topics = await Mediator.Send(query);
+        return topics
+            .OrderBy(p => p.Text)
+            .ToList();
+    }
 
-            return topics
-                .OrderBy(p => p.Text)
-                .ToList();
-        }
+    private async Task<IReadOnlyCollection<AttendanceSessionModel>> LoadItems()
+    {
+        var command = new AttendanceSessionQuery(User, Tenant.Value.Id);
+        command.SearchText = Query;
+        command.TopicId = TopicId;
 
-        private async Task<IReadOnlyCollection<AttendanceSessionModel>> LoadItems()
+        if (Year.HasValue && Month.HasValue && Month.Value > 0)
         {
-            var command = new AttendanceSessionQuery(User, Tenant.Value.Id);
-            command.SearchText = Query;
-            command.TopicId = TopicId;
-
-            if (Year.HasValue && Month.HasValue && Month.Value > 0)
-            {
-                var startDate = new DateTime(Year.Value, Month.Value, 1);
-                command.StartDate = startDate;
-                command.EndDate = startDate.AddMonths(1);
-            }
-            else if(Year.HasValue)
-            {
-                var startDate = new DateTime(Year.Value, 1, 1);
-                command.StartDate = startDate;
-                command.EndDate = startDate.AddYears(1);
-            }
-
-            var result = await Mediator.Send(command);
-
-            return result;
+            var startDate = new DateTime(Year.Value, Month.Value, 1);
+            command.StartDate = startDate;
+            command.EndDate = startDate.AddMonths(1);
         }
-
-        private void WriteHistory()
+        else if (Year.HasValue)
         {
-            var state = new SessionQueryState
-            {
-                Year = Year,
-                Month = Month,
-                Query = Query,
-                TopicId = TopicId
-            };
-
-            _stateService.WriteState(state, "attend_topic");
+            var startDate = new DateTime(Year.Value, 1, 1);
+            command.StartDate = startDate;
+            command.EndDate = startDate.AddYears(1);
         }
 
-        private void ReadHistory()
+        var result = await Mediator.Send(command);
+
+        return result;
+    }
+
+    private void WriteHistory()
+    {
+        var state = new SessionQueryState
         {
-            var state = _stateService.ReadState<SessionQueryState>("attend_topic");
-            if (Year == null || Year == 0)
-                Year = state?.Year ?? DateTime.Now.Year;
+            Year = Year,
+            Month = Month,
+            Query = Query,
+            TopicId = TopicId
+        };
+
+        _stateService.WriteState(state, "attend_topic");
+    }
 
-            if (Month == null)
-                Month = state?.Month ?? DateTime.Now.Month;
+    private void ReadHistory()
+    {
+        var state = _stateService.ReadState<SessionQueryState>("attend_topic");
+        if (Year == null || Year == 0)
+            Year = state?.Year ?? DateTime.Now.Year;
 
-            if (!Request.Query.ContainsKey("q"))
-                Query = state?.Query?.Trim();
+        if (Month == null)
+            Month = state?.Month ?? DateTime.Now.Month;
 
-            if (!Request.Query.ContainsKey("topicId"))
-                TopicId = state?.TopicId;
-        }
+        if (!Request.Query.ContainsKey("q"))
+            Query = state?.Query?.Trim();
 
+        if (!Request.Query.ContainsKey("topicId"))
+            TopicId = state?.TopicId;
     }
-}
\ No newline at end of file
+
+}
diff --git a/service/src/InstructorIQ.WebApplication/Pages/Attendance/User.cshtml.cs b/service/src/InstructorIQ.WebApplication/Pages/Attendance/User.cshtml.cs
index 28da86c9..ec3ec2b6 100644
--- a/service/src/InstructorIQ.WebApplication/Pages/Attendance/User.cshtml.cs
+++ b/service/src/InstructorIQ.WebApplication/Pages/Attendance/User.cshtml.cs
@@ -1,7 +1,8 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Domain.Queries;
 using InstructorIQ.Core.Models;
@@ -9,129 +10,130 @@
 using InstructorIQ.Core.Security;
 using InstructorIQ.Core.Services;
 using InstructorIQ.WebApplication.Models;
+
 using MediatR;
+
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 
-namespace InstructorIQ.WebApplication.Pages.Attendance
+namespace InstructorIQ.WebApplication.Pages.Attendance;
+
+[Authorize(Policy = UserPolicies.UserPolicy)]
+public class UserModel : MediatorModelBase
 {
-    [Authorize(Policy = UserPolicies.UserPolicy)]
-    public class UserModel : MediatorModelBase
-    {
-        private readonly IStateService _stateService;
+    private readonly IStateService _stateService;
 
-        public UserModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory, IStateService stateService)
-            : base(tenant, mediator, loggerFactory)
-        {
-            _stateService = stateService;
-        }
+    public UserModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory, IStateService stateService)
+        : base(tenant, mediator, loggerFactory)
+    {
+        _stateService = stateService;
+    }
 
-        [BindProperty(Name = "q", SupportsGet = true)]
-        public string Query { get; set; }
+    [BindProperty(Name = "q", SupportsGet = true)]
+    public string Query { get; set; }
 
-        [BindProperty(Name = "year", SupportsGet = true)]
-        public int? Year { get; set; }
+    [BindProperty(Name = "year", SupportsGet = true)]
+    public int? Year { get; set; }
 
-        [BindProperty(Name = "month", SupportsGet = true)]
-        public int? Month { get; set; }
+    [BindProperty(Name = "month", SupportsGet = true)]
+    public int? Month { get; set; }
 
-        [BindProperty(Name = "username", SupportsGet = true)]
-        public string UserName { get; set; }
+    [BindProperty(Name = "username", SupportsGet = true)]
+    public string UserName { get; set; }
 
-        public IReadOnlyCollection<MemberDropdownModel> Members { get; set; }
+    public IReadOnlyCollection<MemberDropdownModel> Members { get; set; }
 
-        public IReadOnlyCollection<AttendanceSessionModel> Items { get; set; }
+    public IReadOnlyCollection<AttendanceSessionModel> Items { get; set; }
 
-        public async Task<IActionResult> OnGetAsync()
-        {
-            ReadHistory();
+    public async Task<IActionResult> OnGetAsync()
+    {
+        ReadHistory();
 
-            var loadTask = LoadItems();
-            var loadMembersTask = LoadMembers();
+        var loadTask = LoadItems();
+        var loadMembersTask = LoadMembers();
 
-            // load all in parallel
-            await Task.WhenAll(
-                loadTask,
-                loadMembersTask
-            );
+        // load all in parallel
+        await Task.WhenAll(
+            loadTask,
+            loadMembersTask
+        );
 
-            Items = loadTask.Result;
-            Members = loadMembersTask.Result;
+        Items = loadTask.Result;
+        Members = loadMembersTask.Result;
 
-            WriteHistory();
+        WriteHistory();
 
-            return Page();
-        }
+        return Page();
+    }
 
-        private async Task<IReadOnlyCollection<MemberDropdownModel>> LoadMembers()
-        {
-            var command = new MemberSelectQuery(User, Tenant.Value.Id);
-            command.RoleId = Core.Data.Constants.Role.Attendee;
-
-            var members = await Mediator.Send(command);
-
-            return members
-                .OrderBy(m => m.SortName)
-                .Select(m => new MemberDropdownModel
-                {
-                    Value = m.UserName,
-                    Text = m.SortName
-                })
-                .ToList();
-        }
+    private async Task<IReadOnlyCollection<MemberDropdownModel>> LoadMembers()
+    {
+        var command = new MemberSelectQuery(User, Tenant.Value.Id);
+        command.RoleId = Core.Data.Constants.Role.Attendee;
 
-        private async Task<IReadOnlyCollection<AttendanceSessionModel>> LoadItems()
-        {
-            var command = new AttendanceSessionQuery(User, Tenant.Value.Id);
-            command.SearchText = Query;
-            command.UserName = UserName;
+        var members = await Mediator.Send(command);
 
-            if (Year.HasValue && Month.HasValue && Month.Value > 0)
+        return members
+            .OrderBy(m => m.SortName)
+            .Select(m => new MemberDropdownModel
             {
-                var startDate = new DateTime(Year.Value, Month.Value, 1);
-                command.StartDate = startDate;
-                command.EndDate = startDate.AddMonths(1);
-            }
-            else if (Year.HasValue)
-            {
-                var startDate = new DateTime(Year.Value, 1, 1);
-                command.StartDate = startDate;
-                command.EndDate = startDate.AddYears(1);
-            }
+                Value = m.UserName,
+                Text = m.SortName
+            })
+            .ToList();
+    }
 
-            var result = await Mediator.Send(command);
+    private async Task<IReadOnlyCollection<AttendanceSessionModel>> LoadItems()
+    {
+        var command = new AttendanceSessionQuery(User, Tenant.Value.Id);
+        command.SearchText = Query;
+        command.UserName = UserName;
 
-            return result;
+        if (Year.HasValue && Month.HasValue && Month.Value > 0)
+        {
+            var startDate = new DateTime(Year.Value, Month.Value, 1);
+            command.StartDate = startDate;
+            command.EndDate = startDate.AddMonths(1);
         }
-
-        private void WriteHistory()
+        else if (Year.HasValue)
         {
-            var state = new SessionQueryState
-            {
-                Year = Year,
-                Month = Month,
-                Query = Query,
-                UserName = UserName
-            };
-
-            _stateService.WriteState(state, "attend_user");
+            var startDate = new DateTime(Year.Value, 1, 1);
+            command.StartDate = startDate;
+            command.EndDate = startDate.AddYears(1);
         }
 
-        private void ReadHistory()
+        var result = await Mediator.Send(command);
+
+        return result;
+    }
+
+    private void WriteHistory()
+    {
+        var state = new SessionQueryState
         {
-            var state = _stateService.ReadState<SessionQueryState>("attend_user");
-            if (Year == null || Year == 0)
-                Year = state?.Year ?? DateTime.Now.Year;
+            Year = Year,
+            Month = Month,
+            Query = Query,
+            UserName = UserName
+        };
+
+        _stateService.WriteState(state, "attend_user");
+    }
+
+    private void ReadHistory()
+    {
+        var state = _stateService.ReadState<SessionQueryState>("attend_user");
+        if (Year == null || Year == 0)
+            Year = state?.Year ?? DateTime.Now.Year;
 
-            if (Month == null)
-                Month = state?.Month ?? DateTime.Now.Month;
+        if (Month == null)
+            Month = state?.Month ?? DateTime.Now.Month;
 
-            if (!Request.Query.ContainsKey("q"))
-                Query = state?.Query?.Trim();
+        if (!Request.Query.ContainsKey("q"))
+            Query = state?.Query?.Trim();
 
-            if (!Request.Query.ContainsKey("username"))
-                UserName = state?.UserName?.Trim();
-        }
+        if (!Request.Query.ContainsKey("username"))
+            UserName = state?.UserName?.Trim();
     }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.WebApplication/Pages/Calendar/Embed.cshtml.cs b/service/src/InstructorIQ.WebApplication/Pages/Calendar/Embed.cshtml.cs
index a9e3e65b..3c2a1e1b 100644
--- a/service/src/InstructorIQ.WebApplication/Pages/Calendar/Embed.cshtml.cs
+++ b/service/src/InstructorIQ.WebApplication/Pages/Calendar/Embed.cshtml.cs
@@ -1,55 +1,57 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
+
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Domain.Queries;
 using InstructorIQ.Core.Multitenancy;
 using InstructorIQ.WebApplication.Models;
+
 using MediatR;
+
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 
-namespace InstructorIQ.WebApplication.Pages.Calendar
+namespace InstructorIQ.WebApplication.Pages.Calendar;
+
+[ResponseCache(Duration = 150)]
+public class EmbedModel : MediatorModelBase
 {
-    [ResponseCache(Duration = 150)]
-    public class EmbedModel : MediatorModelBase
+    public EmbedModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
+        : base(tenant, mediator, loggerFactory)
     {
-        public EmbedModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
-            : base(tenant, mediator, loggerFactory)
-        {
-            Month = DateTime.Now.Month;
-            Year = DateTime.Now.Year;
-        }
-
-        [BindProperty(Name = "year", SupportsGet = true)]
-        public int Year { get; set; }
+        Month = DateTime.Now.Month;
+        Year = DateTime.Now.Year;
+    }
 
-        [BindProperty(Name = "month", SupportsGet = true)]
-        public int Month { get; set; }
+    [BindProperty(Name = "year", SupportsGet = true)]
+    public int Year { get; set; }
 
-        public IReadOnlyCollection<SessionCalendarModel> Items { get; set; }
+    [BindProperty(Name = "month", SupportsGet = true)]
+    public int Month { get; set; }
 
-        public virtual async Task<IActionResult> OnGetAsync()
-        {
-            if (Tenant == null || !Tenant.HasValue)
-                return RedirectToPage("/Index");
+    public IReadOnlyCollection<SessionCalendarModel> Items { get; set; }
 
-            var month = Month;
-            var year = Year;
+    public virtual async Task<IActionResult> OnGetAsync()
+    {
+        if (Tenant == null || !Tenant.HasValue)
+            return RedirectToPage("/Index");
 
-            if (month == 0)
-                month = DateTime.Now.Month;
+        var month = Month;
+        var year = Year;
 
-            if (year == 0)
-                year = DateTime.Now.Year;
+        if (month == 0)
+            month = DateTime.Now.Month;
 
-            var command = new SessionCalendarQuery(User, Tenant.Value.Id, year, month);
-            var result = await Mediator.Send(command);
+        if (year == 0)
+            year = DateTime.Now.Year;
 
-            Items = result;
+        var command = new SessionCalendarQuery(User, Tenant.Value.Id, year, month);
+        var result = await Mediator.Send(command);
 
-            return Page();
-        }
+        Items = result;
 
+        return Page();
     }
-}
\ No newline at end of file
+
+}
diff --git a/service/src/InstructorIQ.WebApplication/Pages/Calendar/Index.cshtml.cs b/service/src/InstructorIQ.WebApplication/Pages/Calendar/Index.cshtml.cs
index fc6429d8..e1e60958 100644
--- a/service/src/InstructorIQ.WebApplication/Pages/Calendar/Index.cshtml.cs
+++ b/service/src/InstructorIQ.WebApplication/Pages/Calendar/Index.cshtml.cs
@@ -1,21 +1,22 @@
-using InstructorIQ.Core.Domain.Models;
+using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Multitenancy;
 using InstructorIQ.WebApplication.Models;
+
 using MediatR;
+
 using Microsoft.Extensions.Logging;
 
-namespace InstructorIQ.WebApplication.Pages.Calendar
+namespace InstructorIQ.WebApplication.Pages.Calendar;
+
+public class IndexModel : MediatorModelBase
 {
-    public class IndexModel : MediatorModelBase
+    public IndexModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
+        : base(tenant, mediator, loggerFactory)
     {
-        public IndexModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
-            : base(tenant, mediator, loggerFactory)
-        {
-        }
+    }
 
-        public void OnGet()
-        {
+    public void OnGet()
+    {
 
-        }
     }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.WebApplication/Pages/Calendar/Monthly.cshtml.cs b/service/src/InstructorIQ.WebApplication/Pages/Calendar/Monthly.cshtml.cs
index c73c9f9c..844c0519 100644
--- a/service/src/InstructorIQ.WebApplication/Pages/Calendar/Monthly.cshtml.cs
+++ b/service/src/InstructorIQ.WebApplication/Pages/Calendar/Monthly.cshtml.cs
@@ -1,55 +1,57 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
+
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Domain.Queries;
 using InstructorIQ.Core.Multitenancy;
 using InstructorIQ.WebApplication.Models;
+
 using MediatR;
+
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 
-namespace InstructorIQ.WebApplication.Pages.Calendar
+namespace InstructorIQ.WebApplication.Pages.Calendar;
+
+[ResponseCache(Duration = 150)]
+public class MonthlyModel : MediatorModelBase
 {
-    [ResponseCache(Duration = 150)]
-    public class MonthlyModel : MediatorModelBase
+    public MonthlyModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
+        : base(tenant, mediator, loggerFactory)
     {
-        public MonthlyModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
-            : base(tenant, mediator, loggerFactory)
-        {
-            Month = DateTime.Now.Month;
-            Year = DateTime.Now.Year;
-        }
-
-        [BindProperty(Name = "year", SupportsGet = true)]
-        public int Year { get; set; }
+        Month = DateTime.Now.Month;
+        Year = DateTime.Now.Year;
+    }
 
-        [BindProperty(Name = "month", SupportsGet = true)]
-        public int Month { get; set; }
+    [BindProperty(Name = "year", SupportsGet = true)]
+    public int Year { get; set; }
 
-        public IReadOnlyCollection<SessionCalendarModel> Items { get; set; }
+    [BindProperty(Name = "month", SupportsGet = true)]
+    public int Month { get; set; }
 
-        public virtual async Task<IActionResult> OnGetAsync()
-        {
-            if (Tenant == null || !Tenant.HasValue)
-                return RedirectToPage("/Index");
+    public IReadOnlyCollection<SessionCalendarModel> Items { get; set; }
 
-            var month = Month;
-            var year = Year;
+    public virtual async Task<IActionResult> OnGetAsync()
+    {
+        if (Tenant == null || !Tenant.HasValue)
+            return RedirectToPage("/Index");
 
-            if (month == 0)
-                month = DateTime.Now.Month;
+        var month = Month;
+        var year = Year;
 
-            if (year == 0)
-                year = DateTime.Now.Year;
+        if (month == 0)
+            month = DateTime.Now.Month;
 
-            var command = new SessionCalendarQuery(User, Tenant.Value.Id, year, month);
-            var result = await Mediator.Send(command);
+        if (year == 0)
+            year = DateTime.Now.Year;
 
-            Items = result;
+        var command = new SessionCalendarQuery(User, Tenant.Value.Id, year, month);
+        var result = await Mediator.Send(command);
 
-            return Page();
-        }
+        Items = result;
 
+        return Page();
     }
-}
\ No newline at end of file
+
+}
diff --git a/service/src/InstructorIQ.WebApplication/Pages/Calendar/Subscribe.cshtml.cs b/service/src/InstructorIQ.WebApplication/Pages/Calendar/Subscribe.cshtml.cs
index ce539efe..19500b55 100644
--- a/service/src/InstructorIQ.WebApplication/Pages/Calendar/Subscribe.cshtml.cs
+++ b/service/src/InstructorIQ.WebApplication/Pages/Calendar/Subscribe.cshtml.cs
@@ -1,16 +1,17 @@
-using InstructorIQ.Core.Domain.Models;
+using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Multitenancy;
 using InstructorIQ.WebApplication.Models;
+
 using MediatR;
+
 using Microsoft.Extensions.Logging;
 
-namespace InstructorIQ.WebApplication.Pages.Calendar
+namespace InstructorIQ.WebApplication.Pages.Calendar;
+
+public class SubscribeModel : MediatorModelBase
 {
-    public class SubscribeModel : MediatorModelBase
+    public SubscribeModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
+        : base(tenant, mediator, loggerFactory)
     {
-        public SubscribeModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
-            : base(tenant, mediator, loggerFactory)
-        {
-        }
     }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.WebApplication/Pages/Calendar/Yearly.cshtml.cs b/service/src/InstructorIQ.WebApplication/Pages/Calendar/Yearly.cshtml.cs
index 2c269529..7a5234ad 100644
--- a/service/src/InstructorIQ.WebApplication/Pages/Calendar/Yearly.cshtml.cs
+++ b/service/src/InstructorIQ.WebApplication/Pages/Calendar/Yearly.cshtml.cs
@@ -1,47 +1,49 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
+
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Domain.Queries;
 using InstructorIQ.Core.Multitenancy;
 using InstructorIQ.WebApplication.Models;
+
 using MediatR;
+
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 
-namespace InstructorIQ.WebApplication.Pages.Calendar
+namespace InstructorIQ.WebApplication.Pages.Calendar;
+
+[ResponseCache(Duration = 150)]
+public class YearlyModel : MediatorModelBase
 {
-    [ResponseCache(Duration = 150)]
-    public class YearlyModel : MediatorModelBase
+    public YearlyModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
+        : base(tenant, mediator, loggerFactory)
     {
-        public YearlyModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
-            : base(tenant, mediator, loggerFactory)
-        {
-            Year = DateTime.Now.Year;
-        }
-
-        [BindProperty(Name = "year", SupportsGet = true)]
-        public int Year { get; set; }
+        Year = DateTime.Now.Year;
+    }
 
-        public IReadOnlyCollection<SessionCalendarModel> Items { get; set; }
+    [BindProperty(Name = "year", SupportsGet = true)]
+    public int Year { get; set; }
 
-        public virtual async Task<IActionResult> OnGetAsync()
-        {
-            if (Tenant == null || !Tenant.HasValue)
-                return RedirectToPage("/Index");
+    public IReadOnlyCollection<SessionCalendarModel> Items { get; set; }
 
-            var year = Year;
+    public virtual async Task<IActionResult> OnGetAsync()
+    {
+        if (Tenant == null || !Tenant.HasValue)
+            return RedirectToPage("/Index");
 
-            if (year == 0)
-                year = DateTime.Now.Year;
+        var year = Year;
 
-            var command = new SessionCalendarQuery(User, Tenant.Value.Id, year);
-            var result = await Mediator.Send(command);
+        if (year == 0)
+            year = DateTime.Now.Year;
 
-            Items = result;
+        var command = new SessionCalendarQuery(User, Tenant.Value.Id, year);
+        var result = await Mediator.Send(command);
 
-            return Page();
-        }
+        Items = result;
 
+        return Page();
     }
-}
\ No newline at end of file
+
+}
diff --git a/service/src/InstructorIQ.WebApplication/Pages/Error.cshtml.cs b/service/src/InstructorIQ.WebApplication/Pages/Error.cshtml.cs
index d4a3f96d..cfa8d9b5 100644
--- a/service/src/InstructorIQ.WebApplication/Pages/Error.cshtml.cs
+++ b/service/src/InstructorIQ.WebApplication/Pages/Error.cshtml.cs
@@ -3,21 +3,21 @@
 using System.Diagnostics;
 using System.Linq;
 using System.Threading.Tasks;
+
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
-namespace InstructorIQ.WebApplication.Pages
+namespace InstructorIQ.WebApplication.Pages;
+
+[ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
+public class ErrorModel : PageModel
 {
-    [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
-    public class ErrorModel : PageModel
-    {
-        public string RequestId { get; set; }
+    public string RequestId { get; set; }
 
-        public bool ShowRequestId => !string.IsNullOrEmpty(RequestId);
+    public bool ShowRequestId => !string.IsNullOrEmpty(RequestId);
 
-        public void OnGet()
-        {
-            RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier;
-        }
+    public void OnGet()
+    {
+        RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier;
     }
 }
diff --git a/service/src/InstructorIQ.WebApplication/Pages/Global/Logging/Index.cshtml b/service/src/InstructorIQ.WebApplication/Pages/Global/Logging/Index.cshtml
index 0f107cc7..0ff0b345 100644
--- a/service/src/InstructorIQ.WebApplication/Pages/Global/Logging/Index.cshtml
+++ b/service/src/InstructorIQ.WebApplication/Pages/Global/Logging/Index.cshtml
@@ -1,4 +1,5 @@
-@page
+@page
+@using InstructorIQ.Core.Extensions
 @model InstructorIQ.WebApplication.Pages.Global.Logging.IndexModel
 @{
     ViewData["Title"] = "Logs";
@@ -25,10 +26,11 @@
           name="log-search-form"
           role="form"
           method="get">
+
         <div class="card mb-5">
             <div class="card-header">
                 <div class="row no-gutters">
-                    <div class="col-sm-4">
+                    <div class="col">
                         <i class="fas fa-file-alt mr-2"
                            aria-hidden="true"></i> Logs
                     </div>
@@ -70,17 +72,6 @@
                                     <i class="fas fa-chevron-right"
                                        aria-hidden="true"></i>
                                 </button>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="col-sm-4">
-                        <div class="input-group input-group-sm mr-2">
-                            <input type="text"
-                                   name="q"
-                                   asp-for="Query"
-                                   class="form-control"
-                                   placeholder="Search" />
-                            <div class="input-group-append">
                                 <button class="btn btn-sm btn-outline-secondary"
                                         type="submit">
                                     <i class="fas fa-search"
@@ -114,94 +105,80 @@
                         @foreach (var log in Model.Logs)
                         {
                             <tr>
-                                <td style="text-align:center;">
+                                <td style="text-align: center;">
                                     <a class="d-block"
                                        data-toggle="collapse"
-                                       href="#collapse-@log.TimeStamp.Ticks"
+                                       href="#collapse-@log.RowKey"
                                        role="button"
                                        aria-expanded="false"
-                                       aria-controls="collapse-@log.TimeStamp.Ticks">
+                                       aria-controls="collapse-@log.RowKey">
                                         <i class="fas fa-caret-right"></i>
                                         <i class="fas fa-caret-down"></i>
                                     </a>
                                 </td>
-                                <td style="text-align:center;">
-                                    @if (log.Level == "Warning")
+                                <td style="text-align: center;">
+                                    @switch (log.Level)
                                     {
-                                        <i class="fas fa-exclamation-triangle text-warning"></i>
-                                    }
-                                    else if (log.Level == "Error" || log.Level == "Critical")
-                                    {
-                                        <i class="fas fa-times-circle text-danger"></i>
-                                    }
-                                    else if (log.Level == "Information")
-                                    {
-                                        <i class="fas fa-info-circle text-primary"></i>
-                                    }
-                                    else
-                                    {
-                                        <i class="fas fa-info-circle text-secondary"></i>
+                                        case "Warning":
+                                            <i class="fas fa-exclamation-triangle text-warning"></i>
+                                            break;
+                                        case "Error":
+                                        case "Critical":
+                                            <i class="fas fa-times-circle text-danger"></i>
+                                            break;
+                                        case "Information":
+                                            <i class="fas fa-info-circle text-primary"></i>
+                                            break;
+                                        default:
+                                            <i class="fas fa-info-circle text-secondary"></i>
+                                            break;
                                     }
                                 </td>
-                                <td>@log.TimeStamp.ToString()</td>
+                                <td>@log.Timestamp?.ToString("g")</td>
                                 <td>@log.Level</td>
-                                <td>@log.Message</td>
+                                <td>@log.RenderedMessage</td>
                             </tr>
-                            <tr class="collapse" id="collapse-@log.TimeStamp.Ticks" style="background-color: #f9f9f9;">
+                            <tr class="collapse" id="collapse-@log.RowKey" style="background-color: #f9f9f9;">
                                 <td colspan="5">
                                     <div class="tab-container">
-                                        <ul class="nav nav-tabs" id="log-tabs-@log.TimeStamp.Ticks" role="tablist">
+                                        <ul class="nav nav-tabs" id="log-tabs-@log.RowKey" role="tablist">
                                             <li class="nav-item" role="presentation">
                                                 <a class="nav-link active"
-                                                   id="properties-tab-@log.TimeStamp.Ticks"
-                                                   href="#properties-panel-@log.TimeStamp.Ticks"
+                                                   id="properties-tab-@log.RowKey"
+                                                   href="#properties-panel-@log.RowKey"
                                                    data-toggle="tab"
-                                                   aria-controls="properties-panel-@log.TimeStamp.Ticks"
+                                                   aria-controls="properties-panel-@log.RowKey"
                                                    aria-selected="true"
                                                    role="tab">Properties</a>
                                             </li>
-                                            <li class="nav-item" role="presentation">
-                                                <a class="nav-link"
-                                                   id="exception-tab-@log.TimeStamp.Ticks"
-                                                   href="#exception-panel-@log.TimeStamp.Ticks"
-                                                   data-toggle="tab"
-                                                   aria-controls="exception-panel-@log.TimeStamp.Ticks"
-                                                   role="tab">Exception</a>
-                                            </li>
+                                            @if (log.Exception.HasValue())
+                                            {
+                                                <li class="nav-item" role="presentation">
+                                                    <a class="nav-link"
+                                                       id="exception-tab-@log.RowKey"
+                                                       href="#exception-panel-@log.RowKey"
+                                                       data-toggle="tab"
+                                                       aria-controls="exception-panel-@log.RowKey"
+                                                       role="tab">Exception</a>
+                                                </li>
+                                            }
                                         </ul>
                                         <div class="tab-content" id="myTabContent">
                                             <div class="tab-pane fade show active"
-                                                 id="properties-panel-@log.TimeStamp.Ticks"
-                                                 aria-labelledby="properties-tab-@log.TimeStamp.Ticks"
-                                                 role="tabpanel">
-                                                <table class="table table-bordered table-sm table-striped table-property">
-                                                    <colgroup>
-                                                        <col style="width: 200px" />
-                                                        <col style="" />
-                                                    </colgroup>
-                                                    <thead>
-                                                        <tr>
-                                                            <th>Name</th>
-                                                            <th>Value</th>
-                                                        </tr>
-                                                    </thead>
-                                                    <tbody>
-                                                        @foreach (var property in log.Properties.EnumerateObject())
-                                                        {
-                                                            <tr>
-                                                                <th>@property.Name</th>
-                                                                <td>@property.Value</td>
-                                                            </tr>
-                                                        }
-                                                    </tbody>
-                                                </table>
-                                            </div>
-                                            <div class="tab-pane fade"
-                                                 id="exception-panel-@log.TimeStamp.Ticks"
-                                                 aria-labelledby="exception-tab-@log.TimeStamp.Ticks"
+                                                 id="properties-panel-@log.RowKey"
+                                                 aria-labelledby="properties-tab-@log.RowKey"
                                                  role="tabpanel">
-                                                <pre style="overflow: auto; max-height: 400px; font-family: Courier New">@(string.IsNullOrWhiteSpace(log.Exception) ? "No Exception Found" : log.Exception)</pre>
+                                                <json-display>@log.Data</json-display>
                                             </div>
+                                            @if (log.Exception.HasValue())
+                                            {
+                                                <div class="tab-pane fade"
+                                                     id="exception-panel-@log.RowKey"
+                                                     aria-labelledby="exception-tab-@log.RowKey"
+                                                     role="tabpanel">
+                                                    <pre style="overflow: auto; max-height: 400px; font-family: Courier New">@(string.IsNullOrWhiteSpace(log.Exception) ? "No Exception Found" : log.Exception)</pre>
+                                                </div>
+                                            }
                                         </div>
                                     </div>
                                 </td>
@@ -212,36 +189,50 @@
             </div>
 
             <div class="card-footer p-0">
+
                 <div class="row">
-                    <div class="col-md-4"></div>
-                    <div class="col-md-4">
-                        <div class="center-block text-center m-3">
-                            <span>
-                                Showing @((Model.PageNumber * Model.PageSize) - (Model.PageSize -1)) to @(Math.Min(Model.PageNumber * Model.PageSize, Model.Total)) of @Model.Total rows.
-                            </span>
-                            <span style="margin-left: 10px">
-                                <select class="form-control"
-                                        style="width: 75px; display: inline"
-                                        name="PageSize"
-                                        asp-for="PageSize"
-                                        onchange="this.form.submit()">
-                                    <option value="20">20</option>
-                                    <option value="50">50</option>
-                                    <option value="100">100</option>
-                                </select>
-                                records per page
-                            </span>
-                        </div>
-                    </div>
-                    <div class="col-md-4">
-                        <pagination current-page="@Model.PageNumber"
-                                    page-size="@Model.PageSize"
-                                    total-items="@Model.Total"
-                                    asp-route-z="@Model.PageSize"
-                                    asp-route-l="@Model.Level"
-                                    asp-route-d="@Model.Date"
-                                    asp-route-q="@Model.Query"
-                                    class="justify-content-md-end m-3" />
+                    <div class="col-md-6"></div>
+                    <div class="col-md-6">
+                        <nav aria-label="Log Pagination">
+                            <ul class="justify-content-md-end m-3 pagination">
+                                @if (Model.ContinuationToken.HasValue())
+                                {
+                                    <li class="page-item">
+                                        <a class="page-link"
+                                       asp-page="/global/logging/index"
+                                       asp-route-z="@Model.PageSize"
+                                       asp-route-q="@Model.Query"
+                                       asp-route-l="@Model.Level"
+                                       asp-route-d="@Model.Date.Date"
+                                       asp-route-t="">First</a>
+                                    </li>
+                                }
+                                else
+                                {
+                                    <li class="page-item disabled">
+                                        <span class="page-link">First</span>
+                                    </li>
+                                }
+                                @if (Model.NextToken.HasValue())
+                                {
+                                    <li class="page-item">
+                                        <a class="page-link"
+                                       asp-page="/global/logging/index"
+                                       asp-route-z="@Model.PageSize"
+                                       asp-route-q="@Model.Query"
+                                       asp-route-l="@Model.Level"
+                                       asp-route-d="@Model.Date.Date"
+                                       asp-route-t="@Model.NextToken">Next</a>
+                                    </li>
+                                }
+                                else
+                                {
+                                    <li class="page-item disabled">
+                                        <span class="page-link">Next</span>
+                                    </li>
+                                }
+                            </ul>
+                        </nav>
                     </div>
                 </div>
             </div>
@@ -261,4 +252,4 @@
             $('#log-search-form').submit();
         }
     </script>
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.WebApplication/Pages/Global/Logging/Index.cshtml.cs b/service/src/InstructorIQ.WebApplication/Pages/Global/Logging/Index.cshtml.cs
index a144e325..ffcd9853 100644
--- a/service/src/InstructorIQ.WebApplication/Pages/Global/Logging/Index.cshtml.cs
+++ b/service/src/InstructorIQ.WebApplication/Pages/Global/Logging/Index.cshtml.cs
@@ -1,63 +1,65 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
+
 using FluentCommand.Extensions;
+
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Domain.Queries;
 using InstructorIQ.Core.Multitenancy;
 using InstructorIQ.Core.Security;
 using InstructorIQ.WebApplication.Models;
+
 using MediatR;
+
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 
-namespace InstructorIQ.WebApplication.Pages.Global.Logging
+namespace InstructorIQ.WebApplication.Pages.Global.Logging;
+
+[Authorize(Policy = UserPolicies.GlobalAdministratorPolicy)]
+public class IndexModel : MediatorModelBase
 {
-    [Authorize(Policy = UserPolicies.GlobalAdministratorPolicy)]
-    public class IndexModel : MediatorModelBase
+    public IndexModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
+        : base(tenant, mediator, loggerFactory)
     {
-        public IndexModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
-            : base(tenant, mediator, loggerFactory)
-        {
-        }
+    }
 
-        [BindProperty(Name = "p", SupportsGet = true)]
-        public int PageNumber { get; set; } = 1;
+    [BindProperty(Name = "z", SupportsGet = true)]
+    public int PageSize { get; set; } = 100;
 
-        [BindProperty(Name = "z", SupportsGet = true)]
-        public int PageSize { get; set; } = 100;
+    [BindProperty(Name = "q", SupportsGet = true)]
+    public string Query { get; set; } = string.Empty;
 
-        [BindProperty(Name = "q", SupportsGet = true)]
-        public string Query { get; set; } = string.Empty;
+    [BindProperty(Name = "l", SupportsGet = true)]
+    public string Level { get; set; } = string.Empty;
 
-        [BindProperty(Name = "l", SupportsGet = true)]
-        public string Level { get; set; } = string.Empty;
+    [BindProperty(Name = "d", SupportsGet = true)]
+    public DateTime Date { get; set; } = DateTime.Today;
 
-        [BindProperty(Name = "d", SupportsGet = true)]
-        public DateTime Date { get; set; } = DateTime.Today;
+    [BindProperty(Name = "t", SupportsGet = true)]
+    public string ContinuationToken { get; set; } = string.Empty;
 
-        public long Total { get; set; }
+    public string NextToken { get; set; }
 
-        public IReadOnlyCollection<LogEventModel> Logs { get; set; }
+    public IReadOnlyCollection<LogEventModel> Logs { get; set; }
 
-        public async Task<IActionResult> OnGetAsync()
+    public async Task<IActionResult> OnGetAsync()
+    {
+        var query = new LogEventQuery(User)
         {
-            var query = new LogEventQuery(User)
-            {
-                Date = Date.Date,
-                Level = Level.IsNullOrWhiteSpace() ? null : Level,
-                Search = Query.IsNullOrWhiteSpace() ? null : $"%{Query}%",
-                Page = PageNumber,
-                PageSize = PageSize
-            };
-
-            var result = await Mediator.Send(query);
-
-            Total = result.Total;
-            Logs = result.Data ?? new List<LogEventModel>();
-
-            return Page();
-        }
+            Date = Date.Date,
+            Level = Level.IsNullOrWhiteSpace() ? null : Level,
+            PageSize = PageSize,
+            ContinuationToken = ContinuationToken
+        };
+
+        var result = await Mediator.Send(query);
+
+        NextToken = result.ContinuationToken;
+        Logs = result.Data ?? new List<LogEventModel>();
+
+        return Page();
     }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.WebApplication/Pages/Global/Tenant/Create.cshtml.cs b/service/src/InstructorIQ.WebApplication/Pages/Global/Tenant/Create.cshtml.cs
index 591853ab..618fbf80 100644
--- a/service/src/InstructorIQ.WebApplication/Pages/Global/Tenant/Create.cshtml.cs
+++ b/service/src/InstructorIQ.WebApplication/Pages/Global/Tenant/Create.cshtml.cs
@@ -1,51 +1,53 @@
-using System.Threading.Tasks;
-using MediatR.CommandQuery.Commands;
+using System.Threading.Tasks;
+
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Multitenancy;
 using InstructorIQ.Core.Security;
 using InstructorIQ.WebApplication.Models;
+
 using MediatR;
+using MediatR.CommandQuery.Commands;
+
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 
-namespace InstructorIQ.WebApplication.Pages.Global.Tenant
+namespace InstructorIQ.WebApplication.Pages.Global.Tenant;
+
+[Authorize(Policy = UserPolicies.GlobalAdministratorPolicy)]
+public class CreateModel : EntityCreateModelBase<TenantCreateModel>
 {
-    [Authorize(Policy = UserPolicies.GlobalAdministratorPolicy)]
-    public class CreateModel : EntityCreateModelBase<TenantCreateModel>
+    public CreateModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
+        : base(tenant, mediator, loggerFactory)
+    {
+
+    }
+
+    public async Task<IActionResult> OnPostAsync()
     {
-        public CreateModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
-            : base(tenant, mediator, loggerFactory)
-        {
-
-        }
-
-        public async Task<IActionResult> OnPostAsync()
-        {
-            if (!ModelState.IsValid)
-                return Page();
-
-            var createModel = new TenantCreateModel();
-
-            // only update input fields
-            await TryUpdateModelAsync(
-                createModel,
-                nameof(Entity),
-                p => p.Name,
-                p => p.Description,
-                p => p.Slug,
-                p => p.City,
-                p => p.StateProvince,
-                p => p.TimeZone,
-                p => p.DomainName
-            );
-
-            var command = new EntityCreateCommand<TenantCreateModel, TenantReadModel>(User, createModel);
-            var result = await Mediator.Send(command);
-
-            ShowAlert("Successfully created tenant");
-
-            return RedirectToPage("/Global/Tenant/Edit", new { id = result.Id });
-        }
+        if (!ModelState.IsValid)
+            return Page();
+
+        var createModel = new TenantCreateModel();
+
+        // only update input fields
+        await TryUpdateModelAsync(
+            createModel,
+            nameof(Entity),
+            p => p.Name,
+            p => p.Description,
+            p => p.Slug,
+            p => p.City,
+            p => p.StateProvince,
+            p => p.TimeZone,
+            p => p.DomainName
+        );
+
+        var command = new EntityCreateCommand<TenantCreateModel, TenantReadModel>(User, createModel);
+        var result = await Mediator.Send(command);
+
+        ShowAlert("Successfully created tenant");
+
+        return RedirectToPage("/Global/Tenant/Edit", new { id = result.Id });
     }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.WebApplication/Pages/Global/Tenant/Edit.cshtml.cs b/service/src/InstructorIQ.WebApplication/Pages/Global/Tenant/Edit.cshtml.cs
index 6d4234b1..6cec7dbb 100644
--- a/service/src/InstructorIQ.WebApplication/Pages/Global/Tenant/Edit.cshtml.cs
+++ b/service/src/InstructorIQ.WebApplication/Pages/Global/Tenant/Edit.cshtml.cs
@@ -1,67 +1,69 @@
-using System;
+using System;
 using System.Threading.Tasks;
-using MediatR.CommandQuery.Commands;
-using MediatR.CommandQuery.Queries;
+
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Multitenancy;
 using InstructorIQ.Core.Security;
 using InstructorIQ.WebApplication.Models;
+
 using MediatR;
+using MediatR.CommandQuery.Commands;
+using MediatR.CommandQuery.Queries;
+
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 
-namespace InstructorIQ.WebApplication.Pages.Global.Tenant
+namespace InstructorIQ.WebApplication.Pages.Global.Tenant;
+
+[Authorize(Policy = UserPolicies.GlobalAdministratorPolicy)]
+public class EditModel : EntityIdentifierModelBase<TenantUpdateModel>
 {
-    [Authorize(Policy = UserPolicies.GlobalAdministratorPolicy)]
-    public class EditModel : EntityIdentifierModelBase<TenantUpdateModel>
+    public EditModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
+        : base(tenant, mediator, loggerFactory)
     {
-        public EditModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
-            : base(tenant, mediator, loggerFactory)
-        {
-        }
-
-        public async Task<IActionResult> OnPostAsync()
-        {
-            if (!ModelState.IsValid)
-                return Page();
+    }
 
-            var readCommand = new EntityIdentifierQuery<Guid, TenantUpdateModel>(User, Id);
-            var updateModel = await Mediator.Send(readCommand);
-            if (updateModel == null)
-                return NotFound();
+    public async Task<IActionResult> OnPostAsync()
+    {
+        if (!ModelState.IsValid)
+            return Page();
 
-            // only update input fields
-            await TryUpdateModelAsync(
-                updateModel,
-                nameof(Entity),
-                p => p.Name,
-                p => p.Description,
-                p => p.Slug,
-                p => p.City,
-                p => p.StateProvince,
-                p => p.TimeZone,
-                p => p.DomainName
-            );
+        var readCommand = new EntityIdentifierQuery<Guid, TenantUpdateModel>(User, Id);
+        var updateModel = await Mediator.Send(readCommand);
+        if (updateModel == null)
+            return NotFound();
 
-            var updateCommand = new EntityUpdateCommand<Guid, TenantUpdateModel, TenantReadModel>(User, Id, updateModel);
-            var result = await Mediator.Send(updateCommand);
+        // only update input fields
+        await TryUpdateModelAsync(
+            updateModel,
+            nameof(Entity),
+            p => p.Name,
+            p => p.Description,
+            p => p.Slug,
+            p => p.City,
+            p => p.StateProvince,
+            p => p.TimeZone,
+            p => p.DomainName
+        );
 
-            ShowAlert("Successfully saved tenant");
+        var updateCommand = new EntityUpdateCommand<Guid, TenantUpdateModel, TenantReadModel>(User, Id, updateModel);
+        var result = await Mediator.Send(updateCommand);
 
-            return RedirectToPage("/Global/Tenant/Edit", new { id = result.Id });
-        }
+        ShowAlert("Successfully saved tenant");
 
-        public async Task<IActionResult> OnPostDeleteEntity()
-        {
-            var command = new EntityDeleteCommand<Guid, TenantReadModel>(User, Id);
-            var result = await Mediator.Send(command);
+        return RedirectToPage("/Global/Tenant/Edit", new { id = result.Id });
+    }
 
-            ShowAlert("Successfully deleted tenant");
+    public async Task<IActionResult> OnPostDeleteEntity()
+    {
+        var command = new EntityDeleteCommand<Guid, TenantReadModel>(User, Id);
+        var result = await Mediator.Send(command);
 
-            return RedirectToPage("/Global/Tenant/Index");
+        ShowAlert("Successfully deleted tenant");
 
-        }
+        return RedirectToPage("/Global/Tenant/Index");
 
     }
-}
\ No newline at end of file
+
+}
diff --git a/service/src/InstructorIQ.WebApplication/Pages/Global/Tenant/Index.cshtml.cs b/service/src/InstructorIQ.WebApplication/Pages/Global/Tenant/Index.cshtml.cs
index a72dcceb..1a65777f 100644
--- a/service/src/InstructorIQ.WebApplication/Pages/Global/Tenant/Index.cshtml.cs
+++ b/service/src/InstructorIQ.WebApplication/Pages/Global/Tenant/Index.cshtml.cs
@@ -1,48 +1,50 @@
-using System;
-using MediatR.CommandQuery.Queries;
+using System;
+using System.Collections.Generic;
+
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Multitenancy;
 using InstructorIQ.Core.Security;
 using InstructorIQ.WebApplication.Models;
+
 using MediatR;
+using MediatR.CommandQuery.Queries;
+
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.Extensions.Logging;
-using System.Collections.Generic;
 
-namespace InstructorIQ.WebApplication.Pages.Global.Tenant
+namespace InstructorIQ.WebApplication.Pages.Global.Tenant;
+
+[Authorize(Policy = UserPolicies.GlobalAdministratorPolicy)]
+public class IndexModel : EntityPagedModelBase<TenantReadModel>
 {
-    [Authorize(Policy = UserPolicies.GlobalAdministratorPolicy)]
-    public class IndexModel : EntityPagedModelBase<TenantReadModel>
+    public IndexModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
+        : base(tenant, mediator, loggerFactory)
     {
-        public IndexModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
-            : base(tenant, mediator, loggerFactory)
-        {
-        }
+    }
 
-        protected override EntityFilter CreateFilter()
+    protected override EntityFilter CreateFilter()
+    {
+        var filter = new EntityFilter
         {
-            var filter = new EntityFilter
+            Logic = EntityFilterLogic.Or,
+            Filters = new List<EntityFilter>
             {
-                Logic = EntityFilterLogic.Or,
-                Filters = new List<EntityFilter>
+                new EntityFilter
                 {
-                    new EntityFilter
-                    {
-                        Name = nameof(TenantReadModel.Name),
-                        Value = Query,
-                        Operator = EntityFilterOperators.Contains
-                    },
-                    new EntityFilter
-                    {
-                        Name = nameof(TenantReadModel.Description),
-                        Value = Query,
-                        Operator = EntityFilterOperators.Contains
-                    }
+                    Name = nameof(TenantReadModel.Name),
+                    Value = Query,
+                    Operator = EntityFilterOperators.Contains
+                },
+                new EntityFilter
+                {
+                    Name = nameof(TenantReadModel.Description),
+                    Value = Query,
+                    Operator = EntityFilterOperators.Contains
                 }
-            };
-
-            return filter;
-        }
+            }
+        };
 
+        return filter;
     }
-}
\ No newline at end of file
+
+}
diff --git a/service/src/InstructorIQ.WebApplication/Pages/Global/User/Create.cshtml.cs b/service/src/InstructorIQ.WebApplication/Pages/Global/User/Create.cshtml.cs
index 44c41bbf..7dad0f7f 100644
--- a/service/src/InstructorIQ.WebApplication/Pages/Global/User/Create.cshtml.cs
+++ b/service/src/InstructorIQ.WebApplication/Pages/Global/User/Create.cshtml.cs
@@ -1,70 +1,71 @@
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 using System.Threading.Tasks;
+
 using InstructorIQ.Core.Security;
+
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
-namespace InstructorIQ.WebApplication.Pages.Global.User
-{
-    [Authorize(Policy = UserPolicies.GlobalAdministratorPolicy)]
-    public class CreateModel : PageModel
-    {
-        private readonly UserManager<Core.Data.Entities.User> _userManager;
+namespace InstructorIQ.WebApplication.Pages.Global.User;
 
-        public CreateModel(UserManager<Core.Data.Entities.User> userManager)
-        {
-            _userManager = userManager;
-        }
+[Authorize(Policy = UserPolicies.GlobalAdministratorPolicy)]
+public class CreateModel : PageModel
+{
+    private readonly UserManager<Core.Data.Entities.User> _userManager;
 
-        [BindProperty]
-        public InputModel Input { get; set; }
+    public CreateModel(UserManager<Core.Data.Entities.User> userManager)
+    {
+        _userManager = userManager;
+    }
 
-        public class InputModel
-        {
-            [Required]
-            [Display(Name = "Display Name")]
-            public string DisplayName { get; set; }
-
-            [Required]
-            [EmailAddress]
-            [Display(Name = "Email Address")]
-            public string Email { get; set; }
-        }
+    [BindProperty]
+    public InputModel Input { get; set; }
 
-        public async Task<IActionResult> OnPostAsync()
-        {
-            if (!ModelState.IsValid)
-                return Page();
+    public class InputModel
+    {
+        [Required]
+        [Display(Name = "Display Name")]
+        public string DisplayName { get; set; }
 
-            var user = new Core.Data.Entities.User
-            {
-                DisplayName = Input.DisplayName,
-                UserName = Input.Email,
-                Email = Input.Email
-            };
+        [Required]
+        [EmailAddress]
+        [Display(Name = "Email Address")]
+        public string Email { get; set; }
+    }
 
-            var result = await _userManager.CreateAsync(user);
+    public async Task<IActionResult> OnPostAsync()
+    {
+        if (!ModelState.IsValid)
+            return Page();
 
-            if (result.Succeeded)
-            {
-                ShowAlert("Successfully created user");
+        var user = new Core.Data.Entities.User
+        {
+            DisplayName = Input.DisplayName,
+            UserName = Input.Email,
+            Email = Input.Email
+        };
 
-                return RedirectToPage("/Global/User/Edit", new { id = user.Id });
-            }
+        var result = await _userManager.CreateAsync(user);
 
-            foreach (var error in result.Errors)
-                ModelState.AddModelError(string.Empty, error.Description);
+        if (result.Succeeded)
+        {
+            ShowAlert("Successfully created user");
 
-            return Page();
+            return RedirectToPage("/Global/User/Edit", new { id = user.Id });
         }
 
-        protected void ShowAlert(string message, string type = "success")
-        {
-            TempData["alert.type"] = type;
-            TempData["alert.message"] = message;
-        }
+        foreach (var error in result.Errors)
+            ModelState.AddModelError(string.Empty, error.Description);
+
+        return Page();
+    }
 
+    protected void ShowAlert(string message, string type = "success")
+    {
+        TempData["alert.type"] = type;
+        TempData["alert.message"] = message;
     }
-}
\ No newline at end of file
+
+}
diff --git a/service/src/InstructorIQ.WebApplication/Pages/Global/User/Edit.cshtml.cs b/service/src/InstructorIQ.WebApplication/Pages/Global/User/Edit.cshtml.cs
index 142dd14e..db5effcd 100644
--- a/service/src/InstructorIQ.WebApplication/Pages/Global/User/Edit.cshtml.cs
+++ b/service/src/InstructorIQ.WebApplication/Pages/Global/User/Edit.cshtml.cs
@@ -1,178 +1,180 @@
-using System;
+using System;
 using System.ComponentModel.DataAnnotations;
 using System.Threading.Tasks;
+
 using EntityChange.Extensions;
+
 using InstructorIQ.Core.Security;
+
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
-namespace InstructorIQ.WebApplication.Pages.Global.User
+namespace InstructorIQ.WebApplication.Pages.Global.User;
+
+[Authorize(Policy = UserPolicies.GlobalAdministratorPolicy)]
+public class EditModel : PageModel
 {
-    [Authorize(Policy = UserPolicies.GlobalAdministratorPolicy)]
-    public class EditModel : PageModel
+    private readonly UserManager<Core.Data.Entities.User> _userManager;
+
+    public EditModel(UserManager<Core.Data.Entities.User> userManager)
     {
-        private readonly UserManager<Core.Data.Entities.User> _userManager;
+        _userManager = userManager;
+    }
 
-        public EditModel(UserManager<Core.Data.Entities.User> userManager)
-        {
-            _userManager = userManager;
-        }
+    [BindProperty(SupportsGet = true)]
+    public string Id { get; set; }
 
-        [BindProperty(SupportsGet = true)]
-        public string Id { get; set; }
+    [BindProperty(SupportsGet = true)]
+    public string TenantId { get; set; }
 
-        [BindProperty(SupportsGet = true)]
-        public string TenantId { get; set; }
+    [BindProperty]
+    public InputModel Input { get; set; }
 
-        [BindProperty]
-        public InputModel Input { get; set; }
+    public string Username { get; set; }
 
-        public string Username { get; set; }
+    public class InputModel
+    {
+        [Required]
+        [Display(Name = "Display Name")]
+        public string DisplayName { get; set; }
 
-        public class InputModel
-        {
-            [Required]
-            [Display(Name = "Display Name")]
-            public string DisplayName { get; set; }
+        [Display(Name = "Display Name")]
+        public string SortName { get; set; }
 
-            [Display(Name = "Display Name")]
-            public string SortName { get; set; }
+        [Required]
+        [EmailAddress]
+        [Display(Name = "Email Address")]
+        public string Email { get; set; }
 
-            [Required]
-            [EmailAddress]
-            [Display(Name = "Email Address")]
-            public string Email { get; set; }
+        [Phone]
+        [Display(Name = "Phone number")]
+        public string PhoneNumber { get; set; }
 
-            [Phone]
-            [Display(Name = "Phone number")]
-            public string PhoneNumber { get; set; }
+        [Display(Name = "First Name")]
+        public string GivenName { get; set; }
 
-            [Display(Name = "First Name")]
-            public string GivenName { get; set; }
+        [Display(Name = "Last Name")]
+        public string FamilyName { get; set; }
 
-            [Display(Name = "Last Name")]
-            public string FamilyName { get; set; }
+        [Display(Name = "Title")]
+        public string JobTitle { get; set; }
 
-            [Display(Name = "Title")]
-            public string JobTitle { get; set; }
+    }
 
-        }
+    public async Task<IActionResult> OnGetAsync()
+    {
+        var user = await _userManager.FindByIdAsync(Id);
+        if (user == null)
+            return NotFound($"Unable to load user with ID '{Id}'.");
+
+        var displayName = user.DisplayName;
+        var sortName = user.SortName;
+        var userName = await _userManager.GetUserNameAsync(user);
+        var email = await _userManager.GetEmailAsync(user);
+        var phoneNumber = await _userManager.GetPhoneNumberAsync(user);
+
+        Username = userName;
 
-        public async Task<IActionResult> OnGetAsync()
+        Input = new InputModel
         {
-            var user = await _userManager.FindByIdAsync(Id);
-            if (user == null)
-                return NotFound($"Unable to load user with ID '{Id}'.");
-
-            var displayName = user.DisplayName;
-            var sortName = user.SortName;
-            var userName = await _userManager.GetUserNameAsync(user);
-            var email = await _userManager.GetEmailAsync(user);
-            var phoneNumber = await _userManager.GetPhoneNumberAsync(user);
-
-            Username = userName;
-
-            Input = new InputModel
-            {
-                DisplayName = displayName,
-                SortName = sortName,
-                Email = email,
-                PhoneNumber = phoneNumber,
-                JobTitle = user.JobTitle,
-                FamilyName = user.FamilyName,
-                GivenName = user.GivenName
-            };
+            DisplayName = displayName,
+            SortName = sortName,
+            Email = email,
+            PhoneNumber = phoneNumber,
+            JobTitle = user.JobTitle,
+            FamilyName = user.FamilyName,
+            GivenName = user.GivenName
+        };
+
+        return Page();
+    }
 
+    public async Task<IActionResult> OnPostAsync()
+    {
+        if (!ModelState.IsValid)
             return Page();
-        }
 
-        public async Task<IActionResult> OnPostAsync()
+        var user = await _userManager.FindByIdAsync(Id);
+        if (user == null)
+            return NotFound($"Unable to load user with ID '{_userManager.GetUserId(User)}'.");
+
+        if (string.IsNullOrEmpty(user.SecurityStamp))
+            await _userManager.UpdateSecurityStampAsync(user);
+
+        var userId = await _userManager.GetUserIdAsync(user);
+        var email = await _userManager.GetEmailAsync(user);
+        if (Input.Email != email)
         {
-            if (!ModelState.IsValid)
-                return Page();
-
-            var user = await _userManager.FindByIdAsync(Id);
-            if (user == null)
-                return NotFound($"Unable to load user with ID '{_userManager.GetUserId(User)}'.");
-
-            if (string.IsNullOrEmpty(user.SecurityStamp))
-                await _userManager.UpdateSecurityStampAsync(user);
-
-            var userId = await _userManager.GetUserIdAsync(user);
-            var email = await _userManager.GetEmailAsync(user);
-            if (Input.Email != email)
-            {
-                var setEmailResult = await _userManager.SetEmailAsync(user, Input.Email);
-                CheckResult(setEmailResult, userId);
-            }
-
-            var phoneNumber = await _userManager.GetPhoneNumberAsync(user);
-            if (Input.PhoneNumber != phoneNumber)
-            {
-                var setPhoneResult = await _userManager.SetPhoneNumberAsync(user, Input.PhoneNumber);
-                CheckResult(setPhoneResult, userId);
-            }
-
-            user.DisplayName = Input.DisplayName;
-            user.SortName = Input.SortName.HasValue() ? Input.SortName : ToSortName(Input);
-            user.GivenName = Input.GivenName;
-            user.FamilyName = Input.FamilyName;
-            user.JobTitle = Input.JobTitle;
-
-            var updateResult = await _userManager.UpdateAsync(user);
-            CheckResult(updateResult, userId);
-
-            ShowAlert("Successfully saved user");
-
-            return RedirectToPage("/Global/User/Edit", new { id = Id });
+            var setEmailResult = await _userManager.SetEmailAsync(user, Input.Email);
+            CheckResult(setEmailResult, userId);
         }
 
-        public async Task<IActionResult> OnPostDeleteUser()
+        var phoneNumber = await _userManager.GetPhoneNumberAsync(user);
+        if (Input.PhoneNumber != phoneNumber)
         {
-            var user = await _userManager.FindByIdAsync(Id);
-            if (user == null)
-                return NotFound($"Unable to load user with ID '{_userManager.GetUserId(User)}'.");
+            var setPhoneResult = await _userManager.SetPhoneNumberAsync(user, Input.PhoneNumber);
+            CheckResult(setPhoneResult, userId);
+        }
 
-            var result = await _userManager.DeleteAsync(user);
+        user.DisplayName = Input.DisplayName;
+        user.SortName = Input.SortName.HasValue() ? Input.SortName : ToSortName(Input);
+        user.GivenName = Input.GivenName;
+        user.FamilyName = Input.FamilyName;
+        user.JobTitle = Input.JobTitle;
 
-            if (result.Succeeded)
-            {
-                ShowAlert("Successfully deleted tenant");
+        var updateResult = await _userManager.UpdateAsync(user);
+        CheckResult(updateResult, userId);
 
-                return RedirectToPage("/Global/User/Index");
-            }
+        ShowAlert("Successfully saved user");
 
-            foreach (var error in result.Errors)
-                ModelState.AddModelError(string.Empty, error.Description);
+        return RedirectToPage("/Global/User/Edit", new { id = Id });
+    }
 
-            return Page();
-        }
+    public async Task<IActionResult> OnPostDeleteUser()
+    {
+        var user = await _userManager.FindByIdAsync(Id);
+        if (user == null)
+            return NotFound($"Unable to load user with ID '{_userManager.GetUserId(User)}'.");
 
-        private void CheckResult(IdentityResult identityResult, string userId)
+        var result = await _userManager.DeleteAsync(user);
+
+        if (result.Succeeded)
         {
-            if (identityResult.Succeeded)
-                return;
+            ShowAlert("Successfully deleted tenant");
 
-            throw new InvalidOperationException($"Unexpected error occurred updating user with ID '{userId}'.");
+            return RedirectToPage("/Global/User/Index");
         }
 
-        protected void ShowAlert(string message, string type = "success")
-        {
-            TempData["alert.type"] = type;
-            TempData["alert.message"] = message;
-        }
+        foreach (var error in result.Errors)
+            ModelState.AddModelError(string.Empty, error.Description);
 
-        private string ToSortName(InputModel user)
-        {
-            if (user.FamilyName.HasValue() && user.GivenName.HasValue())
-                return $"{user.FamilyName}, {user.GivenName}";
+        return Page();
+    }
 
-            if (user.FamilyName.HasValue())
-                return user.FamilyName;
+    private void CheckResult(IdentityResult identityResult, string userId)
+    {
+        if (identityResult.Succeeded)
+            return;
 
-            return user.DisplayName;
-        }
+        throw new InvalidOperationException($"Unexpected error occurred updating user with ID '{userId}'.");
+    }
+
+    protected void ShowAlert(string message, string type = "success")
+    {
+        TempData["alert.type"] = type;
+        TempData["alert.message"] = message;
+    }
+
+    private string ToSortName(InputModel user)
+    {
+        if (user.FamilyName.HasValue() && user.GivenName.HasValue())
+            return $"{user.FamilyName}, {user.GivenName}";
+
+        if (user.FamilyName.HasValue())
+            return user.FamilyName;
+
+        return user.DisplayName;
     }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.WebApplication/Pages/Global/User/Index.cshtml.cs b/service/src/InstructorIQ.WebApplication/Pages/Global/User/Index.cshtml.cs
index dc98fc47..c1aeb273 100644
--- a/service/src/InstructorIQ.WebApplication/Pages/Global/User/Index.cshtml.cs
+++ b/service/src/InstructorIQ.WebApplication/Pages/Global/User/Index.cshtml.cs
@@ -1,58 +1,59 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+
 using InstructorIQ.Core.Extensions;
 using InstructorIQ.Core.Security;
+
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 using Microsoft.EntityFrameworkCore;
 
-namespace InstructorIQ.WebApplication.Pages.Global.User
+namespace InstructorIQ.WebApplication.Pages.Global.User;
+
+[Authorize(Policy = UserPolicies.GlobalAdministratorPolicy)]
+public class IndexModel : PageModel
 {
-    [Authorize(Policy = UserPolicies.GlobalAdministratorPolicy)]
-    public class IndexModel : PageModel
-    {
-        private readonly UserManager<Core.Data.Entities.User> _userManager;
+    private readonly UserManager<Core.Data.Entities.User> _userManager;
 
-        public IndexModel(UserManager<Core.Data.Entities.User> userManager)
-        {
-            Users = new List<Core.Data.Entities.User>();
-            _userManager = userManager;
-        }
+    public IndexModel(UserManager<Core.Data.Entities.User> userManager)
+    {
+        Users = new List<Core.Data.Entities.User>();
+        _userManager = userManager;
+    }
 
-        [BindProperty(Name = "p", SupportsGet = true)]
-        public int PageNumber { get; set; } = 1;
+    [BindProperty(Name = "p", SupportsGet = true)]
+    public int PageNumber { get; set; } = 1;
 
-        [BindProperty(Name = "z", SupportsGet = true)]
-        public int PageSize { get; set; } = 20;
+    [BindProperty(Name = "z", SupportsGet = true)]
+    public int PageSize { get; set; } = 20;
 
-        [BindProperty(Name = "q", SupportsGet = true)]
-        public string Query { get; set; }
+    [BindProperty(Name = "q", SupportsGet = true)]
+    public string Query { get; set; }
 
-        public long Total { get; set; }
+    public long Total { get; set; }
 
-        public IReadOnlyCollection<Core.Data.Entities.User> Users { get; set; }
+    public IReadOnlyCollection<Core.Data.Entities.User> Users { get; set; }
 
-        public virtual async Task<IActionResult> OnGetAsync()
-        {
-            var query = _userManager
-                .Users
-                .OrderBy(u => u.DisplayName)
-                .AsNoTracking();
+    public virtual async Task<IActionResult> OnGetAsync()
+    {
+        var query = _userManager
+            .Users
+            .OrderBy(u => u.DisplayName)
+            .AsNoTracking();
 
-            if (Query.HasValue())
-                query = query.Where(u => u.DisplayName.Contains(Query) || u.Email.Contains(Query));
+        if (Query.HasValue())
+            query = query.Where(u => u.DisplayName.Contains(Query) || u.Email.Contains(Query));
 
-            Total = await query
-                .CountAsync();
+        Total = await query
+            .CountAsync();
 
-            Users = await query
-                .Paginate(PageNumber, PageSize)
-                .ToListAsync();
+        Users = await query
+            .Paginate(PageNumber, PageSize)
+            .ToListAsync();
 
-            return Page();
-        }
+        return Page();
     }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.WebApplication/Pages/Global/User/Membership.cshtml.cs b/service/src/InstructorIQ.WebApplication/Pages/Global/User/Membership.cshtml.cs
index 99e78436..2aca48d8 100644
--- a/service/src/InstructorIQ.WebApplication/Pages/Global/User/Membership.cshtml.cs
+++ b/service/src/InstructorIQ.WebApplication/Pages/Global/User/Membership.cshtml.cs
@@ -1,94 +1,96 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
+
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Domain.Queries;
 using InstructorIQ.Core.Multitenancy;
 using InstructorIQ.Core.Security;
 using InstructorIQ.WebApplication.Models;
+
 using MediatR;
+
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 
-namespace InstructorIQ.WebApplication.Pages.Global.User
+namespace InstructorIQ.WebApplication.Pages.Global.User;
+
+[Authorize(Policy = UserPolicies.GlobalAdministratorPolicy)]
+public class MembershipModel : MediatorModelBase
 {
-    [Authorize(Policy = UserPolicies.GlobalAdministratorPolicy)]
-    public class MembershipModel : MediatorModelBase
+    private readonly UserManager<Core.Data.Entities.User> _userManager;
+
+    public MembershipModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory, UserManager<Core.Data.Entities.User> userManager)
+        : base(tenant, mediator, loggerFactory)
     {
-        private readonly UserManager<Core.Data.Entities.User> _userManager;
+        _userManager = userManager;
 
-        public MembershipModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory, UserManager<Core.Data.Entities.User> userManager)
-            : base(tenant, mediator, loggerFactory)
-        {
-            _userManager = userManager;
+        Membership = new TenantMembershipModel();
+        Tenants = new List<TenantDropdownModel>();
+    }
 
-            Membership = new TenantMembershipModel();
-            Tenants = new List<TenantDropdownModel>();
-        }
+    [BindProperty(SupportsGet = true)]
+    public string Id { get; set; }
 
-        [BindProperty(SupportsGet = true)]
-        public string Id { get; set; }
+    [BindProperty(SupportsGet = true)]
+    public Guid TenantId { get; set; }
 
-        [BindProperty(SupportsGet = true)]
-        public Guid TenantId { get; set; }
+    [BindProperty]
+    public TenantMembershipModel Membership { get; set; }
 
-        [BindProperty]
-        public TenantMembershipModel Membership { get; set; }
+    public Core.Data.Entities.User Entity { get; set; }
 
-        public Core.Data.Entities.User Entity { get; set; }
+    public IReadOnlyCollection<TenantDropdownModel> Tenants { get; set; }
 
-        public IReadOnlyCollection<TenantDropdownModel> Tenants { get; set; }
+    public async Task<IActionResult> OnGetAsync()
+    {
+        var user = await _userManager.FindByIdAsync(Id);
+        if (user == null)
+            return NotFound($"Unable to load user with ID '{Id}'.");
 
-        public async Task<IActionResult> OnGetAsync()
-        {
-            var user = await _userManager.FindByIdAsync(Id);
-            if (user == null)
-                return NotFound($"Unable to load user with ID '{Id}'.");
+        Entity = user;
 
-            Entity = user;
+        var loadTenantsTask = LoadTenants();
+        var loadMembershipTask = LoadMembership();
 
-            var loadTenantsTask = LoadTenants();
-            var loadMembershipTask = LoadMembership();
+        await Task.WhenAll(
+            loadTenantsTask,
+            loadTenantsTask
+        );
 
-            await Task.WhenAll(
-                loadTenantsTask,
-                loadTenantsTask
-            );
+        Tenants = loadTenantsTask.Result;
+        Membership = loadMembershipTask.Result;
 
-            Tenants = loadTenantsTask.Result;
-            Membership = loadMembershipTask.Result;
+        return Page();
+    }
 
+    public async Task<IActionResult> OnPostAsync()
+    {
+        if (!ModelState.IsValid)
             return Page();
-        }
 
-        public async Task<IActionResult> OnPostAsync()
-        {
-            if (!ModelState.IsValid)
-                return Page();
+        var command = new TenantMembershipCommand(User, Membership);
+        var result = await Mediator.Send(command);
 
-            var command = new TenantMembershipCommand(User, Membership);
-            var result = await Mediator.Send(command);
+        ShowAlert("Successfully saved membership");
 
-            ShowAlert("Successfully saved membership");
-
-            return RedirectToPage("/Global/User/Membership", new { Id, TenantId });
-        }
+        return RedirectToPage("/Global/User/Membership", new { Id, TenantId });
+    }
 
-        private async Task<IReadOnlyCollection<TenantDropdownModel>> LoadTenants()
-        {
-            var dropdownQuery = new TenantDropdownQuery(User);
-            return await Mediator.Send(dropdownQuery);
-        }
+    private async Task<IReadOnlyCollection<TenantDropdownModel>> LoadTenants()
+    {
+        var dropdownQuery = new TenantDropdownQuery(User);
+        return await Mediator.Send(dropdownQuery);
+    }
 
-        private async Task<TenantMembershipModel> LoadMembership()
-        {
-            if (TenantId == Guid.Empty)
-                return new TenantMembershipModel();
+    private async Task<TenantMembershipModel> LoadMembership()
+    {
+        if (TenantId == Guid.Empty)
+            return new TenantMembershipModel();
 
-            var command = new TenantMembershipQuery(User, TenantId, Entity.Id);
-            return await Mediator.Send(command);
-        }
+        var command = new TenantMembershipQuery(User, TenantId, Entity.Id);
+        return await Mediator.Send(command);
     }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.WebApplication/Pages/Group/Create.cshtml.cs b/service/src/InstructorIQ.WebApplication/Pages/Group/Create.cshtml.cs
index 2b3fcf09..7165016f 100644
--- a/service/src/InstructorIQ.WebApplication/Pages/Group/Create.cshtml.cs
+++ b/service/src/InstructorIQ.WebApplication/Pages/Group/Create.cshtml.cs
@@ -1,47 +1,49 @@
-using System.Threading.Tasks;
-using MediatR.CommandQuery.Commands;
+using System.Threading.Tasks;
+
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Multitenancy;
 using InstructorIQ.Core.Security;
 using InstructorIQ.WebApplication.Models;
+
 using MediatR;
+using MediatR.CommandQuery.Commands;
+
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 
-namespace InstructorIQ.WebApplication.Pages.Group
+namespace InstructorIQ.WebApplication.Pages.Group;
+
+[Authorize(Policy = UserPolicies.AdministratorPolicy)]
+public class CreateModel : EntityCreateModelBase<GroupCreateModel>
 {
-    [Authorize(Policy = UserPolicies.AdministratorPolicy)]
-    public class CreateModel : EntityCreateModelBase<GroupCreateModel>
+    public CreateModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
+        : base(tenant, mediator, loggerFactory)
     {
-        public CreateModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
-            : base(tenant, mediator, loggerFactory)
-        {
 
-        }
+    }
 
-        public async Task<IActionResult> OnPostAsync()
-        {
-            if (!ModelState.IsValid)
-                return Page();
+    public async Task<IActionResult> OnPostAsync()
+    {
+        if (!ModelState.IsValid)
+            return Page();
 
-            var createModel = new GroupCreateModel();
+        var createModel = new GroupCreateModel();
 
-            // only update input fields
-            await TryUpdateModelAsync(
-                createModel,
-                nameof(Entity),
-                p => p.Name,
-                p => p.Description,
-                p => p.Sequence
-            );
+        // only update input fields
+        await TryUpdateModelAsync(
+            createModel,
+            nameof(Entity),
+            p => p.Name,
+            p => p.Description,
+            p => p.Sequence
+        );
 
-            var command = new EntityCreateCommand<GroupCreateModel, GroupReadModel>(User, createModel);
-            var result = await Mediator.Send(command);
+        var command = new EntityCreateCommand<GroupCreateModel, GroupReadModel>(User, createModel);
+        var result = await Mediator.Send(command);
 
-            ShowAlert("Successfully created group");
+        ShowAlert("Successfully created group");
 
-            return RedirectToPage("/Group/Edit", new { id = result.Id, tenant = TenantRoute });
-        }
+        return RedirectToPage("/Group/Edit", new { id = result.Id, tenant = TenantRoute });
     }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.WebApplication/Pages/Group/Edit.cshtml.cs b/service/src/InstructorIQ.WebApplication/Pages/Group/Edit.cshtml.cs
index 64bc659b..225b8bdf 100644
--- a/service/src/InstructorIQ.WebApplication/Pages/Group/Edit.cshtml.cs
+++ b/service/src/InstructorIQ.WebApplication/Pages/Group/Edit.cshtml.cs
@@ -1,63 +1,65 @@
-using System;
+using System;
 using System.Threading.Tasks;
-using MediatR.CommandQuery.Commands;
-using MediatR.CommandQuery.Queries;
+
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Multitenancy;
 using InstructorIQ.Core.Security;
 using InstructorIQ.WebApplication.Models;
+
 using MediatR;
+using MediatR.CommandQuery.Commands;
+using MediatR.CommandQuery.Queries;
+
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 
-namespace InstructorIQ.WebApplication.Pages.Group
+namespace InstructorIQ.WebApplication.Pages.Group;
+
+[Authorize(Policy = UserPolicies.AdministratorPolicy)]
+public class EditModel : EntityIdentifierModelBase<GroupUpdateModel>
 {
-    [Authorize(Policy = UserPolicies.AdministratorPolicy)]
-    public class EditModel : EntityIdentifierModelBase<GroupUpdateModel>
+    public EditModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
+        : base(tenant, mediator, loggerFactory)
     {
-        public EditModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
-            : base(tenant, mediator, loggerFactory)
-        {
-        }
-
-        public async Task<IActionResult> OnPostAsync()
-        {
-            if (!ModelState.IsValid)
-                return Page();
+    }
 
-            var readCommand = new EntityIdentifierQuery<Guid, GroupUpdateModel>(User, Id);
-            var updateModel = await Mediator.Send(readCommand);
-            if (updateModel == null)
-                return NotFound();
+    public async Task<IActionResult> OnPostAsync()
+    {
+        if (!ModelState.IsValid)
+            return Page();
 
-            // only update input fields
-            await TryUpdateModelAsync(
-                updateModel,
-                nameof(Entity),
-                p => p.Name,
-                p => p.Description,
-                p => p.Sequence
-            );
+        var readCommand = new EntityIdentifierQuery<Guid, GroupUpdateModel>(User, Id);
+        var updateModel = await Mediator.Send(readCommand);
+        if (updateModel == null)
+            return NotFound();
 
-            var updateCommand = new EntityUpdateCommand<Guid, GroupUpdateModel, GroupReadModel>(User, Id, updateModel);
-            var result = await Mediator.Send(updateCommand);
+        // only update input fields
+        await TryUpdateModelAsync(
+            updateModel,
+            nameof(Entity),
+            p => p.Name,
+            p => p.Description,
+            p => p.Sequence
+        );
 
-            ShowAlert("Successfully saved group");
+        var updateCommand = new EntityUpdateCommand<Guid, GroupUpdateModel, GroupReadModel>(User, Id, updateModel);
+        var result = await Mediator.Send(updateCommand);
 
-            return RedirectToPage("/Group/Edit", new { id = result.Id, tenant = TenantRoute });
-        }
+        ShowAlert("Successfully saved group");
 
-        public async Task<IActionResult> OnPostDeleteEntity()
-        {
-            var command = new EntityDeleteCommand<Guid, GroupReadModel>(User, Id);
-            var result = await Mediator.Send(command);
+        return RedirectToPage("/Group/Edit", new { id = result.Id, tenant = TenantRoute });
+    }
 
-            ShowAlert("Successfully deleted group");
+    public async Task<IActionResult> OnPostDeleteEntity()
+    {
+        var command = new EntityDeleteCommand<Guid, GroupReadModel>(User, Id);
+        var result = await Mediator.Send(command);
 
-            return RedirectToPage("/Group/Index", new { tenant = TenantRoute });
+        ShowAlert("Successfully deleted group");
 
-        }
+        return RedirectToPage("/Group/Index", new { tenant = TenantRoute });
 
     }
-}
\ No newline at end of file
+
+}
diff --git a/service/src/InstructorIQ.WebApplication/Pages/Group/Index.cshtml.cs b/service/src/InstructorIQ.WebApplication/Pages/Group/Index.cshtml.cs
index bfdabe29..fb60789b 100644
--- a/service/src/InstructorIQ.WebApplication/Pages/Group/Index.cshtml.cs
+++ b/service/src/InstructorIQ.WebApplication/Pages/Group/Index.cshtml.cs
@@ -1,45 +1,47 @@
-using MediatR.CommandQuery.Queries;
+using System.Collections.Generic;
+
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Multitenancy;
 using InstructorIQ.WebApplication.Models;
+
 using MediatR;
+using MediatR.CommandQuery.Queries;
+
 using Microsoft.Extensions.Logging;
-using System.Collections.Generic;
 
-namespace InstructorIQ.WebApplication.Pages.Group
+namespace InstructorIQ.WebApplication.Pages.Group;
+
+public class IndexModel : EntityPagedModelBase<GroupReadModel>
 {
-    public class IndexModel : EntityPagedModelBase<GroupReadModel>
-    {
 
-        public IndexModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
-            : base(tenant, mediator, loggerFactory)
-        {
-            Sort = nameof(GroupReadModel.Sequence);
-        }
+    public IndexModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
+        : base(tenant, mediator, loggerFactory)
+    {
+        Sort = nameof(GroupReadModel.Sequence);
+    }
 
-        protected override EntityFilter CreateFilter()
+    protected override EntityFilter CreateFilter()
+    {
+        var filter = new EntityFilter
         {
-            var filter = new EntityFilter
+            Logic = EntityFilterLogic.Or,
+            Filters = new List<EntityFilter>
             {
-                Logic = EntityFilterLogic.Or,
-                Filters = new List<EntityFilter>
+                new EntityFilter
+                {
+                    Name = nameof(GroupReadModel.Name),
+                    Value = Query,
+                    Operator = EntityFilterOperators.Contains
+                },
+                new EntityFilter
                 {
-                    new EntityFilter
-                    {
-                        Name = nameof(GroupReadModel.Name),
-                        Value = Query,
-                        Operator = EntityFilterOperators.Contains
-                    },
-                    new EntityFilter
-                    {
-                        Name = nameof(GroupReadModel.Description),
-                        Value = Query,
-                        Operator = EntityFilterOperators.Contains
-                    }
+                    Name = nameof(GroupReadModel.Description),
+                    Value = Query,
+                    Operator = EntityFilterOperators.Contains
                 }
-            };
+            }
+        };
 
-            return filter;
-        }
+        return filter;
     }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.WebApplication/Pages/Index.cshtml.cs b/service/src/InstructorIQ.WebApplication/Pages/Index.cshtml.cs
index a7d1b18f..7482b8e7 100644
--- a/service/src/InstructorIQ.WebApplication/Pages/Index.cshtml.cs
+++ b/service/src/InstructorIQ.WebApplication/Pages/Index.cshtml.cs
@@ -1,18 +1,18 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
-namespace InstructorIQ.WebApplication.Pages
+namespace InstructorIQ.WebApplication.Pages;
+
+public class IndexModel : PageModel
 {
-    public class IndexModel : PageModel
+    public void OnGet()
     {
-        public void OnGet()
-        {
-            var u = this.User;
+        var u = this.User;
 
-        }
     }
 }
diff --git a/service/src/InstructorIQ.WebApplication/Pages/Instructor/Index.cshtml.cs b/service/src/InstructorIQ.WebApplication/Pages/Instructor/Index.cshtml.cs
index 55fb45f4..710572ea 100644
--- a/service/src/InstructorIQ.WebApplication/Pages/Instructor/Index.cshtml.cs
+++ b/service/src/InstructorIQ.WebApplication/Pages/Instructor/Index.cshtml.cs
@@ -1,92 +1,94 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Threading.Tasks;
+
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Domain.Queries;
 using InstructorIQ.Core.Multitenancy;
 using InstructorIQ.WebApplication.Models;
+
 using MediatR;
 using MediatR.CommandQuery.Queries;
+
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 
-namespace InstructorIQ.WebApplication.Pages.Instructor
+namespace InstructorIQ.WebApplication.Pages.Instructor;
+
+[Authorize]
+public class IndexModel : MediatorModelBase
 {
-    [Authorize]
-    public class IndexModel : MediatorModelBase
+    public IndexModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
+        : base(tenant, mediator, loggerFactory)
     {
-        public IndexModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
-            : base(tenant, mediator, loggerFactory)
-        {
-            Sort = nameof(MemberReadModel.SortName);
-        }
+        Sort = nameof(MemberReadModel.SortName);
+    }
 
-        [BindProperty(Name = "p", SupportsGet = true)]
-        public int PageNumber { get; set; } = 1;
+    [BindProperty(Name = "p", SupportsGet = true)]
+    public int PageNumber { get; set; } = 1;
 
-        [BindProperty(Name = "z", SupportsGet = true)]
-        public int PageSize { get; set; } = 20;
+    [BindProperty(Name = "z", SupportsGet = true)]
+    public int PageSize { get; set; } = 20;
 
-        [BindProperty(Name = "s", SupportsGet = true)]
-        public string Sort { get; set; }
+    [BindProperty(Name = "s", SupportsGet = true)]
+    public string Sort { get; set; }
 
-        [BindProperty(Name = "q", SupportsGet = true)]
-        public string Query { get; set; }
+    [BindProperty(Name = "q", SupportsGet = true)]
+    public string Query { get; set; }
 
-        public long Total { get; set; }
+    public long Total { get; set; }
 
-        public IReadOnlyCollection<MemberReadModel> Items { get; set; }
+    public IReadOnlyCollection<MemberReadModel> Items { get; set; }
 
 
-        public async Task<IActionResult> OnGetAsync()
-        {
-            var query = CreateQuery();
-            var command = new MemberPagedQuery(User, query, Tenant.Value.Id);
-            command.RoleId = Core.Data.Constants.Role.Instructor;
+    public async Task<IActionResult> OnGetAsync()
+    {
+        var query = CreateQuery();
+        var command = new MemberPagedQuery(User, query, Tenant.Value.Id);
+        command.RoleId = Core.Data.Constants.Role.Instructor;
 
-            var result = await Mediator.Send(command);
-            Total = result.Total;
-            Items = result.Data;
+        var result = await Mediator.Send(command);
+        Total = result.Total;
+        Items = result.Data;
 
-            return Page();
-        }
+        return Page();
+    }
 
 
-        protected EntityQuery CreateQuery()
-        {
-            var query = new EntityQuery(null, PageNumber, PageSize, Sort);
+    protected EntityQuery CreateQuery()
+    {
+        var query = new EntityQuery(null, PageNumber, PageSize, Sort);
 
-            if (string.IsNullOrWhiteSpace(Query))
-                return query;
+        if (string.IsNullOrWhiteSpace(Query))
+            return query;
 
-            query.Filter = CreateFilter();
+        query.Filter = CreateFilter();
 
-            return query;
-        }
+        return query;
+    }
 
-        protected EntityFilter CreateFilter()
+    protected EntityFilter CreateFilter()
+    {
+        var filter = new EntityFilter
         {
-            var filter = new EntityFilter
+            Logic = EntityFilterLogic.Or,
+            Filters = new List<EntityFilter>
             {
-                Logic = EntityFilterLogic.Or,
-                Filters = new List<EntityFilter>
+                new EntityFilter
+                {
+                    Name = "DisplayName",
+                    Value = Query,
+                    Operator = EntityFilterOperators.Contains
+                },
+                new EntityFilter
                 {
-                    new EntityFilter
-                    {
-                        Name = "DisplayName",
-                        Value = Query,
-                        Operator = EntityFilterOperators.Contains
-                    },
-                    new EntityFilter
-                    {
-                        Name = "Email",
-                        Value = Query,
-                        Operator = EntityFilterOperators.Contains
-                    }
+                    Name = "Email",
+                    Value = Query,
+                    Operator = EntityFilterOperators.Contains
                 }
-            };
+            }
+        };
 
-            return filter;
-        }
+        return filter;
     }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.WebApplication/Pages/Instructor/View.cshtml.cs b/service/src/InstructorIQ.WebApplication/Pages/Instructor/View.cshtml.cs
index df4b8bea..ac324cca 100644
--- a/service/src/InstructorIQ.WebApplication/Pages/Instructor/View.cshtml.cs
+++ b/service/src/InstructorIQ.WebApplication/Pages/Instructor/View.cshtml.cs
@@ -1,18 +1,19 @@
-using InstructorIQ.Core.Domain.Models;
+using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Multitenancy;
 using InstructorIQ.WebApplication.Models;
+
 using MediatR;
+
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.Extensions.Logging;
 
-namespace InstructorIQ.WebApplication.Pages.Instructor
+namespace InstructorIQ.WebApplication.Pages.Instructor;
+
+[Authorize]
+public class ViewModel : EntityIdentifierModelBase<MemberReadModel>
 {
-    [Authorize]
-    public class ViewModel : EntityIdentifierModelBase<MemberReadModel>
+    public ViewModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
+        : base(tenant, mediator, loggerFactory)
     {
-        public ViewModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
-            : base(tenant, mediator, loggerFactory)
-        {
-        }
     }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.WebApplication/Pages/Location/Create.cshtml.cs b/service/src/InstructorIQ.WebApplication/Pages/Location/Create.cshtml.cs
index 23c418e4..246d5e1b 100644
--- a/service/src/InstructorIQ.WebApplication/Pages/Location/Create.cshtml.cs
+++ b/service/src/InstructorIQ.WebApplication/Pages/Location/Create.cshtml.cs
@@ -1,53 +1,55 @@
-using System.Threading.Tasks;
-using MediatR.CommandQuery.Commands;
+using System.Threading.Tasks;
+
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Multitenancy;
 using InstructorIQ.Core.Security;
 using InstructorIQ.WebApplication.Models;
+
 using MediatR;
+using MediatR.CommandQuery.Commands;
+
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 
-namespace InstructorIQ.WebApplication.Pages.Location
+namespace InstructorIQ.WebApplication.Pages.Location;
+
+[Authorize(Policy = UserPolicies.AdministratorPolicy)]
+public class CreateModel : EntityCreateModelBase<LocationCreateModel>
 {
-    [Authorize(Policy = UserPolicies.AdministratorPolicy)]
-    public class CreateModel : EntityCreateModelBase<LocationCreateModel>
+    public CreateModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
+        : base(tenant, mediator, loggerFactory)
+    {
+
+    }
+
+    public async Task<IActionResult> OnPostAsync()
     {
-        public CreateModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
-            : base(tenant, mediator, loggerFactory)
-        {
-
-        }
-
-        public async Task<IActionResult> OnPostAsync()
-        {
-            if (!ModelState.IsValid)
-                return Page();
-
-            var createModel = new LocationCreateModel();
-
-            // only update input fields
-            await TryUpdateModelAsync(
-                createModel,
-                nameof(Entity),
-                p => p.Name,
-                p => p.Description,
-                p => p.AddressLine1,
-                p => p.City,
-                p => p.StateProvince,
-                p => p.PostalCode,
-                p => p.ContactName,
-                p => p.ContactEmail,
-                p => p.ContactPhone
-            );
-
-            var command = new EntityCreateCommand<LocationCreateModel, LocationReadModel>(User, createModel);
-            var result = await Mediator.Send(command);
-
-            ShowAlert("Successfully created location");
-
-            return RedirectToPage("/Location/Edit", new { id = result.Id, tenant = TenantRoute });
-        }
+        if (!ModelState.IsValid)
+            return Page();
+
+        var createModel = new LocationCreateModel();
+
+        // only update input fields
+        await TryUpdateModelAsync(
+            createModel,
+            nameof(Entity),
+            p => p.Name,
+            p => p.Description,
+            p => p.AddressLine1,
+            p => p.City,
+            p => p.StateProvince,
+            p => p.PostalCode,
+            p => p.ContactName,
+            p => p.ContactEmail,
+            p => p.ContactPhone
+        );
+
+        var command = new EntityCreateCommand<LocationCreateModel, LocationReadModel>(User, createModel);
+        var result = await Mediator.Send(command);
+
+        ShowAlert("Successfully created location");
+
+        return RedirectToPage("/Location/Edit", new { id = result.Id, tenant = TenantRoute });
     }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.WebApplication/Pages/Location/Edit.cshtml.cs b/service/src/InstructorIQ.WebApplication/Pages/Location/Edit.cshtml.cs
index eeb60c5f..e545c680 100644
--- a/service/src/InstructorIQ.WebApplication/Pages/Location/Edit.cshtml.cs
+++ b/service/src/InstructorIQ.WebApplication/Pages/Location/Edit.cshtml.cs
@@ -1,69 +1,71 @@
-using System;
+using System;
 using System.Threading.Tasks;
-using MediatR.CommandQuery.Commands;
-using MediatR.CommandQuery.Queries;
+
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Multitenancy;
 using InstructorIQ.Core.Security;
 using InstructorIQ.WebApplication.Models;
+
 using MediatR;
+using MediatR.CommandQuery.Commands;
+using MediatR.CommandQuery.Queries;
+
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 
-namespace InstructorIQ.WebApplication.Pages.Location
+namespace InstructorIQ.WebApplication.Pages.Location;
+
+[Authorize(Policy = UserPolicies.AdministratorPolicy)]
+public class EditModel : EntityIdentifierModelBase<LocationUpdateModel>
 {
-    [Authorize(Policy = UserPolicies.AdministratorPolicy)]
-    public class EditModel : EntityIdentifierModelBase<LocationUpdateModel>
+    public EditModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
+        : base(tenant, mediator, loggerFactory)
+    {
+    }
+
+    public async Task<IActionResult> OnPostAsync()
     {
-        public EditModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
-            : base(tenant, mediator, loggerFactory)
-        {
-        }
-
-        public async Task<IActionResult> OnPostAsync()
-        {
-            if (!ModelState.IsValid)
-                return Page();
-
-            var readCommand = new EntityIdentifierQuery<Guid, LocationUpdateModel>(User, Id);
-            var updateModel = await Mediator.Send(readCommand);
-            if (updateModel == null)
-                return NotFound();
-
-            // only update input fields
-            await TryUpdateModelAsync(
-                updateModel,
-                nameof(Entity),
-                p => p.Name,
-                p => p.Description,
-                p => p.AddressLine1,
-                p => p.City,
-                p => p.StateProvince,
-                p => p.PostalCode,
-                p => p.ContactName,
-                p => p.ContactEmail,
-                p => p.ContactPhone
-            );
-
-            var updateCommand = new EntityUpdateCommand<Guid, LocationUpdateModel, LocationReadModel>(User, Id, updateModel);
-            var result = await Mediator.Send(updateCommand);
-
-            ShowAlert("Successfully saved location");
-
-            return RedirectToPage("/Location/Edit", new { id = result.Id, tenant = TenantRoute });
-        }
-
-        public async Task<IActionResult> OnPostDeleteEntity()
-        {
-            var command = new EntityDeleteCommand<Guid, LocationReadModel>(User, Id);
-            var result = await Mediator.Send(command);
-
-            ShowAlert("Successfully deleted location");
-
-            return RedirectToPage("/Location/Index", new { tenant = TenantRoute });
-
-        }
+        if (!ModelState.IsValid)
+            return Page();
 
+        var readCommand = new EntityIdentifierQuery<Guid, LocationUpdateModel>(User, Id);
+        var updateModel = await Mediator.Send(readCommand);
+        if (updateModel == null)
+            return NotFound();
+
+        // only update input fields
+        await TryUpdateModelAsync(
+            updateModel,
+            nameof(Entity),
+            p => p.Name,
+            p => p.Description,
+            p => p.AddressLine1,
+            p => p.City,
+            p => p.StateProvince,
+            p => p.PostalCode,
+            p => p.ContactName,
+            p => p.ContactEmail,
+            p => p.ContactPhone
+        );
+
+        var updateCommand = new EntityUpdateCommand<Guid, LocationUpdateModel, LocationReadModel>(User, Id, updateModel);
+        var result = await Mediator.Send(updateCommand);
+
+        ShowAlert("Successfully saved location");
+
+        return RedirectToPage("/Location/Edit", new { id = result.Id, tenant = TenantRoute });
     }
-}
\ No newline at end of file
+
+    public async Task<IActionResult> OnPostDeleteEntity()
+    {
+        var command = new EntityDeleteCommand<Guid, LocationReadModel>(User, Id);
+        var result = await Mediator.Send(command);
+
+        ShowAlert("Successfully deleted location");
+
+        return RedirectToPage("/Location/Index", new { tenant = TenantRoute });
+
+    }
+
+}
diff --git a/service/src/InstructorIQ.WebApplication/Pages/Location/Index.cshtml.cs b/service/src/InstructorIQ.WebApplication/Pages/Location/Index.cshtml.cs
index dfc6a723..a427d4bf 100644
--- a/service/src/InstructorIQ.WebApplication/Pages/Location/Index.cshtml.cs
+++ b/service/src/InstructorIQ.WebApplication/Pages/Location/Index.cshtml.cs
@@ -1,50 +1,52 @@
-using MediatR.CommandQuery.Queries;
+using System.Collections.Generic;
+
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Multitenancy;
 using InstructorIQ.WebApplication.Models;
+
 using MediatR;
+using MediatR.CommandQuery.Queries;
+
 using Microsoft.Extensions.Logging;
-using System.Collections.Generic;
 
-namespace InstructorIQ.WebApplication.Pages.Location
+namespace InstructorIQ.WebApplication.Pages.Location;
+
+public class IndexModel : EntityPagedModelBase<LocationReadModel>
 {
-    public class IndexModel : EntityPagedModelBase<LocationReadModel>
+    public IndexModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
+        : base(tenant, mediator, loggerFactory)
     {
-        public IndexModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
-            : base(tenant, mediator, loggerFactory)
-        {
-        }
+    }
 
-        protected override EntityFilter CreateFilter()
+    protected override EntityFilter CreateFilter()
+    {
+        var filter = new EntityFilter
         {
-            var filter = new EntityFilter
+            Logic = EntityFilterLogic.Or,
+            Filters = new List<EntityFilter>
             {
-                Logic = EntityFilterLogic.Or,
-                Filters = new List<EntityFilter>
+                new EntityFilter
+                {
+                    Name = nameof(LocationReadModel.Name),
+                    Value = Query,
+                    Operator = EntityFilterOperators.Contains
+                },
+                new EntityFilter
                 {
-                    new EntityFilter
-                    {
-                        Name = nameof(LocationReadModel.Name),
-                        Value = Query,
-                        Operator = EntityFilterOperators.Contains
-                    },
-                    new EntityFilter
-                    {
-                        Name = nameof(LocationReadModel.Description),
-                        Value = Query,
-                        Operator = EntityFilterOperators.Contains
-                    },
-                    new EntityFilter
-                    {
-                        Name = nameof(LocationReadModel.City),
-                        Value = Query,
-                        Operator = EntityFilterOperators.Contains
-                    }
+                    Name = nameof(LocationReadModel.Description),
+                    Value = Query,
+                    Operator = EntityFilterOperators.Contains
+                },
+                new EntityFilter
+                {
+                    Name = nameof(LocationReadModel.City),
+                    Value = Query,
+                    Operator = EntityFilterOperators.Contains
                 }
-            };
-
-            return filter;
-        }
+            }
+        };
 
+        return filter;
     }
-}
\ No newline at end of file
+
+}
diff --git a/service/src/InstructorIQ.WebApplication/Pages/Member/Assign.cshtml.cs b/service/src/InstructorIQ.WebApplication/Pages/Member/Assign.cshtml.cs
index 3b2db5d6..a9f9e4b8 100644
--- a/service/src/InstructorIQ.WebApplication/Pages/Member/Assign.cshtml.cs
+++ b/service/src/InstructorIQ.WebApplication/Pages/Member/Assign.cshtml.cs
@@ -1,87 +1,89 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+
 using InstructorIQ.Core.Domain.Commands;
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Domain.Queries;
 using InstructorIQ.Core.Multitenancy;
 using InstructorIQ.Core.Security;
 using InstructorIQ.WebApplication.Models;
+
 using MediatR;
 using MediatR.CommandQuery.Queries;
+
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 
-namespace InstructorIQ.WebApplication.Pages.Member
+namespace InstructorIQ.WebApplication.Pages.Member;
+
+[Authorize(Policy = UserPolicies.AdministratorPolicy)]
+public class AssignModel : MediatorModelBase
 {
-    [Authorize(Policy = UserPolicies.AdministratorPolicy)]
-    public class AssignModel : MediatorModelBase
+    public AssignModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
+        : base(tenant, mediator, loggerFactory)
     {
-        public AssignModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
-            : base(tenant, mediator, loggerFactory)
-        {
-            SelectedUser = new List<string>();
-            SelectedRole = new List<string>();
-        }
+        SelectedUser = new List<string>();
+        SelectedRole = new List<string>();
+    }
 
-        [BindProperty]
-        public List<string> SelectedUser { get; set; }
+    [BindProperty]
+    public List<string> SelectedUser { get; set; }
 
-        [BindProperty]
-        public List<string> SelectedRole { get; set; }
+    [BindProperty]
+    public List<string> SelectedRole { get; set; }
 
-        public IReadOnlyCollection<MemberReadModel> Members { get; set; }
+    public IReadOnlyCollection<MemberReadModel> Members { get; set; }
 
-        public IReadOnlyCollection<RoleReadModel> Roles { get; set; }
+    public IReadOnlyCollection<RoleReadModel> Roles { get; set; }
 
 
-        public async Task<IActionResult> OnGetAsync()
-        {
-            await LoadMembers();
-            await LoadRoles();
+    public async Task<IActionResult> OnGetAsync()
+    {
+        await LoadMembers();
+        await LoadRoles();
 
-            return Page();
-        }
+        return Page();
+    }
 
-        public async Task<IActionResult> OnPostAsync()
+    public async Task<IActionResult> OnPostAsync()
+    {
+        if (SelectedUser.Count == 0)
         {
-            if (SelectedUser.Count == 0)
-            {
-                ModelState.AddModelError("SelectedUser", "Must select at least one user.");
-                return await OnGetAsync();
-            }
-
-            if (SelectedRole.Count == 0)
-            {
-                ModelState.AddModelError("SelectedRole", "Must select at least one role.");
-                return await OnGetAsync();
-            }
-
-            var command = new MemberAssignRoleCommand(User, Tenant.Value.Id, SelectedUser, SelectedRole);
-            var result = await Mediator.Send(command);
-
-            return RedirectToPage("/Member/Index", new { tenant = TenantRoute });
+            ModelState.AddModelError("SelectedUser", "Must select at least one user.");
+            return await OnGetAsync();
         }
 
-        private async Task LoadRoles()
+        if (SelectedRole.Count == 0)
         {
-            var command = new EntitySelectQuery<RoleReadModel>(User, new EntitySelect());
-            var roles = await Mediator.Send(command);
-
-            Roles = roles
-                .OrderBy(m => m.Name)
-                .ToList();
+            ModelState.AddModelError("SelectedRole", "Must select at least one role.");
+            return await OnGetAsync();
         }
 
-        private async Task LoadMembers()
-        {
-            var command = new MemberSelectQuery(User, Tenant.Value.Id);
-            var members = await Mediator.Send(command);
+        var command = new MemberAssignRoleCommand(User, Tenant.Value.Id, SelectedUser, SelectedRole);
+        var result = await Mediator.Send(command);
 
-            Members = members
-                .OrderBy(m => m.SortName)
-                .ToList();
-        }
+        return RedirectToPage("/Member/Index", new { tenant = TenantRoute });
+    }
+
+    private async Task LoadRoles()
+    {
+        var command = new EntitySelectQuery<RoleReadModel>(User, new EntitySelect());
+        var roles = await Mediator.Send(command);
+
+        Roles = roles
+            .OrderBy(m => m.Name)
+            .ToList();
+    }
+
+    private async Task LoadMembers()
+    {
+        var command = new MemberSelectQuery(User, Tenant.Value.Id);
+        var members = await Mediator.Send(command);
+
+        Members = members
+            .OrderBy(m => m.SortName)
+            .ToList();
     }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.WebApplication/Pages/Member/Create.cshtml.cs b/service/src/InstructorIQ.WebApplication/Pages/Member/Create.cshtml.cs
index 83c624e0..499f7267 100644
--- a/service/src/InstructorIQ.WebApplication/Pages/Member/Create.cshtml.cs
+++ b/service/src/InstructorIQ.WebApplication/Pages/Member/Create.cshtml.cs
@@ -1,6 +1,7 @@
-using System;
+using System;
 using System.ComponentModel.DataAnnotations;
 using System.Threading.Tasks;
+
 using InstructorIQ.Core.Domain.Commands;
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Domain.Queries;
@@ -8,120 +9,121 @@
 using InstructorIQ.Core.Models;
 using InstructorIQ.Core.Multitenancy;
 using InstructorIQ.WebApplication.Models;
+
 using MediatR;
+
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 
-namespace InstructorIQ.WebApplication.Pages.Member
+namespace InstructorIQ.WebApplication.Pages.Member;
+
+public class CreateModel : MediatorModelBase
 {
-    public class CreateModel : MediatorModelBase
+    private readonly UserManager<Core.Data.Entities.User> _userManager;
+
+    public CreateModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory, UserManager<Core.Data.Entities.User> userManager)
+        : base(tenant, mediator, loggerFactory)
     {
-        private readonly UserManager<Core.Data.Entities.User> _userManager;
+        _userManager = userManager;
+    }
 
-        public CreateModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory, UserManager<Core.Data.Entities.User> userManager)
-            : base(tenant, mediator, loggerFactory)
-        {
-            _userManager = userManager;
-        }
+    [BindProperty]
+    public InputModel Input { get; set; }
 
-        [BindProperty]
-        public InputModel Input { get; set; }
+    public class InputModel
+    {
+        [Required]
+        [Display(Name = "Display Name")]
+        public string DisplayName { get; set; }
 
-        public class InputModel
-        {
-            [Required]
-            [Display(Name = "Display Name")]
-            public string DisplayName { get; set; }
+        [Required]
+        [EmailAddress]
+        [Display(Name = "Email Address")]
+        public string Email { get; set; }
 
-            [Required]
-            [EmailAddress]
-            [Display(Name = "Email Address")]
-            public string Email { get; set; }
+        [Display(Name = "Send Invite")]
+        public bool SendInvite { get; set; }
+    }
 
-            [Display(Name = "Send Invite")]
-            public bool SendInvite { get; set; }
-        }
+    public void OnGet()
+    {
+        Input = new InputModel { SendInvite = true };
+    }
+
+    public async Task<IActionResult> OnPostAsync()
+    {
+        if (!ModelState.IsValid)
+            return Page();
+
+        var user = await GetOrCreateUser();
+        if (user == null)
+            return Page();
 
-        public void OnGet()
+        await UpdateMembership(user);
+
+        if (Input.SendInvite)
         {
-            Input = new InputModel { SendInvite = true };
+            await SendInvite(user);
+            ShowAlert("Successfully sent invite email");
         }
-
-        public async Task<IActionResult> OnPostAsync()
+        else
         {
-            if (!ModelState.IsValid)
-                return Page();
-
-            var user = await GetOrCreateUser();
-            if (user == null)
-                return Page();
-
-            await UpdateMembership(user);
-
-            if (Input.SendInvite)
-            {
-                await SendInvite(user);
-                ShowAlert("Successfully sent invite email");
-            }
-            else
-            {
-                ShowAlert("Successfully saved user");
-            }
-
-            return RedirectToPage("/Member/Index", new { tenant = TenantRoute });
+            ShowAlert("Successfully saved user");
         }
 
-        private async Task<Core.Data.Entities.User> GetOrCreateUser()
-        {
-            var user = await _userManager.FindByEmailAsync(Input.Email);
-            if (user != null)
-                return user;
+        return RedirectToPage("/Member/Index", new { tenant = TenantRoute });
+    }
 
-            user = new Core.Data.Entities.User
-            {
-                DisplayName = Input.DisplayName,
-                UserName = Input.Email,
-                Email = Input.Email
-            };
+    private async Task<Core.Data.Entities.User> GetOrCreateUser()
+    {
+        var user = await _userManager.FindByEmailAsync(Input.Email);
+        if (user != null)
+            return user;
 
-            var result = await _userManager.CreateAsync(user);
+        user = new Core.Data.Entities.User
+        {
+            DisplayName = Input.DisplayName,
+            UserName = Input.Email,
+            Email = Input.Email
+        };
 
-            if (result.Succeeded)
-                return user;
+        var result = await _userManager.CreateAsync(user);
 
-            foreach (var error in result.Errors)
-                ModelState.AddModelError(string.Empty, error.Description);
+        if (result.Succeeded)
+            return user;
 
-            return null;
-        }
+        foreach (var error in result.Errors)
+            ModelState.AddModelError(string.Empty, error.Description);
 
-        private async Task UpdateMembership(Core.Data.Entities.User user)
-        {
-            if (!Tenant.HasValue)
-                return;
+        return null;
+    }
+
+    private async Task UpdateMembership(Core.Data.Entities.User user)
+    {
+        if (!Tenant.HasValue)
+            return;
 
-            var membershipQuery = new TenantMembershipQuery(User, Tenant.Value.Id, user.Id);
-            var membership = await Mediator.Send(membershipQuery);
+        var membershipQuery = new TenantMembershipQuery(User, Tenant.Value.Id, user.Id);
+        var membership = await Mediator.Send(membershipQuery);
 
-            // make sure user is member
-            membership.IsMember = true;
+        // make sure user is member
+        membership.IsMember = true;
 
-            var membershipCommand = new TenantMembershipCommand(User, membership);
-            membership = await Mediator.Send(membershipCommand);
-        }
+        var membershipCommand = new TenantMembershipCommand(User, membership);
+        membership = await Mediator.Send(membershipCommand);
+    }
 
-        private async Task SendInvite(Core.Data.Entities.User user)
+    private async Task SendInvite(Core.Data.Entities.User user)
+    {
+        var model = new UserInviteModel
         {
-            var model = new UserInviteModel
-            {
-                User = user,
-                ReturnUrl = Url.Content("~/"),
-            };
-            Request.ReadUserAgent(model);
-
-            var command = new SendUserInviteEmailCommand(User, model);
-            await Mediator.Send(command);
-        }
+            User = user,
+            ReturnUrl = Url.Content("~/"),
+        };
+        Request.ReadUserAgent(model);
+
+        var command = new SendUserInviteEmailCommand(User, model);
+        await Mediator.Send(command);
     }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.WebApplication/Pages/Member/Edit.cshtml.cs b/service/src/InstructorIQ.WebApplication/Pages/Member/Edit.cshtml.cs
index 4e9bc216..11c1596b 100644
--- a/service/src/InstructorIQ.WebApplication/Pages/Member/Edit.cshtml.cs
+++ b/service/src/InstructorIQ.WebApplication/Pages/Member/Edit.cshtml.cs
@@ -1,8 +1,7 @@
-using System;
+using System;
 using System.Threading.Tasks;
+
 using InstructorIQ.Core.Domain.Commands;
-using MediatR.CommandQuery.Commands;
-using MediatR.CommandQuery.Queries;
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Domain.Queries;
 using InstructorIQ.Core.Extensions;
@@ -10,142 +9,145 @@
 using InstructorIQ.Core.Multitenancy;
 using InstructorIQ.Core.Security;
 using InstructorIQ.WebApplication.Models;
+
 using MediatR;
+using MediatR.CommandQuery.Commands;
+using MediatR.CommandQuery.Queries;
+
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 
-namespace InstructorIQ.WebApplication.Pages.Member
+namespace InstructorIQ.WebApplication.Pages.Member;
+
+[Authorize(Policy = UserPolicies.AdministratorPolicy)]
+public class EditModel : EntityIdentifierModelBase<MemberUpdateModel>
 {
-    [Authorize(Policy = UserPolicies.AdministratorPolicy)]
-    public class EditModel : EntityIdentifierModelBase<MemberUpdateModel>
+    private readonly UserManager<Core.Data.Entities.User> _userManager;
+
+    public EditModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory, UserManager<Core.Data.Entities.User> userManager)
+        : base(tenant, mediator, loggerFactory)
     {
-        private readonly UserManager<Core.Data.Entities.User> _userManager;
+        _userManager = userManager;
+    }
 
-        public EditModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory, UserManager<Core.Data.Entities.User> userManager)
-            : base(tenant, mediator, loggerFactory)
-        {
-            _userManager = userManager;
-        }
+    [BindProperty]
+    public TenantMembershipModel Membership { get; set; }
 
-        [BindProperty]
-        public TenantMembershipModel Membership { get; set; }
+    [BindProperty]
+    public bool IsMemberDisabled { get; set; }
 
-        [BindProperty]
-        public bool IsMemberDisabled { get; set; }
 
+    public override async Task<IActionResult> OnGetAsync()
+    {
+        await base.OnGetAsync();
 
-        public override async Task<IActionResult> OnGetAsync()
-        {
-            await base.OnGetAsync();
+        IsMemberDisabled = Entity.LockoutEnd.HasValue;
 
-            IsMemberDisabled = Entity.LockoutEnd.HasValue;
+        Membership = await LoadMembership();
 
-            Membership = await LoadMembership();
+        return Page();
+    }
 
-            return Page();
-        }
 
+    public async Task<IActionResult> OnPostAsync()
+    {
+        if (!ModelState.IsValid)
+            return Page();
 
-        public async Task<IActionResult> OnPostAsync()
-        {
-            if (!ModelState.IsValid)
-                return Page();
-
-            var readCommand = new EntityIdentifierQuery<Guid, MemberUpdateModel>(User, Id);
-            var updateModel = await Mediator.Send(readCommand);
-            if (updateModel == null)
-                return NotFound();
-
-            // only update input fields
-            await TryUpdateModelAsync(
-                updateModel,
-                nameof(Entity),
-                p => p.DisplayName,
-                p => p.SortName,
-                p => p.FamilyName,
-                p => p.GivenName,
-                p => p.JobTitle,
-                p => p.Email,
-                p => p.PhoneNumber
-            );
-
-            // compute sort name
-            if (updateModel.SortName.IsNullOrWhiteSpace())
-                updateModel.SortName = ToSortName(updateModel);
-
-            if (IsMemberDisabled && updateModel.LockoutEnd == null)
-                updateModel.LockoutEnd = DateTimeOffset.Now.AddYears(100);
-            else if (!IsMemberDisabled && updateModel.LockoutEnd.HasValue)
-                updateModel.LockoutEnd = null;
-
-            var updateCommand = new EntityUpdateCommand<Guid, MemberUpdateModel, MemberReadModel>(User, Id, updateModel);
-            var updateResult = await Mediator.Send(updateCommand);
-
-            // make sure correct user and tenant
-            Membership.UserId = updateResult.Id;
-            Membership.TenantId = Tenant.Value.Id;
-
-            var membershipCommand = new TenantMembershipCommand(User, Membership);
-            var membershipResult = await Mediator.Send(membershipCommand);
-
-            ShowAlert("Successfully saved member");
-
-            return RedirectToPage("/Member/Edit", new { id = Id, tenant = TenantRoute });
-        }
-
-        public async Task<IActionResult> OnPostDeleteEntity()
-        {
-            var command = new EntityDeleteCommand<Guid, LocationReadModel>(User, Id);
-            var result = await Mediator.Send(command);
+        var readCommand = new EntityIdentifierQuery<Guid, MemberUpdateModel>(User, Id);
+        var updateModel = await Mediator.Send(readCommand);
+        if (updateModel == null)
+            return NotFound();
+
+        // only update input fields
+        await TryUpdateModelAsync(
+            updateModel,
+            nameof(Entity),
+            p => p.DisplayName,
+            p => p.SortName,
+            p => p.FamilyName,
+            p => p.GivenName,
+            p => p.JobTitle,
+            p => p.Email,
+            p => p.PhoneNumber
+        );
+
+        // compute sort name
+        if (updateModel.SortName.IsNullOrWhiteSpace())
+            updateModel.SortName = ToSortName(updateModel);
+
+        if (IsMemberDisabled && updateModel.LockoutEnd == null)
+            updateModel.LockoutEnd = DateTimeOffset.Now.AddYears(100);
+        else if (!IsMemberDisabled && updateModel.LockoutEnd.HasValue)
+            updateModel.LockoutEnd = null;
+
+        var updateCommand = new EntityUpdateCommand<Guid, MemberUpdateModel, MemberReadModel>(User, Id, updateModel);
+        var updateResult = await Mediator.Send(updateCommand);
+
+        // make sure correct user and tenant
+        Membership.UserId = updateResult.Id;
+        Membership.TenantId = Tenant.Value.Id;
+
+        var membershipCommand = new TenantMembershipCommand(User, Membership);
+        var membershipResult = await Mediator.Send(membershipCommand);
+
+        ShowAlert("Successfully saved member");
+
+        return RedirectToPage("/Member/Edit", new { id = Id, tenant = TenantRoute });
+    }
 
-            ShowAlert("Successfully deleted member");
+    public async Task<IActionResult> OnPostDeleteEntity()
+    {
+        var command = new EntityDeleteCommand<Guid, LocationReadModel>(User, Id);
+        var result = await Mediator.Send(command);
 
-            return RedirectToPage("/Member/Index", new { tenant = TenantRoute });
+        ShowAlert("Successfully deleted member");
 
-        }
+        return RedirectToPage("/Member/Index", new { tenant = TenantRoute });
 
-        public async Task<IActionResult> OnPostSendInvite()
-        {
-            var userId = Id.ToString();
-            var user = await _userManager.FindByIdAsync(userId);
+    }
 
-            var model = new UserInviteModel
-            {
-                User = user,
-                ReturnUrl = Url.Content("~/"),
-            };
-            Request.ReadUserAgent(model);
+    public async Task<IActionResult> OnPostSendInvite()
+    {
+        var userId = Id.ToString();
+        var user = await _userManager.FindByIdAsync(userId);
 
-            var command = new SendUserInviteEmailCommand(User, model);
-            await Mediator.Send(command);
+        var model = new UserInviteModel
+        {
+            User = user,
+            ReturnUrl = Url.Content("~/"),
+        };
+        Request.ReadUserAgent(model);
 
-            ShowAlert("Successfully sent member invite email");
+        var command = new SendUserInviteEmailCommand(User, model);
+        await Mediator.Send(command);
 
-            return RedirectToPage("/Member/Index", new { tenant = TenantRoute });
+        ShowAlert("Successfully sent member invite email");
 
-        }
+        return RedirectToPage("/Member/Index", new { tenant = TenantRoute });
 
-        private async Task<TenantMembershipModel> LoadMembership()
-        {
-            if (!Tenant.HasValue)
-                return new TenantMembershipModel();
+    }
 
-            var command = new TenantMembershipQuery(User, Tenant.Value.Id, Id);
-            return await Mediator.Send(command);
-        }
+    private async Task<TenantMembershipModel> LoadMembership()
+    {
+        if (!Tenant.HasValue)
+            return new TenantMembershipModel();
 
-        private string ToSortName(MemberUpdateModel user)
-        {
-            if (user.FamilyName.HasValue() && user.GivenName.HasValue())
-                return $"{user.FamilyName}, {user.GivenName}";
+        var command = new TenantMembershipQuery(User, Tenant.Value.Id, Id);
+        return await Mediator.Send(command);
+    }
 
-            if (user.FamilyName.HasValue())
-                return user.FamilyName;
+    private string ToSortName(MemberUpdateModel user)
+    {
+        if (user.FamilyName.HasValue() && user.GivenName.HasValue())
+            return $"{user.FamilyName}, {user.GivenName}";
 
-            return user.DisplayName;
-        }
+        if (user.FamilyName.HasValue())
+            return user.FamilyName;
 
+        return user.DisplayName;
     }
-}
\ No newline at end of file
+
+}
diff --git a/service/src/InstructorIQ.WebApplication/Pages/Member/Export.cshtml.cs b/service/src/InstructorIQ.WebApplication/Pages/Member/Export.cshtml.cs
index 852c58c8..2f09ea6d 100644
--- a/service/src/InstructorIQ.WebApplication/Pages/Member/Export.cshtml.cs
+++ b/service/src/InstructorIQ.WebApplication/Pages/Member/Export.cshtml.cs
@@ -1,41 +1,45 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+
 using AutoMapper;
 using AutoMapper.QueryableExtensions;
+
 using CsvHelper;
+
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Domain.Queries;
 using InstructorIQ.Core.Multitenancy;
 using InstructorIQ.WebApplication.Models;
+
 using MediatR;
+
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 
-namespace InstructorIQ.WebApplication.Pages.Member
+namespace InstructorIQ.WebApplication.Pages.Member;
+
+public class ExportModel : ExportModelBase
 {
-    public class ExportModel : ExportModelBase
+    private readonly IMapper _mapper;
+
+    public ExportModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory, IMapper mapper)
+        : base(tenant, mediator, loggerFactory)
+    {
+        _mapper = mapper;
+    }
+
+    public async Task<IActionResult> OnGetAsync()
     {
-        private readonly IMapper _mapper;
-
-        public ExportModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory, IMapper mapper)
-            : base(tenant, mediator, loggerFactory)
-        {
-            _mapper = mapper;
-        }
-
-        public async Task<IActionResult> OnGetAsync()
-        {
-            var command = new MemberSelectQuery(User, Tenant.Value.Id);
-            var members = await Mediator.Send(command);
-            var exported = _mapper.Map<List<MemberImportModel>>(members);
-
-            var fileName = $"Members-{DateTime.Now:yyyy-MM-dd-HH-mm-ss}.csv";
-            
-            return Export(exported, fileName);
-        }
+        var command = new MemberSelectQuery(User, Tenant.Value.Id);
+        var members = await Mediator.Send(command);
+        var exported = _mapper.Map<List<MemberImportModel>>(members);
+
+        var fileName = $"Members-{DateTime.Now:yyyy-MM-dd-HH-mm-ss}.csv";
+
+        return Export(exported, fileName);
     }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.WebApplication/Pages/Member/Import/Index.cshtml.cs b/service/src/InstructorIQ.WebApplication/Pages/Member/Import/Index.cshtml.cs
index a23a70c0..8f41d433 100644
--- a/service/src/InstructorIQ.WebApplication/Pages/Member/Import/Index.cshtml.cs
+++ b/service/src/InstructorIQ.WebApplication/Pages/Member/Import/Index.cshtml.cs
@@ -1,37 +1,39 @@
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 using System.Threading.Tasks;
+
 using InstructorIQ.Core.Domain.Commands;
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Multitenancy;
 using InstructorIQ.WebApplication.Models;
+
 using MediatR;
+
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 
-namespace InstructorIQ.WebApplication.Pages.Member.Import
+namespace InstructorIQ.WebApplication.Pages.Member.Import;
+
+public class IndexModel : MediatorModelBase
 {
-    public class IndexModel : MediatorModelBase
+    public IndexModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
+        : base(tenant, mediator, loggerFactory)
     {
-        public IndexModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
-            : base(tenant, mediator, loggerFactory)
-        {
 
-        }
+    }
 
-        [Required]
-        [BindProperty]
-        public IFormFile Upload { get; set; }
+    [Required]
+    [BindProperty]
+    public IFormFile Upload { get; set; }
 
-        public async Task<IActionResult> OnPostAsync()
-        {
-            if (!ModelState.IsValid)
-                return Page();
+    public async Task<IActionResult> OnPostAsync()
+    {
+        if (!ModelState.IsValid)
+            return Page();
 
-            var importCommand = new MemberImportUploadCommand(User, Upload, Tenant.Value.Id);
-            var importJobModel = await Mediator.Send(importCommand);
+        var importCommand = new MemberImportUploadCommand(User, Upload, Tenant.Value.Id);
+        var importJobModel = await Mediator.Send(importCommand);
 
-            return RedirectToPage("/Member/Import/Mapping", new { id = importJobModel.Id, tenant = TenantRoute });
-        }
+        return RedirectToPage("/Member/Import/Mapping", new { id = importJobModel.Id, tenant = TenantRoute });
     }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.WebApplication/Pages/Member/Import/Mapping.cshtml.cs b/service/src/InstructorIQ.WebApplication/Pages/Member/Import/Mapping.cshtml.cs
index d7684446..15414516 100644
--- a/service/src/InstructorIQ.WebApplication/Pages/Member/Import/Mapping.cshtml.cs
+++ b/service/src/InstructorIQ.WebApplication/Pages/Member/Import/Mapping.cshtml.cs
@@ -1,60 +1,62 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+
 using InstructorIQ.Core.Domain.Commands;
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Domain.Queries;
 using InstructorIQ.Core.Multitenancy;
 using InstructorIQ.WebApplication.Models;
+
 using MediatR;
+
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Rendering;
 using Microsoft.Extensions.Logging;
 
-namespace InstructorIQ.WebApplication.Pages.Member.Import
+namespace InstructorIQ.WebApplication.Pages.Member.Import;
+
+public class MappingModel : MediatorModelBase
 {
-    public class MappingModel : MediatorModelBase
+    public MappingModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
+        : base(tenant, mediator, loggerFactory)
     {
-        public MappingModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
-            : base(tenant, mediator, loggerFactory)
-        {
-        }
+    }
 
-        [BindProperty(SupportsGet = true)]
-        public Guid Id { get; set; }
+    [BindProperty(SupportsGet = true)]
+    public Guid Id { get; set; }
 
-        [BindProperty]
-        public MemberImportJobModel Import { get; set; }
+    [BindProperty]
+    public MemberImportJobModel Import { get; set; }
 
-        public List<SelectListItem> Headers { get; set; }
+    public List<SelectListItem> Headers { get; set; }
 
-        public async Task<IActionResult> OnGetAsync()
-        {
-            var importQuery = new MemberImportJobQuery(User, Id);
-            var importJobModel = await Mediator.Send(importQuery);
-            if (importJobModel == null)
-                return NotFound();
+    public async Task<IActionResult> OnGetAsync()
+    {
+        var importQuery = new MemberImportJobQuery(User, Id);
+        var importJobModel = await Mediator.Send(importQuery);
+        if (importJobModel == null)
+            return NotFound();
 
-            Import = importJobModel;
+        Import = importJobModel;
 
-            Headers = importJobModel.Headers
-                .Select(h => new SelectListItem(h, h))
-                .ToList();
+        Headers = importJobModel.Headers
+            .Select(h => new SelectListItem(h, h))
+            .ToList();
 
-            return Page();
-        }
+        return Page();
+    }
 
-        public async Task<IActionResult> OnPostAsync()
-        {
-            if (!ModelState.IsValid)
-                return Page();
+    public async Task<IActionResult> OnPostAsync()
+    {
+        if (!ModelState.IsValid)
+            return Page();
 
-            var importCommand = new MemberImportProcessCommand(User, Import);
-            var importJobModel = await Mediator.Send(importCommand);
-            
-            return RedirectToPage("/Member/Index", new { tenant = TenantRoute });
-        }
+        var importCommand = new MemberImportProcessCommand(User, Import);
+        var importJobModel = await Mediator.Send(importCommand);
 
+        return RedirectToPage("/Member/Index", new { tenant = TenantRoute });
     }
-}
\ No newline at end of file
+
+}
diff --git a/service/src/InstructorIQ.WebApplication/Pages/Member/Index.cshtml.cs b/service/src/InstructorIQ.WebApplication/Pages/Member/Index.cshtml.cs
index 9542bdd3..c091751e 100644
--- a/service/src/InstructorIQ.WebApplication/Pages/Member/Index.cshtml.cs
+++ b/service/src/InstructorIQ.WebApplication/Pages/Member/Index.cshtml.cs
@@ -1,92 +1,94 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Threading.Tasks;
+
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Domain.Queries;
 using InstructorIQ.Core.Multitenancy;
 using InstructorIQ.Core.Security;
 using InstructorIQ.WebApplication.Models;
+
 using MediatR;
 using MediatR.CommandQuery.Queries;
+
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 
-namespace InstructorIQ.WebApplication.Pages.Member
+namespace InstructorIQ.WebApplication.Pages.Member;
+
+[Authorize(Policy = UserPolicies.AdministratorPolicy)]
+public class IndexModel : MediatorModelBase
 {
-    [Authorize(Policy = UserPolicies.AdministratorPolicy)]
-    public class IndexModel : MediatorModelBase
+    public IndexModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
+        : base(tenant, mediator, loggerFactory)
     {
-        public IndexModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
-            : base(tenant, mediator, loggerFactory)
-        {
-            Sort = "DisplayName";
-        }
+        Sort = "DisplayName";
+    }
 
-        [BindProperty(Name = "p", SupportsGet = true)]
-        public int PageNumber { get; set; } = 1;
+    [BindProperty(Name = "p", SupportsGet = true)]
+    public int PageNumber { get; set; } = 1;
 
-        [BindProperty(Name = "z", SupportsGet = true)]
-        public int PageSize { get; set; } = 20;
+    [BindProperty(Name = "z", SupportsGet = true)]
+    public int PageSize { get; set; } = 20;
 
-        [BindProperty(Name = "s", SupportsGet = true)]
-        public string Sort { get; set; }
+    [BindProperty(Name = "s", SupportsGet = true)]
+    public string Sort { get; set; }
 
-        [BindProperty(Name = "q", SupportsGet = true)]
-        public string Query { get; set; }
+    [BindProperty(Name = "q", SupportsGet = true)]
+    public string Query { get; set; }
 
-        public long Total { get; set; }
+    public long Total { get; set; }
 
-        public IReadOnlyCollection<MemberReadModel> Items { get; set; }
+    public IReadOnlyCollection<MemberReadModel> Items { get; set; }
 
 
-        public async Task<IActionResult> OnGetAsync()
-        {
-            var query = CreateQuery();
-            var command = new MemberPagedQuery(User, query, Tenant.Value.Id);
+    public async Task<IActionResult> OnGetAsync()
+    {
+        var query = CreateQuery();
+        var command = new MemberPagedQuery(User, query, Tenant.Value.Id);
 
-            var result = await Mediator.Send(command);
-            Total = result.Total;
-            Items = result.Data;
+        var result = await Mediator.Send(command);
+        Total = result.Total;
+        Items = result.Data;
 
-            return Page();
-        }
+        return Page();
+    }
 
 
-        protected EntityQuery CreateQuery()
-        {
-            var query = new EntityQuery(null, PageNumber, PageSize, Sort);
+    protected EntityQuery CreateQuery()
+    {
+        var query = new EntityQuery(null, PageNumber, PageSize, Sort);
 
-            if (string.IsNullOrWhiteSpace(Query))
-                return query;
+        if (string.IsNullOrWhiteSpace(Query))
+            return query;
 
-            query.Filter = CreateFilter();
+        query.Filter = CreateFilter();
 
-            return query;
-        }
+        return query;
+    }
 
-        protected EntityFilter CreateFilter()
+    protected EntityFilter CreateFilter()
+    {
+        var filter = new EntityFilter
         {
-            var filter = new EntityFilter
+            Logic = EntityFilterLogic.Or,
+            Filters = new List<EntityFilter>
             {
-                Logic = EntityFilterLogic.Or,
-                Filters = new List<EntityFilter>
+                new EntityFilter
+                {
+                    Name = "DisplayName",
+                    Value = Query,
+                    Operator = EntityFilterOperators.Contains
+                },
+                new EntityFilter
                 {
-                    new EntityFilter
-                    {
-                        Name = "DisplayName",
-                        Value = Query,
-                        Operator = EntityFilterOperators.Contains
-                    },
-                    new EntityFilter
-                    {
-                        Name = "Email",
-                        Value = Query,
-                        Operator = EntityFilterOperators.Contains
-                    }
+                    Name = "Email",
+                    Value = Query,
+                    Operator = EntityFilterOperators.Contains
                 }
-            };
+            }
+        };
 
-            return filter;
-        }
+        return filter;
     }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.WebApplication/Pages/Report/Summary/Email.cshtml.cs b/service/src/InstructorIQ.WebApplication/Pages/Report/Summary/Email.cshtml.cs
index 81e35f14..4a4a3ee1 100644
--- a/service/src/InstructorIQ.WebApplication/Pages/Report/Summary/Email.cshtml.cs
+++ b/service/src/InstructorIQ.WebApplication/Pages/Report/Summary/Email.cshtml.cs
@@ -1,92 +1,95 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net.Mail;
 using System.Threading.Tasks;
+
 using EntityChange.Extensions;
+
 using InstructorIQ.Core.Domain.Commands;
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Domain.Queries;
 using InstructorIQ.Core.Models;
 using InstructorIQ.Core.Multitenancy;
 using InstructorIQ.Core.Security;
+
 using MediatR;
+
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 
-namespace InstructorIQ.WebApplication.Pages.Report.Summary
+namespace InstructorIQ.WebApplication.Pages.Report.Summary;
+
+[Authorize(Policy = UserPolicies.AdministratorPolicy)]
+public class EmailModel : SummaryModel
 {
-    [Authorize(Policy = UserPolicies.AdministratorPolicy)]
-    public class EmailModel : SummaryModel
+    private readonly UserClaimManager _userClaimManager;
+
+    public EmailModel(
+        ITenant<TenantReadModel> tenant,
+        IMediator mediator,
+        ILoggerFactory loggerFactory,
+        UserClaimManager userClaimManager)
+        : base(tenant, mediator, loggerFactory)
     {
-        private readonly UserClaimManager _userClaimManager;
+        _userClaimManager = userClaimManager;
+        Date = DateTime.Now;
+    }
 
-        public EmailModel(
-            ITenant<TenantReadModel> tenant,
-            IMediator mediator,
-            ILoggerFactory loggerFactory,
-            UserClaimManager userClaimManager)
-            : base(tenant, mediator, loggerFactory)
-        {
-            _userClaimManager = userClaimManager;
-            Date = DateTime.Now;
-        }
+    [BindProperty]
+    public SummaryReportModel Message { get; set; }
 
-        [BindProperty]
-        public SummaryReportModel Message { get; set; }
+    public IReadOnlyCollection<MemberDropdownModel> Members { get; set; }
 
-        public IReadOnlyCollection<MemberDropdownModel> Members { get; set; }
+    public async Task<IActionResult> OnGetAsync()
+    {
+        if (Tenant == null || !Tenant.HasValue)
+            return RedirectToPage("/Index");
 
-        public async Task<IActionResult> OnGetAsync()
-        {
-            if (Tenant == null || !Tenant.HasValue)
-                return RedirectToPage("/Index");
+        var address = _userClaimManager.GetEmail(User) ?? User.Identity.Name;
+        var name = _userClaimManager.GetDisplayName(User);
 
-            var address = _userClaimManager.GetEmail(User) ?? User.Identity.Name;
-            var name = _userClaimManager.GetDisplayName(User);
+        Message = new SummaryReportModel();
+        Message.ReplyToAddress = address;
+        Message.ReplyToName = name;
 
-            Message = new SummaryReportModel();
-            Message.ReplyToAddress = address;
-            Message.ReplyToName = name;
+        await Load();
+        await LoadMembers();
 
-            await Load();
-            await LoadMembers();
+        return Page();
+    }
 
+    public async Task<IActionResult> OnPostAsync()
+    {
+        if (!ModelState.IsValid)
             return Page();
-        }
 
-        public async Task<IActionResult> OnPostAsync()
-        {
-            if (!ModelState.IsValid)
-                return Page();
+        var email = Message;
 
-            var email = Message;
+        var command = new SendSummaryEmailCommand(User, email);
+        await Mediator.Send(command);
 
-            var command = new SendSummaryEmailCommand(User, email);
-            await Mediator.Send(command);
+        ShowAlert("Successfully sent email");
 
-            ShowAlert("Successfully sent email");
-
-            return RedirectToPage("/report/summary/index", new { date = Date.ToString("yyyy-MM-dd"), tenant = TenantRoute });
-        }
+        return RedirectToPage("/report/summary/index", new { date = Date.ToString("yyyy-MM-dd"), tenant = TenantRoute });
+    }
 
-        protected virtual async Task LoadMembers()
-        {
-            var command = new MemberDropdownQuery(User, Tenant.Value.Id);
-            command.RoleId = Core.Data.Constants.Role.Member;
+    protected virtual async Task LoadMembers()
+    {
+        var command = new MemberDropdownQuery(User, Tenant.Value.Id);
+        command.RoleId = Core.Data.Constants.Role.Member;
 
-            var members = await Mediator.Send(command);
+        var members = await Mediator.Send(command);
 
-            Members = members.ToList();
-        }
+        Members = members.ToList();
+    }
 
-        private string FormatName(MemberReadModel member)
-        {
-            var name = member.SortName ?? member.DisplayName;
-            var email = member.Email;
+    private string FormatName(MemberReadModel member)
+    {
+        var name = member.SortName ?? member.DisplayName;
+        var email = member.Email;
 
-            return $"{name} <{email}>";
-        }
+        return $"{name} <{email}>";
     }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.WebApplication/Pages/Report/Summary/Index.cshtml.cs b/service/src/InstructorIQ.WebApplication/Pages/Report/Summary/Index.cshtml.cs
index b2300a3b..bc0d55f9 100644
--- a/service/src/InstructorIQ.WebApplication/Pages/Report/Summary/Index.cshtml.cs
+++ b/service/src/InstructorIQ.WebApplication/Pages/Report/Summary/Index.cshtml.cs
@@ -1,29 +1,31 @@
-using System;
+using System;
 using System.Threading.Tasks;
+
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Multitenancy;
+
 using MediatR;
+
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 
-namespace InstructorIQ.WebApplication.Pages.Report.Summary
+namespace InstructorIQ.WebApplication.Pages.Report.Summary;
+
+public class IndexModel : SummaryModel
 {
-    public class IndexModel : SummaryModel
+    public IndexModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
+        : base(tenant, mediator, loggerFactory)
     {
-        public IndexModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
-            : base(tenant, mediator, loggerFactory)
-        {
-            Date = DateTime.Now;
-        }
+        Date = DateTime.Now;
+    }
 
-        public virtual async Task<IActionResult> OnGetAsync()
-        {
-            if (Tenant == null || !Tenant.HasValue)
-                return RedirectToPage("/Index");
+    public virtual async Task<IActionResult> OnGetAsync()
+    {
+        if (Tenant == null || !Tenant.HasValue)
+            return RedirectToPage("/Index");
 
-            await Load();
+        await Load();
 
-            return Page();
-        }
+        return Page();
     }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.WebApplication/Pages/Report/Summary/SummaryModel.cs b/service/src/InstructorIQ.WebApplication/Pages/Report/Summary/SummaryModel.cs
index 6c5cecae..94de063c 100644
--- a/service/src/InstructorIQ.WebApplication/Pages/Report/Summary/SummaryModel.cs
+++ b/service/src/InstructorIQ.WebApplication/Pages/Report/Summary/SummaryModel.cs
@@ -1,70 +1,73 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 using System.Threading.Tasks;
+
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Domain.Queries;
 using InstructorIQ.Core.Multitenancy;
 using InstructorIQ.WebApplication.Models;
+
 using MediatR;
+
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
+
 using NaturalSort.Extension;
 
-namespace InstructorIQ.WebApplication.Pages.Report.Summary
+namespace InstructorIQ.WebApplication.Pages.Report.Summary;
+
+public abstract class SummaryModel : MediatorModelBase
 {
-    public abstract class SummaryModel : MediatorModelBase
+    protected SummaryModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
+        : base(tenant, mediator, loggerFactory)
     {
-        protected SummaryModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
-            : base(tenant, mediator, loggerFactory)
-        {
-            Date = DateTime.Now;
-        }
+        Date = DateTime.Now;
+    }
 
-        [BindProperty(Name = "date", SupportsGet = true)]
-        public DateTime Date { get; set; }
+    [BindProperty(Name = "date", SupportsGet = true)]
+    public DateTime Date { get; set; }
 
-        public string MonthName => CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(Date.Month);
+    public string MonthName => CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(Date.Month);
 
 
-        public DateTime NextMonth => Date.AddMonths(1);
+    public DateTime NextMonth => Date.AddMonths(1);
 
-        public string NextMonthName => CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(NextMonth.Month);
+    public string NextMonthName => CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(NextMonth.Month);
 
 
-        public DateTime NextYear => Date.AddMonths(12);
+    public DateTime NextYear => Date.AddMonths(12);
 
 
-        public bool ShowNextMonth()
-        {
-            var first = new DateTime(NextMonth.Year, NextMonth.Month, 1);
-            var diff = first.Subtract(Date);
-            return diff.TotalDays < 15;
-        }
+    public bool ShowNextMonth()
+    {
+        var first = new DateTime(NextMonth.Year, NextMonth.Month, 1);
+        var diff = first.Subtract(Date);
+        return diff.TotalDays < 15;
+    }
 
-        public bool ShowNextYear()
-        {
-            var first = new DateTime(NextYear.Year, 1, 1);
-            var diff = first.Subtract(Date);
-            return diff.TotalDays < 45;
-        }
+    public bool ShowNextYear()
+    {
+        var first = new DateTime(NextYear.Year, 1, 1);
+        var diff = first.Subtract(Date);
+        return diff.TotalDays < 45;
+    }
 
-        public IReadOnlyCollection<SessionCalendarModel> Items { get; set; }
+    public IReadOnlyCollection<SessionCalendarModel> Items { get; set; }
 
-        protected async Task Load()
-        {
-            var startDate = Date;
-            var endDate = startDate.AddDays(1);
+    protected async Task Load()
+    {
+        var startDate = Date;
+        var endDate = startDate.AddDays(1);
 
-            var command = new SessionCalendarQuery(User, Tenant.Value.Id, startDate, endDate);
-            var result = await Mediator.Send(command);
+        var command = new SessionCalendarQuery(User, Tenant.Value.Id, startDate, endDate);
+        var result = await Mediator.Send(command);
 
-            Items = result
-                .OrderBy(i => i.StartTime)
-                .ThenBy(i => i.GroupName, StringComparer.OrdinalIgnoreCase.WithNaturalSort())
-                .ThenBy(i => i.TopicTitle)
-                .ToList();
-        }
+        Items = result
+            .OrderBy(i => i.StartTime)
+            .ThenBy(i => i.GroupName, StringComparer.OrdinalIgnoreCase.WithNaturalSort())
+            .ThenBy(i => i.TopicTitle)
+            .ToList();
     }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.WebApplication/Pages/Session/Multiple.cshtml.cs b/service/src/InstructorIQ.WebApplication/Pages/Session/Multiple.cshtml.cs
index 3012f974..fcecaf44 100644
--- a/service/src/InstructorIQ.WebApplication/Pages/Session/Multiple.cshtml.cs
+++ b/service/src/InstructorIQ.WebApplication/Pages/Session/Multiple.cshtml.cs
@@ -1,7 +1,8 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+
 using InstructorIQ.Core.Domain.Commands;
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Domain.Queries;
@@ -9,169 +10,170 @@
 using InstructorIQ.Core.Multitenancy;
 using InstructorIQ.Core.Security;
 using InstructorIQ.WebApplication.Models;
+
 using MediatR;
 using MediatR.CommandQuery.Queries;
+
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 
-namespace InstructorIQ.WebApplication.Pages.Session
+namespace InstructorIQ.WebApplication.Pages.Session;
+
+[Authorize(Policy = UserPolicies.AdministratorPolicy)]
+public class MultipleModel : MediatorModelBase
 {
-    [Authorize(Policy = UserPolicies.AdministratorPolicy)]
-    public class MultipleModel : MediatorModelBase
+    public MultipleModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
+        : base(tenant, mediator, loggerFactory)
     {
-        public MultipleModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
-            : base(tenant, mediator, loggerFactory)
-        {
-        }
+    }
 
-        [BindProperty(SupportsGet = true)]
-        public List<Guid> TopicIds { get; set; }
+    [BindProperty(SupportsGet = true)]
+    public List<Guid> TopicIds { get; set; }
 
-        [BindProperty]
-        public List<SessionMultipleUpdateModel> Sessions { get; set; }
+    [BindProperty]
+    public List<SessionMultipleUpdateModel> Sessions { get; set; }
 
-        public IReadOnlyCollection<TopicReadModel> Topics { get; set; }
+    public IReadOnlyCollection<TopicReadModel> Topics { get; set; }
 
-        public IReadOnlyCollection<MemberDropdownModel> Instructors { get; set; }
+    public IReadOnlyCollection<MemberDropdownModel> Instructors { get; set; }
 
-        public IReadOnlyCollection<LocationDropdownModel> Locations { get; set; }
+    public IReadOnlyCollection<LocationDropdownModel> Locations { get; set; }
 
-        public IReadOnlyCollection<GroupDropdownModel> Groups { get; set; }
+    public IReadOnlyCollection<GroupDropdownModel> Groups { get; set; }
 
-        public IReadOnlyCollection<SessionFrequentTimeModel> Times { get; private set; }
+    public IReadOnlyCollection<SessionFrequentTimeModel> Times { get; private set; }
 
-        public async Task<IActionResult> OnGetAsync()
-        {
-            var loadTask = LoadData();
-            var sessionsTask = LoadSessions();
-
-            // load all in parallel
-            await Task.WhenAll(
-                sessionsTask,
-                loadTask
-            );
-
-            var title = Topics.Select(t => t.Title).ToDelimitedString("; ");
-
-            // shared layout title
-            ViewData["TopicTitle"] = $" - {title}";
-
-            // convert to multiple update
-            Sessions = sessionsTask.Result
-                .OrderBy(s => s.TopicTitle)
-                .ThenBy(t => t.TopicId)
-                .ThenBy(s => s.StartDate)
-                .ThenBy(s => s.StartTime)
-                .Select(i => new SessionMultipleUpdateModel
-                {
-                    Id = i.Id,
-                    StartDate = i.StartDate,
-                    StartTime = i.StartTime,
-                    EndDate = i.EndDate,
-                    EndTime = i.EndTime,
-                    GroupId = i.GroupId,
-                    LeadInstructorId = i.LeadInstructorId,
-                    LocationId = i.LocationId,
-                    Note = i.Note,
-                    TopicId = i.TopicId,
-                    TopicTitle = i.TopicTitle,
-                    TenantId = i.TenantId,
-
-                    AdditionalInstructors = i.AdditionalInstructors.Select(s => s.InstructorId).ToList()
-                })
-
-                .ToList();
+    public async Task<IActionResult> OnGetAsync()
+    {
+        var loadTask = LoadData();
+        var sessionsTask = LoadSessions();
+
+        // load all in parallel
+        await Task.WhenAll(
+            sessionsTask,
+            loadTask
+        );
+
+        var title = Topics.Select(t => t.Title).ToDelimitedString("; ");
+
+        // shared layout title
+        ViewData["TopicTitle"] = $" - {title}";
+
+        // convert to multiple update
+        Sessions = sessionsTask.Result
+            .OrderBy(s => s.TopicTitle)
+            .ThenBy(t => t.TopicId)
+            .ThenBy(s => s.StartDate)
+            .ThenBy(s => s.StartTime)
+            .Select(i => new SessionMultipleUpdateModel
+            {
+                Id = i.Id,
+                StartDate = i.StartDate,
+                StartTime = i.StartTime,
+                EndDate = i.EndDate,
+                EndTime = i.EndTime,
+                GroupId = i.GroupId,
+                LeadInstructorId = i.LeadInstructorId,
+                LocationId = i.LocationId,
+                Note = i.Note,
+                TopicId = i.TopicId,
+                TopicTitle = i.TopicTitle,
+                TenantId = i.TenantId,
+
+                AdditionalInstructors = i.AdditionalInstructors.Select(s => s.InstructorId).ToList()
+            })
+
+            .ToList();
+
+        return Page();
+    }
 
+    public async Task<IActionResult> OnPostAsync()
+    {
+        if (!ModelState.IsValid)
+        {
+            await LoadData();
             return Page();
         }
 
-        public async Task<IActionResult> OnPostAsync()
-        {
-            if (!ModelState.IsValid)
-            {
-                await LoadData();
-                return Page();
-            }
-
-            var updateCommand = new SessionMultipleUpdateCommand(User, Sessions);
-            var result = await Mediator.Send(updateCommand);
+        var updateCommand = new SessionMultipleUpdateCommand(User, Sessions);
+        var result = await Mediator.Send(updateCommand);
 
-            ShowAlert("Successfully saved topic sessions");
+        ShowAlert("Successfully saved topic sessions");
 
-            return RedirectToPage("/Topic/Index", new { tenant = TenantRoute });
-        }
+        return RedirectToPage("/Topic/Index", new { tenant = TenantRoute });
+    }
 
-        private async Task LoadData()
-        {
-            var topicTask = LoadTopics();
-            var instructorTask = LoadInstructors();
-            var locationTask = LoadLocations();
-            var groupTask = LoadGroups();
-            var timesTask = LoadTimes();
-
-            // load all in parallel
-            await Task.WhenAll(
-                topicTask,
-                instructorTask,
-                locationTask,
-                groupTask,
-                timesTask
-            );
-
-            Topics = topicTask.Result;
-            Instructors = instructorTask.Result;
-            Locations = locationTask.Result;
-            Groups = groupTask.Result;
-            Times = timesTask.Result;
-        }
+    private async Task LoadData()
+    {
+        var topicTask = LoadTopics();
+        var instructorTask = LoadInstructors();
+        var locationTask = LoadLocations();
+        var groupTask = LoadGroups();
+        var timesTask = LoadTimes();
+
+        // load all in parallel
+        await Task.WhenAll(
+            topicTask,
+            instructorTask,
+            locationTask,
+            groupTask,
+            timesTask
+        );
+
+        Topics = topicTask.Result;
+        Instructors = instructorTask.Result;
+        Locations = locationTask.Result;
+        Groups = groupTask.Result;
+        Times = timesTask.Result;
+    }
 
-        private async Task<IReadOnlyCollection<TopicReadModel>> LoadTopics()
-        {
-            var command = new EntityIdentifiersQuery<Guid, TopicReadModel>(User, TopicIds);
-            var result = await Mediator.Send(command);
+    private async Task<IReadOnlyCollection<TopicReadModel>> LoadTopics()
+    {
+        var command = new EntityIdentifiersQuery<Guid, TopicReadModel>(User, TopicIds);
+        var result = await Mediator.Send(command);
 
-            return result;
-        }
+        return result;
+    }
 
-        private async Task<IReadOnlyCollection<SessionCalendarModel>> LoadSessions()
-        {
-            var query = new SessionTopicQuery(User, TopicIds);
-            var items = await Mediator.Send(query);
+    private async Task<IReadOnlyCollection<SessionCalendarModel>> LoadSessions()
+    {
+        var query = new SessionTopicQuery(User, TopicIds);
+        var items = await Mediator.Send(query);
 
-            return items;
-        }
+        return items;
+    }
 
-        private async Task<IReadOnlyCollection<MemberDropdownModel>> LoadInstructors()
-        {
-            var dropdownQuery = new MemberDropdownQuery(User, Tenant.Value.Id) { RoleId = Core.Data.Constants.Role.Instructor };
-            var items = await Mediator.Send(dropdownQuery);
+    private async Task<IReadOnlyCollection<MemberDropdownModel>> LoadInstructors()
+    {
+        var dropdownQuery = new MemberDropdownQuery(User, Tenant.Value.Id) { RoleId = Core.Data.Constants.Role.Instructor };
+        var items = await Mediator.Send(dropdownQuery);
 
-            return items;
-        }
+        return items;
+    }
 
-        private async Task<IReadOnlyCollection<LocationDropdownModel>> LoadLocations()
-        {
-            var dropdownQuery = new LocationDropdownQuery(User);
-            var items = await Mediator.Send(dropdownQuery);
+    private async Task<IReadOnlyCollection<LocationDropdownModel>> LoadLocations()
+    {
+        var dropdownQuery = new LocationDropdownQuery(User);
+        var items = await Mediator.Send(dropdownQuery);
 
-            return items;
-        }
+        return items;
+    }
 
-        private async Task<IReadOnlyCollection<GroupDropdownModel>> LoadGroups()
-        {
-            var dropdownQuery = new GroupDropdownQuery(User);
-            var items = await Mediator.Send(dropdownQuery);
+    private async Task<IReadOnlyCollection<GroupDropdownModel>> LoadGroups()
+    {
+        var dropdownQuery = new GroupDropdownQuery(User);
+        var items = await Mediator.Send(dropdownQuery);
 
-            return items;
-        }
+        return items;
+    }
 
-        private async Task<IReadOnlyCollection<SessionFrequentTimeModel>> LoadTimes()
-        {
-            var query = new SessionFrequentTimeQuery(User, Tenant.Value.Id);
-            var items = await Mediator.Send(query);
+    private async Task<IReadOnlyCollection<SessionFrequentTimeModel>> LoadTimes()
+    {
+        var query = new SessionFrequentTimeQuery(User, Tenant.Value.Id);
+        var items = await Mediator.Send(query);
 
-            return items;
-        }
+        return items;
     }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.WebApplication/Pages/Session/Sequence.cshtml.cs b/service/src/InstructorIQ.WebApplication/Pages/Session/Sequence.cshtml.cs
index 2ca35174..00e17122 100644
--- a/service/src/InstructorIQ.WebApplication/Pages/Session/Sequence.cshtml.cs
+++ b/service/src/InstructorIQ.WebApplication/Pages/Session/Sequence.cshtml.cs
@@ -1,8 +1,8 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using MediatR.CommandQuery.Queries;
+
 using InstructorIQ.Core.Domain.Commands;
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Domain.Queries;
@@ -10,79 +10,81 @@
 using InstructorIQ.Core.Multitenancy;
 using InstructorIQ.Core.Security;
 using InstructorIQ.WebApplication.Models;
+
 using MediatR;
+using MediatR.CommandQuery.Queries;
+
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 
-namespace InstructorIQ.WebApplication.Pages.Session
+namespace InstructorIQ.WebApplication.Pages.Session;
+
+[Authorize(Policy = UserPolicies.AdministratorPolicy)]
+public class SequenceModel : MediatorModelBase
 {
-    [Authorize(Policy = UserPolicies.AdministratorPolicy)]
-    public class SequenceModel : MediatorModelBase
+    public SequenceModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
+        : base(tenant, mediator, loggerFactory)
     {
-        public SequenceModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
-            : base(tenant, mediator, loggerFactory)
-        {
-            Selected = new List<int>();
-            TopicIds = new List<Guid>();
-        }
+        Selected = new List<int>();
+        TopicIds = new List<Guid>();
+    }
+
+    [BindProperty(SupportsGet = true)]
+    public List<Guid> TopicIds { get; set; }
 
-        [BindProperty(SupportsGet = true)]
-        public List<Guid> TopicIds { get; set; }
+    [BindProperty] public List<int> Selected { get; set; }
 
-        [BindProperty] public List<int> Selected { get; set; }
+    public IReadOnlyCollection<TopicReadModel> Topics { get; set; }
 
-        public IReadOnlyCollection<TopicReadModel> Topics { get; set; }
+    public IReadOnlyCollection<GroupSequenceModel> Sequences { get; set; }
 
-        public IReadOnlyCollection<GroupSequenceModel> Sequences { get; set; }
+    public async Task<IActionResult> OnGetAsync()
+    {
+        var topicsTask = LoadTopics();
+        var groupsTask = LoadGroups();
 
-        public async Task<IActionResult> OnGetAsync()
-        {
-            var topicsTask = LoadTopics();
-            var groupsTask = LoadGroups();
+        // load all in parallel
+        await Task.WhenAll(
+            topicsTask,
+            groupsTask
+        );
 
-            // load all in parallel
-            await Task.WhenAll(
-                topicsTask,
-                groupsTask
-            );
+        Topics = topicsTask.Result;
+        Sequences = groupsTask.Result;
 
-            Topics = topicsTask.Result;
-            Sequences = groupsTask.Result;
+        var title = Topics.Select(t => t.Title).ToDelimitedString("; ");
 
-            var title = Topics.Select(t => t.Title).ToDelimitedString("; ");
+        // shared layout title
+        ViewData["TopicTitle"] = $" - {title}";
 
-            // shared layout title
-            ViewData["TopicTitle"] = $" - {title}";
+        return Page();
+    }
 
+    public async Task<IActionResult> OnPostAsync()
+    {
+        if (Selected.Count == 0)
             return Page();
-        }
-
-        public async Task<IActionResult> OnPostAsync()
-        {
-            if (Selected.Count == 0)
-                return Page();
 
-            var command = new SessionSequenceCreateCommand(User, TopicIds, Selected);
-            var result = await Mediator.Send(command);
+        var command = new SessionSequenceCreateCommand(User, TopicIds, Selected);
+        var result = await Mediator.Send(command);
 
-            return RedirectToPage("/Session/Multiple", new { TopicIds, tenant = TenantRoute });
-        }
+        return RedirectToPage("/Session/Multiple", new { TopicIds, tenant = TenantRoute });
+    }
 
-        private async Task<IReadOnlyCollection<TopicReadModel>> LoadTopics()
-        {
-            var command = new EntityIdentifiersQuery<Guid, TopicReadModel>(User, TopicIds);
-            var result = await Mediator.Send(command);
+    private async Task<IReadOnlyCollection<TopicReadModel>> LoadTopics()
+    {
+        var command = new EntityIdentifiersQuery<Guid, TopicReadModel>(User, TopicIds);
+        var result = await Mediator.Send(command);
 
-            return result;
-        }
+        return result;
+    }
 
-        private async Task<IReadOnlyCollection<GroupSequenceModel>> LoadGroups()
-        {
-            var dropdownQuery = new GroupSequenceQuery(User);
-            var items = await Mediator.Send(dropdownQuery);
+    private async Task<IReadOnlyCollection<GroupSequenceModel>> LoadGroups()
+    {
+        var dropdownQuery = new GroupSequenceQuery(User);
+        var items = await Mediator.Send(dropdownQuery);
 
-            return items;
-        }
+        return items;
     }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.WebApplication/Pages/SignUp/Create.cshtml.cs b/service/src/InstructorIQ.WebApplication/Pages/SignUp/Create.cshtml.cs
index 704d2d07..17f235b8 100644
--- a/service/src/InstructorIQ.WebApplication/Pages/SignUp/Create.cshtml.cs
+++ b/service/src/InstructorIQ.WebApplication/Pages/SignUp/Create.cshtml.cs
@@ -1,47 +1,49 @@
-using System.Threading.Tasks;
+using System.Threading.Tasks;
+
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Multitenancy;
 using InstructorIQ.Core.Security;
 using InstructorIQ.WebApplication.Models;
+
 using MediatR;
 using MediatR.CommandQuery.Commands;
+
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 
-namespace InstructorIQ.WebApplication.Pages.SignUp
+namespace InstructorIQ.WebApplication.Pages.SignUp;
+
+[Authorize(Policy = UserPolicies.AdministratorPolicy)]
+public class CreateModel : EntityCreateModelBase<SignUpCreateModel>
 {
-    [Authorize(Policy = UserPolicies.AdministratorPolicy)]
-    public class CreateModel : EntityCreateModelBase<SignUpCreateModel>
+    public CreateModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
+        : base(tenant, mediator, loggerFactory)
     {
-        public CreateModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
-            : base(tenant, mediator, loggerFactory)
-        {
 
-        }
-
-        public async Task<IActionResult> OnPostAsync()
-        {
-            if (!ModelState.IsValid)
-                return Page();
+    }
 
-            var createModel = new SignUpCreateModel();
+    public async Task<IActionResult> OnPostAsync()
+    {
+        if (!ModelState.IsValid)
+            return Page();
 
-            // only update input fields
-            await TryUpdateModelAsync(
-                createModel,
-                nameof(Entity),
-                p => p.Name,
-                p => p.Description
-            );
+        var createModel = new SignUpCreateModel();
 
-            var command = new EntityCreateCommand<SignUpCreateModel, SignUpReadModel>(User, createModel);
-            var result = await Mediator.Send(command);
+        // only update input fields
+        await TryUpdateModelAsync(
+            createModel,
+            nameof(Entity),
+            p => p.Name,
+            p => p.Description
+        );
 
-            ShowAlert("Successfully created instructor signup");
+        var command = new EntityCreateCommand<SignUpCreateModel, SignUpReadModel>(User, createModel);
+        var result = await Mediator.Send(command);
 
-            return RedirectToPage("/SignUp/Edit", new { id = result.Id, tenant = TenantRoute });
-        }
+        ShowAlert("Successfully created instructor signup");
 
+        return RedirectToPage("/SignUp/Edit", new { id = result.Id, tenant = TenantRoute });
     }
-}
\ No newline at end of file
+
+}
diff --git a/service/src/InstructorIQ.WebApplication/Pages/SignUp/Edit.cshtml.cs b/service/src/InstructorIQ.WebApplication/Pages/SignUp/Edit.cshtml.cs
index 1889718d..ebe52f8a 100644
--- a/service/src/InstructorIQ.WebApplication/Pages/SignUp/Edit.cshtml.cs
+++ b/service/src/InstructorIQ.WebApplication/Pages/SignUp/Edit.cshtml.cs
@@ -1,119 +1,121 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+
 using InstructorIQ.Core.Domain.Commands;
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Multitenancy;
 using InstructorIQ.Core.Security;
 using InstructorIQ.WebApplication.Models;
+
 using MediatR;
 using MediatR.CommandQuery.Commands;
 using MediatR.CommandQuery.Queries;
+
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 
-namespace InstructorIQ.WebApplication.Pages.SignUp
+namespace InstructorIQ.WebApplication.Pages.SignUp;
+
+[Authorize(Policy = UserPolicies.AdministratorPolicy)]
+public class EditModel : EntityIdentifierModelBase<SignUpUpdateModel>
 {
-    [Authorize(Policy = UserPolicies.AdministratorPolicy)]
-    public class EditModel : EntityIdentifierModelBase<SignUpUpdateModel>
+    public EditModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
+        : base(tenant, mediator, loggerFactory)
     {
-        public EditModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
-            : base(tenant, mediator, loggerFactory)
-        {
-        }
+    }
 
-        [BindProperty]
-        public List<SignUpTopicUpdateModel> SignUpTopics { get; set; }
+    [BindProperty]
+    public List<SignUpTopicUpdateModel> SignUpTopics { get; set; }
 
-        public IReadOnlyCollection<TopicReadModel> Topics { get; set; }
+    public IReadOnlyCollection<TopicReadModel> Topics { get; set; }
 
-        public override async Task<IActionResult> OnGetAsync()
-        {
-            await base.OnGetAsync();
+    public override async Task<IActionResult> OnGetAsync()
+    {
+        await base.OnGetAsync();
 
-            Topics = await LoadTopics();
-            SignUpTopics = await LoadSignUpTopics();
+        Topics = await LoadTopics();
+        SignUpTopics = await LoadSignUpTopics();
 
-            return Page();
-        }
+        return Page();
+    }
 
-        public async Task<IActionResult> OnPostAsync()
+    public async Task<IActionResult> OnPostAsync()
+    {
+        if (!ModelState.IsValid)
         {
-            if (!ModelState.IsValid)
-            {
-                Topics = await LoadTopics();
-                return Page();
-            }
-
-            var readCommand = new EntityIdentifierQuery<Guid, SignUpUpdateModel>(User, Id);
-            var updateModel = await Mediator.Send(readCommand);
-            if (updateModel == null)
-                return NotFound();
-
-            // only update input fields
-            await TryUpdateModelAsync(
-                updateModel,
-                nameof(Entity),
-                p => p.Name,
-                p => p.Description
-            );
-
-            var updateCommand = new SignUpCommand(User, Id, updateModel, SignUpTopics);
-            var result = await Mediator.Send(updateCommand);
-
-            ShowAlert("Successfully saved instructor signup");
-
-            return RedirectToPage("/signup/View", new { id = Id, tenant = TenantRoute });
+            Topics = await LoadTopics();
+            return Page();
         }
 
-        public async Task<IActionResult> OnPostDeleteEntity()
-        {
-            var command = new EntityDeleteCommand<Guid, SignUpReadModel>(User, Id);
-            var result = await Mediator.Send(command);
+        var readCommand = new EntityIdentifierQuery<Guid, SignUpUpdateModel>(User, Id);
+        var updateModel = await Mediator.Send(readCommand);
+        if (updateModel == null)
+            return NotFound();
 
-            ShowAlert("Successfully deleted instructor signup");
+        // only update input fields
+        await TryUpdateModelAsync(
+            updateModel,
+            nameof(Entity),
+            p => p.Name,
+            p => p.Description
+        );
 
-            return RedirectToPage("/signup/Index", new { tenant = TenantRoute });
-        }
+        var updateCommand = new SignUpCommand(User, Id, updateModel, SignUpTopics);
+        var result = await Mediator.Send(updateCommand);
+
+        ShowAlert("Successfully saved instructor signup");
+
+        return RedirectToPage("/signup/View", new { id = Id, tenant = TenantRoute });
+    }
+
+    public async Task<IActionResult> OnPostDeleteEntity()
+    {
+        var command = new EntityDeleteCommand<Guid, SignUpReadModel>(User, Id);
+        var result = await Mediator.Send(command);
+
+        ShowAlert("Successfully deleted instructor signup");
 
-        private async Task<IReadOnlyCollection<TopicReadModel>> LoadTopics()
+        return RedirectToPage("/signup/Index", new { tenant = TenantRoute });
+    }
+
+    private async Task<IReadOnlyCollection<TopicReadModel>> LoadTopics()
+    {
+        var filter = new EntityFilter
         {
-            var filter = new EntityFilter
-            {
-                Name = nameof(TopicReadModel.CalendarYear),
-                Value = DateTime.Now.Year,
-                Operator = EntityFilterOperators.GreaterThanOrEqual
-            };
-            var select = new EntitySelect(filter);
-            var command = new EntitySelectQuery<TopicReadModel>(User, select);
-            var result = await Mediator.Send(command);
-
-            return result
-                .OrderBy(p => p.CalendarYear)
-                .ThenBy(p => p.TargetMonth)
-                .ThenBy(p => p.Title)
-                .ToList();
-        }
+            Name = nameof(TopicReadModel.CalendarYear),
+            Value = DateTime.Now.Year,
+            Operator = EntityFilterOperators.GreaterThanOrEqual
+        };
+        var select = new EntitySelect(filter);
+        var command = new EntitySelectQuery<TopicReadModel>(User, select);
+        var result = await Mediator.Send(command);
+
+        return result
+            .OrderBy(p => p.CalendarYear)
+            .ThenBy(p => p.TargetMonth)
+            .ThenBy(p => p.Title)
+            .ToList();
+    }
 
-        private async Task<List<SignUpTopicUpdateModel>> LoadSignUpTopics()
+    private async Task<List<SignUpTopicUpdateModel>> LoadSignUpTopics()
+    {
+        var filter = new EntityFilter
         {
-            var filter = new EntityFilter
-            {
-                Name = nameof(SignUpTopicUpdateModel.SignUpId),
-                Value = Id,
-                Operator = EntityFilterOperators.Equal
-            };
-            var select = new EntitySelect(filter);
-            var command = new EntitySelectQuery<SignUpTopicUpdateModel>(User, select);
-            var result = await Mediator.Send(command);
-
-            return result
-                .OrderBy(p => p.TopicCalendarYear)
-                .ThenBy(p => p.TopicTargetMonth)
-                .ThenBy(p => p.TopicTitle)
-                .ToList();
-        }
+            Name = nameof(SignUpTopicUpdateModel.SignUpId),
+            Value = Id,
+            Operator = EntityFilterOperators.Equal
+        };
+        var select = new EntitySelect(filter);
+        var command = new EntitySelectQuery<SignUpTopicUpdateModel>(User, select);
+        var result = await Mediator.Send(command);
+
+        return result
+            .OrderBy(p => p.TopicCalendarYear)
+            .ThenBy(p => p.TopicTargetMonth)
+            .ThenBy(p => p.TopicTitle)
+            .ToList();
     }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.WebApplication/Pages/SignUp/Index.cshtml.cs b/service/src/InstructorIQ.WebApplication/Pages/SignUp/Index.cshtml.cs
index 8c0f968a..c967a638 100644
--- a/service/src/InstructorIQ.WebApplication/Pages/SignUp/Index.cshtml.cs
+++ b/service/src/InstructorIQ.WebApplication/Pages/SignUp/Index.cshtml.cs
@@ -1,44 +1,45 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Multitenancy;
 using InstructorIQ.WebApplication.Models;
+
 using MediatR;
 using MediatR.CommandQuery.Queries;
+
 using Microsoft.Extensions.Logging;
 
-namespace InstructorIQ.WebApplication.Pages.SignUp
+namespace InstructorIQ.WebApplication.Pages.SignUp;
+
+public class IndexModel : EntityPagedModelBase<SignUpReadModel>
 {
-    public class IndexModel : EntityPagedModelBase<SignUpReadModel>
+    public IndexModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
+        : base(tenant, mediator, loggerFactory)
     {
-        public IndexModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
-            : base(tenant, mediator, loggerFactory)
-        {
-        }
+    }
 
-        protected override EntityFilter CreateFilter()
+    protected override EntityFilter CreateFilter()
+    {
+        var filter = new EntityFilter
         {
-            var filter = new EntityFilter
+            Logic = EntityFilterLogic.Or,
+            Filters = new List<EntityFilter>
             {
-                Logic = EntityFilterLogic.Or,
-                Filters = new List<EntityFilter>
+                new EntityFilter
+                {
+                    Name = nameof(SignUpReadModel.Name),
+                    Value = Query,
+                    Operator = EntityFilterOperators.Contains
+                },
+                new EntityFilter
                 {
-                    new EntityFilter
-                    {
-                        Name = nameof(SignUpReadModel.Name),
-                        Value = Query,
-                        Operator = EntityFilterOperators.Contains
-                    },
-                    new EntityFilter
-                    {
-                        Name = nameof(SignUpReadModel.Description),
-                        Value = Query,
-                        Operator = EntityFilterOperators.Contains
-                    }
+                    Name = nameof(SignUpReadModel.Description),
+                    Value = Query,
+                    Operator = EntityFilterOperators.Contains
                 }
-            };
+            }
+        };
 
-            return filter;
-        }
+        return filter;
     }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.WebApplication/Pages/SignUp/View.cshtml.cs b/service/src/InstructorIQ.WebApplication/Pages/SignUp/View.cshtml.cs
index 81f98234..bca3bca8 100644
--- a/service/src/InstructorIQ.WebApplication/Pages/SignUp/View.cshtml.cs
+++ b/service/src/InstructorIQ.WebApplication/Pages/SignUp/View.cshtml.cs
@@ -1,93 +1,95 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+
 using InstructorIQ.Core.Domain.Commands;
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Multitenancy;
 using InstructorIQ.Core.Security;
 using InstructorIQ.WebApplication.Models;
+
 using MediatR;
 using MediatR.CommandQuery.Commands;
 using MediatR.CommandQuery.Queries;
+
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 
 
-namespace InstructorIQ.WebApplication.Pages.SignUp
+namespace InstructorIQ.WebApplication.Pages.SignUp;
+
+[Authorize(Policy = UserPolicies.UserPolicy)]
+public class ViewModel : EntityIdentifierModelBase<SignUpUpdateModel>
 {
-    [Authorize(Policy = UserPolicies.UserPolicy)]
-    public class ViewModel : EntityIdentifierModelBase<SignUpUpdateModel>
+    private readonly UserManager<Core.Data.Entities.User> _userManager;
+
+    public ViewModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory, UserManager<Core.Data.Entities.User> userManager)
+        : base(tenant, mediator, loggerFactory)
     {
-        private readonly UserManager<Core.Data.Entities.User> _userManager;
+        _userManager = userManager;
+    }
 
-        public ViewModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory, UserManager<Core.Data.Entities.User> userManager)
-            : base(tenant, mediator, loggerFactory)
-        {
-            _userManager = userManager;
-        }
+    [BindProperty]
+    public List<Guid> Selected { get; set; }
 
-        [BindProperty]
-        public List<Guid> Selected { get; set; }
+    public List<SignUpTopicReadModel> SignUpTopics { get; set; }
 
-        public List<SignUpTopicReadModel> SignUpTopics { get; set; }
+    public override async Task<IActionResult> OnGetAsync()
+    {
+        await base.OnGetAsync();
 
-        public override async Task<IActionResult> OnGetAsync()
-        {
-            await base.OnGetAsync();
+        SignUpTopics = await LoadSignUpTopics();
 
-            SignUpTopics = await LoadSignUpTopics();
+        return Page();
+    }
 
+    public async Task<IActionResult> OnPostAsync()
+    {
+        if (!ModelState.IsValid || Selected.Count == 0)
+        {
+            SignUpTopics = await LoadSignUpTopics();
             return Page();
         }
 
-        public async Task<IActionResult> OnPostAsync()
-        {
-            if (!ModelState.IsValid || Selected.Count == 0)
-            {
-                SignUpTopics = await LoadSignUpTopics();
-                return Page();
-            }
-
-            var user = await _userManager.GetUserAsync(User);
-            var command = new TopicInstructorSignUpCommand(User, user.Id, Selected);
-            var result = await Mediator.Send(command);
+        var user = await _userManager.GetUserAsync(User);
+        var command = new TopicInstructorSignUpCommand(User, user.Id, Selected);
+        var result = await Mediator.Send(command);
 
-            ShowAlert("Successfully saved instructor signups");
+        ShowAlert("Successfully saved instructor signups");
 
-            return RedirectToPage("/signup/View", new { id = Id, tenant = TenantRoute });
-        }
+        return RedirectToPage("/signup/View", new { id = Id, tenant = TenantRoute });
+    }
 
-        public async Task<IActionResult> OnPostDeleteInstructorSignUp(Guid topicInstructorId)
-        {
-            var command = new EntityDeleteCommand<Guid, TopicInstructorReadModel>(User, topicInstructorId);
-            var result = await Mediator.Send(command);
+    public async Task<IActionResult> OnPostDeleteInstructorSignUp(Guid topicInstructorId)
+    {
+        var command = new EntityDeleteCommand<Guid, TopicInstructorReadModel>(User, topicInstructorId);
+        var result = await Mediator.Send(command);
 
-            ShowAlert("Successfully deleted instructor signup");
+        ShowAlert("Successfully deleted instructor signup");
 
-            return RedirectToPage("/signup/View", new { id = Id, tenant = TenantRoute });
-        }
+        return RedirectToPage("/signup/View", new { id = Id, tenant = TenantRoute });
+    }
 
-        private async Task<List<SignUpTopicReadModel>> LoadSignUpTopics()
+    private async Task<List<SignUpTopicReadModel>> LoadSignUpTopics()
+    {
+        var filter = new EntityFilter
         {
-            var filter = new EntityFilter
-            {
-                Name = nameof(SignUpTopicReadModel.SignUpId),
-                Value = Id,
-                Operator = EntityFilterOperators.Equal
-            };
-            var select = new EntitySelect(filter);
-            var command = new EntitySelectQuery<SignUpTopicReadModel>(User, select);
-            var result = await Mediator.Send(command);
-
-            return result
-                .OrderBy(p => p.TopicCalendarYear)
-                .ThenBy(p => p.TopicTargetMonth)
-                .ThenBy(p => p.TopicTitle)
-                .ToList();
-        }
-
+            Name = nameof(SignUpTopicReadModel.SignUpId),
+            Value = Id,
+            Operator = EntityFilterOperators.Equal
+        };
+        var select = new EntitySelect(filter);
+        var command = new EntitySelectQuery<SignUpTopicReadModel>(User, select);
+        var result = await Mediator.Send(command);
+
+        return result
+            .OrderBy(p => p.TopicCalendarYear)
+            .ThenBy(p => p.TopicTargetMonth)
+            .ThenBy(p => p.TopicTitle)
+            .ToList();
     }
-}
\ No newline at end of file
+
+}
diff --git a/service/src/InstructorIQ.WebApplication/Pages/Template/Create.cshtml.cs b/service/src/InstructorIQ.WebApplication/Pages/Template/Create.cshtml.cs
index e0b4d6c2..5fa41afe 100644
--- a/service/src/InstructorIQ.WebApplication/Pages/Template/Create.cshtml.cs
+++ b/service/src/InstructorIQ.WebApplication/Pages/Template/Create.cshtml.cs
@@ -1,48 +1,50 @@
-using System.Threading.Tasks;
-using MediatR.CommandQuery.Commands;
+using System.Threading.Tasks;
+
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Multitenancy;
 using InstructorIQ.Core.Security;
 using InstructorIQ.WebApplication.Models;
+
 using MediatR;
+using MediatR.CommandQuery.Commands;
+
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 
-namespace InstructorIQ.WebApplication.Pages.Template
+namespace InstructorIQ.WebApplication.Pages.Template;
+
+[Authorize(Policy = UserPolicies.AdministratorPolicy)]
+public class CreateModel : EntityCreateModelBase<TemplateCreateModel>
 {
-    [Authorize(Policy = UserPolicies.AdministratorPolicy)]
-    public class CreateModel : EntityCreateModelBase<TemplateCreateModel>
+    public CreateModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
+        : base(tenant, mediator, loggerFactory)
     {
-        public CreateModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
-            : base(tenant, mediator, loggerFactory)
-        {
 
-        }
+    }
 
-        public async Task<IActionResult> OnPostAsync()
-        {
-            if (!ModelState.IsValid)
-                return Page();
+    public async Task<IActionResult> OnPostAsync()
+    {
+        if (!ModelState.IsValid)
+            return Page();
 
-            var createModel = new TemplateCreateModel();
+        var createModel = new TemplateCreateModel();
 
-            // only update input fields
-            await TryUpdateModelAsync(
-                createModel,
-                nameof(Entity),
-                p => p.Name,
-                p => p.Description,
-                p => p.TemplateBody,
-                p => p.TemplateType
-            );
+        // only update input fields
+        await TryUpdateModelAsync(
+            createModel,
+            nameof(Entity),
+            p => p.Name,
+            p => p.Description,
+            p => p.TemplateBody,
+            p => p.TemplateType
+        );
 
-            var command = new EntityCreateCommand<TemplateCreateModel, TemplateReadModel>(User, createModel);
-            var result = await Mediator.Send(command);
+        var command = new EntityCreateCommand<TemplateCreateModel, TemplateReadModel>(User, createModel);
+        var result = await Mediator.Send(command);
 
-            ShowAlert("Successfully created template");
+        ShowAlert("Successfully created template");
 
-            return RedirectToPage("/Template/Edit", new { id = result.Id, tenant = TenantRoute });
-        }
+        return RedirectToPage("/Template/Edit", new { id = result.Id, tenant = TenantRoute });
     }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.WebApplication/Pages/Template/Edit.cshtml.cs b/service/src/InstructorIQ.WebApplication/Pages/Template/Edit.cshtml.cs
index 52eb0014..4fe0b2f3 100644
--- a/service/src/InstructorIQ.WebApplication/Pages/Template/Edit.cshtml.cs
+++ b/service/src/InstructorIQ.WebApplication/Pages/Template/Edit.cshtml.cs
@@ -1,63 +1,65 @@
-using System;
+using System;
 using System.Threading.Tasks;
-using MediatR.CommandQuery.Commands;
-using MediatR.CommandQuery.Queries;
+
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Multitenancy;
 using InstructorIQ.Core.Security;
 using InstructorIQ.WebApplication.Models;
+
 using MediatR;
+using MediatR.CommandQuery.Commands;
+using MediatR.CommandQuery.Queries;
+
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 
-namespace InstructorIQ.WebApplication.Pages.Template
+namespace InstructorIQ.WebApplication.Pages.Template;
+
+[Authorize(Policy = UserPolicies.AdministratorPolicy)]
+public class EditModel : EntityIdentifierModelBase<TemplateUpdateModel>
 {
-    [Authorize(Policy = UserPolicies.AdministratorPolicy)]
-    public class EditModel : EntityIdentifierModelBase<TemplateUpdateModel>
+    public EditModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
+        : base(tenant, mediator, loggerFactory)
     {
-        public EditModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
-            : base(tenant, mediator, loggerFactory)
-        {
-        }
-
-        public async Task<IActionResult> OnPostAsync()
-        {
-            if (!ModelState.IsValid)
-                return Page();
+    }
 
-            var readCommand = new EntityIdentifierQuery<Guid, TemplateUpdateModel>(User, Id);
-            var updateModel = await Mediator.Send(readCommand);
-            if (updateModel == null)
-                return NotFound();
+    public async Task<IActionResult> OnPostAsync()
+    {
+        if (!ModelState.IsValid)
+            return Page();
 
-            // only update input fields
-            await TryUpdateModelAsync(
-                updateModel,
-                nameof(Entity),
-                p => p.Name,
-                p => p.Description,
-                p => p.TemplateBody,
-                p => p.TemplateType
-            );
+        var readCommand = new EntityIdentifierQuery<Guid, TemplateUpdateModel>(User, Id);
+        var updateModel = await Mediator.Send(readCommand);
+        if (updateModel == null)
+            return NotFound();
 
-            var updateCommand = new EntityUpdateCommand<Guid, TemplateUpdateModel, TemplateReadModel>(User, Id, updateModel);
-            var result = await Mediator.Send(updateCommand);
+        // only update input fields
+        await TryUpdateModelAsync(
+            updateModel,
+            nameof(Entity),
+            p => p.Name,
+            p => p.Description,
+            p => p.TemplateBody,
+            p => p.TemplateType
+        );
 
-            ShowAlert("Successfully saved template");
+        var updateCommand = new EntityUpdateCommand<Guid, TemplateUpdateModel, TemplateReadModel>(User, Id, updateModel);
+        var result = await Mediator.Send(updateCommand);
 
-            return RedirectToPage("/Template/Edit", new { id = result.Id, tenant = TenantRoute });
-        }
+        ShowAlert("Successfully saved template");
 
-        public async Task<IActionResult> OnPostDeleteEntity()
-        {
-            var command = new EntityDeleteCommand<Guid, TemplateReadModel>(User, Id);
-            var result = await Mediator.Send(command);
+        return RedirectToPage("/Template/Edit", new { id = result.Id, tenant = TenantRoute });
+    }
 
-            ShowAlert("Successfully deleted template");
+    public async Task<IActionResult> OnPostDeleteEntity()
+    {
+        var command = new EntityDeleteCommand<Guid, TemplateReadModel>(User, Id);
+        var result = await Mediator.Send(command);
 
-            return RedirectToPage("/Template/Index", new { tenant = TenantRoute });
-        }
+        ShowAlert("Successfully deleted template");
 
+        return RedirectToPage("/Template/Index", new { tenant = TenantRoute });
     }
-}
\ No newline at end of file
+
+}
diff --git a/service/src/InstructorIQ.WebApplication/Pages/Template/Index.cshtml.cs b/service/src/InstructorIQ.WebApplication/Pages/Template/Index.cshtml.cs
index fc48bd0b..7a538182 100644
--- a/service/src/InstructorIQ.WebApplication/Pages/Template/Index.cshtml.cs
+++ b/service/src/InstructorIQ.WebApplication/Pages/Template/Index.cshtml.cs
@@ -1,44 +1,46 @@
-using MediatR.CommandQuery.Queries;
+using System.Collections.Generic;
+
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Multitenancy;
 using InstructorIQ.WebApplication.Models;
+
 using MediatR;
+using MediatR.CommandQuery.Queries;
+
 using Microsoft.Extensions.Logging;
-using System.Collections.Generic;
 
-namespace InstructorIQ.WebApplication.Pages.Template
+namespace InstructorIQ.WebApplication.Pages.Template;
+
+public class IndexModel : EntityPagedModelBase<TemplateReadModel>
 {
-    public class IndexModel : EntityPagedModelBase<TemplateReadModel>
+    public IndexModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
+        : base(tenant, mediator, loggerFactory)
     {
-        public IndexModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
-            : base(tenant, mediator, loggerFactory)
-        {
-            Sort = nameof(TenantReadModel.Name);
-        }
+        Sort = nameof(TenantReadModel.Name);
+    }
 
-        protected override EntityFilter CreateFilter()
+    protected override EntityFilter CreateFilter()
+    {
+        var filter = new EntityFilter
         {
-            var filter = new EntityFilter
+            Logic = EntityFilterLogic.Or,
+            Filters = new List<EntityFilter>
             {
-                Logic = EntityFilterLogic.Or,
-                Filters = new List<EntityFilter>
+                new EntityFilter
+                {
+                    Name = nameof(TemplateReadModel.Name),
+                    Value = Query,
+                    Operator = EntityFilterOperators.Contains
+                },
+                new EntityFilter
                 {
-                    new EntityFilter
-                    {
-                        Name = nameof(TemplateReadModel.Name),
-                        Value = Query,
-                        Operator = EntityFilterOperators.Contains
-                    },
-                    new EntityFilter
-                    {
-                        Name = nameof(TemplateReadModel.Description),
-                        Value = Query,
-                        Operator = EntityFilterOperators.Contains
-                    }
+                    Name = nameof(TemplateReadModel.Description),
+                    Value = Query,
+                    Operator = EntityFilterOperators.Contains
                 }
-            };
+            }
+        };
 
-            return filter;
-        }
+        return filter;
     }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.WebApplication/Pages/Topic/Create.cshtml.cs b/service/src/InstructorIQ.WebApplication/Pages/Topic/Create.cshtml.cs
index 5e28f604..12c96bc4 100644
--- a/service/src/InstructorIQ.WebApplication/Pages/Topic/Create.cshtml.cs
+++ b/service/src/InstructorIQ.WebApplication/Pages/Topic/Create.cshtml.cs
@@ -1,59 +1,61 @@
-using System.Threading.Tasks;
-using MediatR.CommandQuery.Commands;
+using System;
+using System.Threading.Tasks;
+
 using InstructorIQ.Core.Domain.Models;
+using InstructorIQ.Core.Extensions;
 using InstructorIQ.Core.Multitenancy;
 using InstructorIQ.Core.Security;
+using InstructorIQ.Core.Services;
 using InstructorIQ.WebApplication.Models;
+
 using MediatR;
+using MediatR.CommandQuery.Commands;
+
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
-using System;
-using InstructorIQ.Core.Extensions;
-using InstructorIQ.Core.Services;
 
-namespace InstructorIQ.WebApplication.Pages.Topic
+namespace InstructorIQ.WebApplication.Pages.Topic;
+
+[Authorize(Policy = UserPolicies.AdministratorPolicy)]
+public class CreateModel : EntityCreateModelBase<TopicCreateModel>
 {
-    [Authorize(Policy = UserPolicies.AdministratorPolicy)]
-    public class CreateModel : EntityCreateModelBase<TopicCreateModel>
+    private readonly IHtmlService _htmlService;
+
+    public CreateModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory, IHtmlService htmlService)
+        : base(tenant, mediator, loggerFactory)
+    {
+        _htmlService = htmlService;
+        Entity.CalendarYear = (short)DateTime.Now.Year;
+    }
+
+    public async Task<IActionResult> OnPostAsync()
     {
-        private readonly IHtmlService _htmlService;
-
-        public CreateModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory, IHtmlService htmlService)
-            : base(tenant, mediator, loggerFactory)
-        {
-            _htmlService = htmlService;
-            Entity.CalendarYear = (short)DateTime.Now.Year;
-        }
-
-        public async Task<IActionResult> OnPostAsync()
-        {
-            if (!ModelState.IsValid)
-                return Page();
-
-            var createModel = new TopicCreateModel();
-
-            // only update input fields
-            await TryUpdateModelAsync(
-                createModel,
-                nameof(Entity),
-                p => p.Title,
-                p => p.Description,
-                p => p.CalendarYear,
-                p => p.TargetMonth,
-                p => p.IsRequired
-            );
-
-            // update summary
-            if (createModel.Description.HasValue())
-                createModel.Summary = _htmlService.PlainText(createModel.Description).RemoveExtended().Truncate(256);
-
-            var command = new EntityCreateCommand<TopicCreateModel, TopicReadModel>(User, createModel);
-            var result = await Mediator.Send(command);
-
-            ShowAlert("Successfully created topic");
-
-            return RedirectToPage("/Topic/Edit", new { id = result.Id, tenant = TenantRoute });
-        }
+        if (!ModelState.IsValid)
+            return Page();
+
+        var createModel = new TopicCreateModel();
+
+        // only update input fields
+        await TryUpdateModelAsync(
+            createModel,
+            nameof(Entity),
+            p => p.Title,
+            p => p.Description,
+            p => p.CalendarYear,
+            p => p.TargetMonth,
+            p => p.IsRequired
+        );
+
+        // update summary
+        if (createModel.Description.HasValue())
+            createModel.Summary = _htmlService.PlainText(createModel.Description).RemoveExtended().Truncate(256);
+
+        var command = new EntityCreateCommand<TopicCreateModel, TopicReadModel>(User, createModel);
+        var result = await Mediator.Send(command);
+
+        ShowAlert("Successfully created topic");
+
+        return RedirectToPage("/Topic/Edit", new { id = result.Id, tenant = TenantRoute });
     }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.WebApplication/Pages/Topic/Discussion/Edit.cshtml.cs b/service/src/InstructorIQ.WebApplication/Pages/Topic/Discussion/Edit.cshtml.cs
index 3e56fe98..47ae55c3 100644
--- a/service/src/InstructorIQ.WebApplication/Pages/Topic/Discussion/Edit.cshtml.cs
+++ b/service/src/InstructorIQ.WebApplication/Pages/Topic/Discussion/Edit.cshtml.cs
@@ -1,93 +1,95 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+
 using InstructorIQ.Core.Domain.Commands;
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Multitenancy;
 using InstructorIQ.Core.Security;
 using InstructorIQ.WebApplication.Models;
+
 using MediatR;
 using MediatR.CommandQuery.Commands;
 using MediatR.CommandQuery.Queries;
+
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 using Microsoft.Extensions.Logging;
 
-namespace InstructorIQ.WebApplication.Pages.Topic.Discussion
+namespace InstructorIQ.WebApplication.Pages.Topic.Discussion;
+
+[Authorize(Policy = UserPolicies.InstructorPolicy)]
+public class EditModel : EntityIdentifierModelBase<DiscussionUpdateModel>
 {
-    [Authorize(Policy = UserPolicies.InstructorPolicy)]
-    public class EditModel : EntityIdentifierModelBase<DiscussionUpdateModel>
+    public EditModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
+        : base(tenant, mediator, loggerFactory)
     {
-        public EditModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
-            : base(tenant, mediator, loggerFactory)
-        {
-        }
-
-        [BindProperty(SupportsGet = true)]
-        public Guid TopicId { get; set; }
+    }
 
-        public TopicReadModel Topic { get; set; }
+    [BindProperty(SupportsGet = true)]
+    public Guid TopicId { get; set; }
 
-        public override async Task<IActionResult> OnGetAsync()
-        {
-            var loadTask = base.OnGetAsync();
-            var loadTopicTask = LoadTopic();
+    public TopicReadModel Topic { get; set; }
 
-            // load all in parallel
-            await Task.WhenAll(
-                loadTopicTask,
-                loadTask
-            );
+    public override async Task<IActionResult> OnGetAsync()
+    {
+        var loadTask = base.OnGetAsync();
+        var loadTopicTask = LoadTopic();
 
-            Topic = loadTopicTask.Result;
+        // load all in parallel
+        await Task.WhenAll(
+            loadTopicTask,
+            loadTask
+        );
 
-            return Page();
-        }
+        Topic = loadTopicTask.Result;
 
-        public async Task<IActionResult> OnPostAsync()
-        {
-            if (!ModelState.IsValid)
-                return Page();
+        return Page();
+    }
 
-            var readCommand = new EntityIdentifierQuery<Guid, DiscussionUpdateModel>(User, Id);
-            var updateModel = await Mediator.Send(readCommand);
-            if (updateModel == null)
-                return NotFound();
+    public async Task<IActionResult> OnPostAsync()
+    {
+        if (!ModelState.IsValid)
+            return Page();
 
-            // only update input fields
-            await TryUpdateModelAsync(
-                updateModel,
-                nameof(Entity),
-                p => p.Message
-            );
+        var readCommand = new EntityIdentifierQuery<Guid, DiscussionUpdateModel>(User, Id);
+        var updateModel = await Mediator.Send(readCommand);
+        if (updateModel == null)
+            return NotFound();
 
-            var updateCommand = new EntityUpdateCommand<Guid, DiscussionUpdateModel, DiscussionReadModel>(User, Id, updateModel);
-            var result = await Mediator.Send(updateCommand);
+        // only update input fields
+        await TryUpdateModelAsync(
+            updateModel,
+            nameof(Entity),
+            p => p.Message
+        );
 
-            ShowAlert("Successfully saved topic discussion message");
+        var updateCommand = new EntityUpdateCommand<Guid, DiscussionUpdateModel, DiscussionReadModel>(User, Id, updateModel);
+        var result = await Mediator.Send(updateCommand);
 
-            return RedirectToPage("/Topic/Discussion/View", new { Id = TopicId, tenant = TenantRoute });
-        }
+        ShowAlert("Successfully saved topic discussion message");
 
-        public async Task<IActionResult> OnPostDeleteEntity()
-        {
-            var command = new EntityDeleteCommand<Guid, DiscussionReadModel>(User, Id);
-            var result = await Mediator.Send(command);
+        return RedirectToPage("/Topic/Discussion/View", new { Id = TopicId, tenant = TenantRoute });
+    }
 
-            ShowAlert("Successfully deleted discussion message");
+    public async Task<IActionResult> OnPostDeleteEntity()
+    {
+        var command = new EntityDeleteCommand<Guid, DiscussionReadModel>(User, Id);
+        var result = await Mediator.Send(command);
 
-            return RedirectToPage("/Topic/Discussion/View", new { Id = TopicId, tenant = TenantRoute });
-        }
+        ShowAlert("Successfully deleted discussion message");
 
-        private async Task<TopicReadModel> LoadTopic()
-        {
-            var command = new EntityIdentifierQuery<Guid, TopicReadModel>(User, TopicId);
-            var result = await Mediator.Send(command);
+        return RedirectToPage("/Topic/Discussion/View", new { Id = TopicId, tenant = TenantRoute });
+    }
 
-            return result;
-        }
+    private async Task<TopicReadModel> LoadTopic()
+    {
+        var command = new EntityIdentifierQuery<Guid, TopicReadModel>(User, TopicId);
+        var result = await Mediator.Send(command);
 
+        return result;
     }
-}
\ No newline at end of file
+
+}
diff --git a/service/src/InstructorIQ.WebApplication/Pages/Topic/Discussion/View.cshtml.cs b/service/src/InstructorIQ.WebApplication/Pages/Topic/Discussion/View.cshtml.cs
index 7e430a77..3e6ba22f 100644
--- a/service/src/InstructorIQ.WebApplication/Pages/Topic/Discussion/View.cshtml.cs
+++ b/service/src/InstructorIQ.WebApplication/Pages/Topic/Discussion/View.cshtml.cs
@@ -1,106 +1,109 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+
 using AutoMapper;
+
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Domain.Queries;
 using InstructorIQ.Core.Extensions;
 using InstructorIQ.Core.Multitenancy;
 using InstructorIQ.Core.Security;
 using InstructorIQ.WebApplication.Models;
+
 using MediatR;
 using MediatR.CommandQuery.Commands;
 using MediatR.CommandQuery.Queries;
+
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 
-namespace InstructorIQ.WebApplication.Pages.Topic.Discussion
+namespace InstructorIQ.WebApplication.Pages.Topic.Discussion;
+
+public class ViewModel : MediatorModelBase
 {
-    public class ViewModel : MediatorModelBase
+    private readonly UserClaimManager _userClaimManager;
+    private readonly IMapper _mapper;
+
+    public ViewModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory, UserClaimManager userClaimManager, IMapper mapper)
+        : base(tenant, mediator, loggerFactory)
     {
-        private readonly UserClaimManager _userClaimManager;
-        private readonly IMapper _mapper;
+        _userClaimManager = userClaimManager;
+        _mapper = mapper;
+    }
 
-        public ViewModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory, UserClaimManager userClaimManager, IMapper mapper)
-            : base(tenant, mediator, loggerFactory)
-        {
-            _userClaimManager = userClaimManager;
-            _mapper = mapper;
-        }
+    [BindProperty(SupportsGet = true)]
+    public Guid Id { get; set; }
 
-        [BindProperty(SupportsGet = true)]
-        public Guid Id { get; set; }
-        
-        [BindProperty]
-        public string Message { get; set; }
+    [BindProperty]
+    public string Message { get; set; }
 
-        public string DisplayName => _userClaimManager.GetDisplayName(User) ?? User.Identity?.Name;
+    public string DisplayName => _userClaimManager.GetDisplayName(User) ?? User.Identity?.Name;
 
-        public TopicReadModel Topic { get; set; }
+    public TopicReadModel Topic { get; set; }
 
-        public IReadOnlyCollection<DiscussionReadModel> Items { get; set; }
+    public IReadOnlyCollection<DiscussionReadModel> Items { get; set; }
 
-        public async Task<IActionResult> OnGetAsync()
-        {
-            var loadTopicTask = LoadTopic();
-            var discussionsTask = LoadDiscussions();
+    public async Task<IActionResult> OnGetAsync()
+    {
+        var loadTopicTask = LoadTopic();
+        var discussionsTask = LoadDiscussions();
 
-            // load all in parallel
-            await Task.WhenAll(
-                loadTopicTask,
-                discussionsTask
-            );
+        // load all in parallel
+        await Task.WhenAll(
+            loadTopicTask,
+            discussionsTask
+        );
 
-            Topic = loadTopicTask.Result;
+        Topic = loadTopicTask.Result;
 
-            Items = discussionsTask.Result
-                .OrderBy(r => r.MessageDate)
-                .ToList();
+        Items = discussionsTask.Result
+            .OrderBy(r => r.MessageDate)
+            .ToList();
 
-            return Page();
-        }
-        
-        public async Task<IActionResult> OnPostAsync()
-        {
-            if (!ModelState.IsValid)
-                return Page();
+        return Page();
+    }
 
-            var createModel = new DiscussionCreateModel
-            {
-                TopicId = Id,
-                TenantId = Tenant.Value.Id,
-                DisplayName = _userClaimManager.GetDisplayName(User),
-                EmailAddress = _userClaimManager.GetUserName(User),
-                MessageDate = DateTimeOffset.UtcNow,
-                Message = Message
-            };
+    public async Task<IActionResult> OnPostAsync()
+    {
+        if (!ModelState.IsValid)
+            return Page();
 
-            var userAgent = Request.ReadUserAgent();
-            _mapper.Map(userAgent, createModel);
+        var createModel = new DiscussionCreateModel
+        {
+            TopicId = Id,
+            TenantId = Tenant.Value.Id,
+            DisplayName = _userClaimManager.GetDisplayName(User),
+            EmailAddress = _userClaimManager.GetUserName(User),
+            MessageDate = DateTimeOffset.UtcNow,
+            Message = Message
+        };
 
-            var command = new EntityCreateCommand<DiscussionCreateModel, DiscussionReadModel>(User, createModel);
-            var result = await Mediator.Send(command);
+        var userAgent = Request.ReadUserAgent();
+        _mapper.Map(userAgent, createModel);
 
-            return RedirectToPage("/topic/discussion/view", new { id = Id, tenant = TenantRoute });
-        }
+        var command = new EntityCreateCommand<DiscussionCreateModel, DiscussionReadModel>(User, createModel);
+        var result = await Mediator.Send(command);
 
+        return RedirectToPage("/topic/discussion/view", new { id = Id, tenant = TenantRoute });
+    }
 
-        private async Task<TopicReadModel> LoadTopic()
-        {
-            var command = new EntityIdentifierQuery<Guid, TopicReadModel>(User, Id);
-            var result = await Mediator.Send(command);
 
-            return result;
-        }
+    private async Task<TopicReadModel> LoadTopic()
+    {
+        var command = new EntityIdentifierQuery<Guid, TopicReadModel>(User, Id);
+        var result = await Mediator.Send(command);
 
-        private async Task<IReadOnlyCollection<DiscussionReadModel>> LoadDiscussions()
-        {
-            var query = new DiscussionTopicQuery(User, Id);
-            var result = await Mediator.Send(query);
+        return result;
+    }
 
-            return result;
-        }
+    private async Task<IReadOnlyCollection<DiscussionReadModel>> LoadDiscussions()
+    {
+        var query = new DiscussionTopicQuery(User, Id);
+        var result = await Mediator.Send(query);
 
+        return result;
     }
-}
\ No newline at end of file
+
+}
diff --git a/service/src/InstructorIQ.WebApplication/Pages/Topic/Edit.cshtml.cs b/service/src/InstructorIQ.WebApplication/Pages/Topic/Edit.cshtml.cs
index 38f85cd5..ec6f62fe 100644
--- a/service/src/InstructorIQ.WebApplication/Pages/Topic/Edit.cshtml.cs
+++ b/service/src/InstructorIQ.WebApplication/Pages/Topic/Edit.cshtml.cs
@@ -1,8 +1,7 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using MediatR.CommandQuery.Commands;
-using MediatR.CommandQuery.Queries;
+
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Domain.Queries;
 using InstructorIQ.Core.Extensions;
@@ -10,96 +9,99 @@
 using InstructorIQ.Core.Security;
 using InstructorIQ.Core.Services;
 using InstructorIQ.WebApplication.Models;
+
 using MediatR;
+using MediatR.CommandQuery.Commands;
+using MediatR.CommandQuery.Queries;
+
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 
-namespace InstructorIQ.WebApplication.Pages.Topic
+namespace InstructorIQ.WebApplication.Pages.Topic;
+
+[Authorize(Policy = UserPolicies.InstructorPolicy)]
+public class EditModel : EntityIdentifierModelBase<TopicUpdateModel>
 {
-    [Authorize(Policy = UserPolicies.InstructorPolicy)]
-    public class EditModel : EntityIdentifierModelBase<TopicUpdateModel>
+    private readonly IHtmlService _htmlService;
+
+    public EditModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory, IHtmlService htmlService)
+        : base(tenant, mediator, loggerFactory)
     {
-        private readonly IHtmlService _htmlService;
+        _htmlService = htmlService;
+    }
 
-        public EditModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory, IHtmlService htmlService)
-            : base(tenant, mediator, loggerFactory)
-        {
-            _htmlService = htmlService;
-        }
+    [BindProperty]
+    public IReadOnlyCollection<MemberDropdownModel> Instructors { get; set; }
 
-        [BindProperty]
-        public IReadOnlyCollection<MemberDropdownModel> Instructors { get; set; }
+    public override async Task<IActionResult> OnGetAsync()
+    {
+        var loadTask = base.OnGetAsync();
+        var loadInstructorsTask = LoadInstructors();
 
-        public override async Task<IActionResult> OnGetAsync()
-        {
-            var loadTask = base.OnGetAsync();
-            var loadInstructorsTask = LoadInstructors();
+        // load all in parallel
+        await Task.WhenAll(
+          loadTask,
+          loadInstructorsTask
+        );
 
-            // load all in parallel
-            await Task.WhenAll(
-              loadTask,
-              loadInstructorsTask
-            );
+        Instructors = loadInstructorsTask.Result;
 
-            Instructors = loadInstructorsTask.Result;
+        return Page();
+    }
 
+    public async Task<IActionResult> OnPostAsync()
+    {
+        if (!ModelState.IsValid)
             return Page();
-        }
 
-        public async Task<IActionResult> OnPostAsync()
-        {
-            if (!ModelState.IsValid)
-                return Page();
-
-            var readCommand = new EntityIdentifierQuery<Guid, TopicUpdateModel>(User, Id);
-            var updateModel = await Mediator.Send(readCommand);
-            if (updateModel == null)
-                return NotFound();
-
-            // only update input fields
-            await TryUpdateModelAsync(
-                updateModel,
-                nameof(Entity),
-                p => p.Title,
-                p => p.Description,
-                p => p.CalendarYear,
-                p => p.TargetMonth,
-                p => p.LeadInstructorId,
-                p => p.IsRequired
-            );
-
-            // update summary
-            if (updateModel.Description.HasValue())
-                updateModel.Summary = _htmlService.PlainText(updateModel.Description).RemoveExtended().Truncate(256);
-
-            var updateCommand = new EntityUpdateCommand<Guid, TopicUpdateModel, TopicReadModel>(User, Id, updateModel);
-            var result = await Mediator.Send(updateCommand);
-
-            ShowAlert("Successfully saved topic");
-
-            return RedirectToPage("/Topic/View", new { id = result.Id, tenant = TenantRoute });
-        }
+        var readCommand = new EntityIdentifierQuery<Guid, TopicUpdateModel>(User, Id);
+        var updateModel = await Mediator.Send(readCommand);
+        if (updateModel == null)
+            return NotFound();
+
+        // only update input fields
+        await TryUpdateModelAsync(
+            updateModel,
+            nameof(Entity),
+            p => p.Title,
+            p => p.Description,
+            p => p.CalendarYear,
+            p => p.TargetMonth,
+            p => p.LeadInstructorId,
+            p => p.IsRequired
+        );
+
+        // update summary
+        if (updateModel.Description.HasValue())
+            updateModel.Summary = _htmlService.PlainText(updateModel.Description).RemoveExtended().Truncate(256);
+
+        var updateCommand = new EntityUpdateCommand<Guid, TopicUpdateModel, TopicReadModel>(User, Id, updateModel);
+        var result = await Mediator.Send(updateCommand);
+
+        ShowAlert("Successfully saved topic");
+
+        return RedirectToPage("/Topic/View", new { id = result.Id, tenant = TenantRoute });
+    }
 
-        public async Task<IActionResult> OnPostDeleteEntity()
-        {
-            var command = new EntityDeleteCommand<Guid, TopicReadModel>(User, Id);
-            var result = await Mediator.Send(command);
+    public async Task<IActionResult> OnPostDeleteEntity()
+    {
+        var command = new EntityDeleteCommand<Guid, TopicReadModel>(User, Id);
+        var result = await Mediator.Send(command);
 
-            ShowAlert("Successfully deleted topic");
+        ShowAlert("Successfully deleted topic");
 
-            return RedirectToPage("/Topic/Index", new { tenant = TenantRoute });
+        return RedirectToPage("/Topic/Index", new { tenant = TenantRoute });
 
-        }
+    }
 
-        private async Task<IReadOnlyCollection<MemberDropdownModel>> LoadInstructors()
-        {
-            var dropdownQuery = new MemberDropdownQuery(User, Tenant.Value.Id) { RoleId = Core.Data.Constants.Role.Instructor };
-            var instructors = await Mediator.Send(dropdownQuery);
+    private async Task<IReadOnlyCollection<MemberDropdownModel>> LoadInstructors()
+    {
+        var dropdownQuery = new MemberDropdownQuery(User, Tenant.Value.Id) { RoleId = Core.Data.Constants.Role.Instructor };
+        var instructors = await Mediator.Send(dropdownQuery);
 
-            return instructors;
-        }
+        return instructors;
+    }
 
 
-    }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.WebApplication/Pages/Topic/Export.cshtml.cs b/service/src/InstructorIQ.WebApplication/Pages/Topic/Export.cshtml.cs
index 96b03939..50af15b6 100644
--- a/service/src/InstructorIQ.WebApplication/Pages/Topic/Export.cshtml.cs
+++ b/service/src/InstructorIQ.WebApplication/Pages/Topic/Export.cshtml.cs
@@ -1,127 +1,129 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
+
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Extensions;
 using InstructorIQ.Core.Multitenancy;
 using InstructorIQ.WebApplication.Models;
+
 using MediatR;
 using MediatR.CommandQuery.Queries;
+
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 
-namespace InstructorIQ.WebApplication.Pages.Topic
+namespace InstructorIQ.WebApplication.Pages.Topic;
+
+public class ExportModel : ExportModelBase
 {
-    public class ExportModel : ExportModelBase
+    public ExportModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
+        : base(tenant, mediator, loggerFactory)
     {
-        public ExportModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
-            : base(tenant, mediator, loggerFactory)
-        {
-            Year = DateTime.Now.Year;
-        }
+        Year = DateTime.Now.Year;
+    }
 
-        [BindProperty(Name = "year", SupportsGet = true)]
-        public int? Year { get; set; }
+    [BindProperty(Name = "year", SupportsGet = true)]
+    public int? Year { get; set; }
 
-        [BindProperty(Name = "month", SupportsGet = true)]
-        public int? Month { get; set; }
+    [BindProperty(Name = "month", SupportsGet = true)]
+    public int? Month { get; set; }
 
-        [BindProperty(Name = "q", SupportsGet = true)]
-        public string Query { get; set; }
+    [BindProperty(Name = "q", SupportsGet = true)]
+    public string Query { get; set; }
 
-        public async Task<IActionResult> OnGetAsync()
+    public async Task<IActionResult> OnGetAsync()
+    {
+        var select = new EntitySelect();
+        select.Filter = CreateFilter();
+        select.Sort = new List<EntitySort>
         {
-            var select = new EntitySelect();
-            select.Filter = CreateFilter();
-            select.Sort = new List<EntitySort>
-            {
-                new EntitySort { Name = nameof(TopicListModel.CalendarYear) },
-                new EntitySort { Name = nameof(TopicListModel.TargetMonth) },
-                new EntitySort { Name = nameof(TopicListModel.Title) }
-            };
+            new EntitySort { Name = nameof(TopicListModel.CalendarYear) },
+            new EntitySort { Name = nameof(TopicListModel.TargetMonth) },
+            new EntitySort { Name = nameof(TopicListModel.Title) }
+        };
 
-            var query = new EntitySelectQuery<TopicListModel>(User, select);
+        var query = new EntitySelectQuery<TopicListModel>(User, select);
 
-            var topics = await Mediator.Send(query);
+        var topics = await Mediator.Send(query);
 
-            var fileName = $"Topics-{DateTime.Now:yyyy-MM-dd-HH-mm-ss}.csv";
+        var fileName = $"Topics-{DateTime.Now:yyyy-MM-dd-HH-mm-ss}.csv";
 
-            return Export(topics, fileName);
-        }
+        return Export(topics, fileName);
+    }
 
 
-        private EntityFilter CreateFilter()
+    private EntityFilter CreateFilter()
+    {
+        var filters = new List<EntityFilter>();
+        var filter = new EntityFilter
         {
-            var filters = new List<EntityFilter>();
-            var filter = new EntityFilter
-            {
-                Logic = EntityFilterLogic.And,
-                Filters = filters
-            };
+            Logic = EntityFilterLogic.And,
+            Filters = filters
+        };
 
-            AddQueryFilter(filters);
-            AddYearFilter(filters);
-            AddMonthFilter(filters);
+        AddQueryFilter(filters);
+        AddYearFilter(filters);
+        AddMonthFilter(filters);
 
-            return filter;
-        }
+        return filter;
+    }
 
-        private void AddYearFilter(List<EntityFilter> filters)
-        {
-            if (Year == null || Year == 0)
-                Year = DateTime.Now.Year;
+    private void AddYearFilter(List<EntityFilter> filters)
+    {
+        if (Year == null || Year == 0)
+            Year = DateTime.Now.Year;
 
-            var yearFilter = new EntityFilter
-            {
-                Name = nameof(TopicReadModel.CalendarYear),
-                Value = Year,
-                Operator = EntityFilterOperators.Equal
-            };
-            filters.Add(yearFilter);
-        }
-
-        private void AddMonthFilter(List<EntityFilter> filters)
+        var yearFilter = new EntityFilter
         {
-            if (Month.HasValue == false || Month.Value <= 0)
-                return;
+            Name = nameof(TopicReadModel.CalendarYear),
+            Value = Year,
+            Operator = EntityFilterOperators.Equal
+        };
+        filters.Add(yearFilter);
+    }
 
-            var monthFilter = new EntityFilter
-            {
-                Name = nameof(TopicReadModel.TargetMonth),
-                Value = Month,
-                Operator = EntityFilterOperators.Equal
-            };
-            filters.Add(monthFilter);
-        }
-
-        private void AddQueryFilter(List<EntityFilter> filters)
+    private void AddMonthFilter(List<EntityFilter> filters)
+    {
+        if (Month.HasValue == false || Month.Value <= 0)
+            return;
+
+        var monthFilter = new EntityFilter
         {
-            if (Query.IsNullOrWhiteSpace())
-                return;
+            Name = nameof(TopicReadModel.TargetMonth),
+            Value = Month,
+            Operator = EntityFilterOperators.Equal
+        };
+        filters.Add(monthFilter);
+    }
+
+    private void AddQueryFilter(List<EntityFilter> filters)
+    {
+        if (Query.IsNullOrWhiteSpace())
+            return;
 
-            var value = Query.Trim();
-            var textFilter = new EntityFilter
+        var value = Query.Trim();
+        var textFilter = new EntityFilter
+        {
+            Logic = EntityFilterLogic.Or,
+            Filters = new List<EntityFilter>
             {
-                Logic = EntityFilterLogic.Or,
-                Filters = new List<EntityFilter>
+                new EntityFilter
                 {
-                    new EntityFilter
-                    {
-                        Name = nameof(TopicReadModel.Title),
-                        Value = value,
-                        Operator = EntityFilterOperators.Contains
-                    },
-                    new EntityFilter
-                    {
-                        Name = nameof(TopicReadModel.Description),
-                        Value = value,
-                        Operator = EntityFilterOperators.Contains
-                    }
+                    Name = nameof(TopicReadModel.Title),
+                    Value = value,
+                    Operator = EntityFilterOperators.Contains
+                },
+                new EntityFilter
+                {
+                    Name = nameof(TopicReadModel.Description),
+                    Value = value,
+                    Operator = EntityFilterOperators.Contains
                 }
-            };
-            filters.Add(textFilter);
-        }
+            }
+        };
+        filters.Add(textFilter);
+    }
 
 
-    }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.WebApplication/Pages/Topic/History/View.cshtml.cs b/service/src/InstructorIQ.WebApplication/Pages/Topic/History/View.cshtml.cs
index afd33a64..f8b16704 100644
--- a/service/src/InstructorIQ.WebApplication/Pages/Topic/History/View.cshtml.cs
+++ b/service/src/InstructorIQ.WebApplication/Pages/Topic/History/View.cshtml.cs
@@ -1,56 +1,58 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
+
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Domain.Queries;
 using InstructorIQ.Core.Multitenancy;
 using InstructorIQ.WebApplication.Models;
+
 using MediatR;
 using MediatR.CommandQuery.Audit;
+
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 
-namespace InstructorIQ.WebApplication.Pages.Topic.History
+namespace InstructorIQ.WebApplication.Pages.Topic.History;
+
+[ResponseCache(Duration = 300)]
+public class ViewModel : EntityIdentifierModelBase<TopicUpdateModel>
 {
-    [ResponseCache(Duration = 300)]
-    public class ViewModel : EntityIdentifierModelBase<TopicUpdateModel>
+    public ViewModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
+        : base(tenant, mediator, loggerFactory)
     {
-        public ViewModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
-            : base(tenant, mediator, loggerFactory)
-        {
-
 
-        }
 
-        public IReadOnlyCollection<AuditRecord<Guid>> History { get; set; }
+    }
 
-        public override async Task<IActionResult> OnGetAsync()
-        {
-            var topicTask = base.OnGetAsync();
+    public IReadOnlyCollection<AuditRecord<Guid>> History { get; set; }
 
-            var query = new TopicHistoryQuery(User, Id);
-            var historyTask = Mediator.Send(query);
+    public override async Task<IActionResult> OnGetAsync()
+    {
+        var topicTask = base.OnGetAsync();
 
-            await Task.WhenAll(
-                topicTask,
-                historyTask
-            );
+        var query = new TopicHistoryQuery(User, Id);
+        var historyTask = Mediator.Send(query);
 
-            History = historyTask.Result;
+        await Task.WhenAll(
+            topicTask,
+            historyTask
+        );
 
-            return Page();
-        }
+        History = historyTask.Result;
 
-        public string ComputeUrl(AuditRecord<Guid> history)
-        {
-            if (history.Entity == "Session")
-                return Url.Page("/topic/session/view", new { topicid = Id, tenant = TenantRoute, id = history.Key });
-            if (history.Entity == "SessionInstructor")
-                return Url.Page("/topic/session/index", new { id = Id, tenant = TenantRoute });
-            if (history.Entity == "Discussion")
-                return Url.Page("/topic/discussion/view", new { id = Id, tenant = TenantRoute });
+        return Page();
+    }
 
-            return Url.Page("/topic/view", new { id = Id, tenant = TenantRoute });
-        }
+    public string ComputeUrl(AuditRecord<Guid> history)
+    {
+        if (history.Entity == "Session")
+            return Url.Page("/topic/session/view", new { topicid = Id, tenant = TenantRoute, id = history.Key });
+        if (history.Entity == "SessionInstructor")
+            return Url.Page("/topic/session/index", new { id = Id, tenant = TenantRoute });
+        if (history.Entity == "Discussion")
+            return Url.Page("/topic/discussion/view", new { id = Id, tenant = TenantRoute });
+
+        return Url.Page("/topic/view", new { id = Id, tenant = TenantRoute });
     }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.WebApplication/Pages/Topic/Index.cshtml.cs b/service/src/InstructorIQ.WebApplication/Pages/Topic/Index.cshtml.cs
index f2e78a8b..35f0a747 100644
--- a/service/src/InstructorIQ.WebApplication/Pages/Topic/Index.cshtml.cs
+++ b/service/src/InstructorIQ.WebApplication/Pages/Topic/Index.cshtml.cs
@@ -1,184 +1,186 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using MediatR.CommandQuery.Queries;
+
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Extensions;
 using InstructorIQ.Core.Models;
 using InstructorIQ.Core.Multitenancy;
 using InstructorIQ.Core.Services;
 using InstructorIQ.WebApplication.Models;
+
 using MediatR;
+using MediatR.CommandQuery.Queries;
+
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 
-namespace InstructorIQ.WebApplication.Pages.Topic
+namespace InstructorIQ.WebApplication.Pages.Topic;
+
+public class IndexModel : EntityPagedModelBase<TopicListModel>
 {
-    public class IndexModel : EntityPagedModelBase<TopicListModel>
-    {
-        private readonly IStateService _stateService;
+    private readonly IStateService _stateService;
 
-        public IndexModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory, IStateService stateService)
-            : base(tenant, mediator, loggerFactory)
-        {
-            _stateService = stateService;
-            Sort = nameof(TopicReadModel.TargetMonth);
-            Selected = new List<Guid>();
-        }
+    public IndexModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory, IStateService stateService)
+        : base(tenant, mediator, loggerFactory)
+    {
+        _stateService = stateService;
+        Sort = nameof(TopicReadModel.TargetMonth);
+        Selected = new List<Guid>();
+    }
 
-        [BindProperty(Name = "year", SupportsGet = true)]
-        public int? Year { get; set; }
+    [BindProperty(Name = "year", SupportsGet = true)]
+    public int? Year { get; set; }
 
-        [BindProperty(Name = "month", SupportsGet = true)]
-        public int? Month { get; set; }
+    [BindProperty(Name = "month", SupportsGet = true)]
+    public int? Month { get; set; }
 
-        [BindProperty]
-        public List<Guid> Selected { get; set; }
+    [BindProperty]
+    public List<Guid> Selected { get; set; }
 
-        public override async Task<IActionResult> OnGetAsync()
-        {
-            ReadHistory();
+    public override async Task<IActionResult> OnGetAsync()
+    {
+        ReadHistory();
 
-            var result = await base.OnGetAsync();
+        var result = await base.OnGetAsync();
 
-            WriteHistory();
+        WriteHistory();
 
-            return result;
-        }
+        return result;
+    }
 
-        public IActionResult OnPostAddGroups()
-        {
-            if (Selected.Count == 0)
-                return RedirectToPage();
+    public IActionResult OnPostAddGroups()
+    {
+        if (Selected.Count == 0)
+            return RedirectToPage();
 
 
-            return RedirectToPage("/Session/Sequence", new { TopicIds = Selected, tenant = TenantRoute });
-        }
+        return RedirectToPage("/Session/Sequence", new { TopicIds = Selected, tenant = TenantRoute });
+    }
 
-        public IActionResult OnPostEditSessions()
-        {
-            if (Selected.Count == 0)
-                return RedirectToPage();
+    public IActionResult OnPostEditSessions()
+    {
+        if (Selected.Count == 0)
+            return RedirectToPage();
 
 
-            return RedirectToPage("/Session/Multiple", new { TopicIds = Selected, tenant = TenantRoute });
-        }
+        return RedirectToPage("/Session/Multiple", new { TopicIds = Selected, tenant = TenantRoute });
+    }
 
-        public IActionResult OnPostEditTopics()
-        {
-            if (Selected.Count == 0)
-                return RedirectToPage();
+    public IActionResult OnPostEditTopics()
+    {
+        if (Selected.Count == 0)
+            return RedirectToPage();
 
 
-            return RedirectToPage("/Topic/Multiple", new { TopicIds = Selected, tenant = TenantRoute });
-        }
+        return RedirectToPage("/Topic/Multiple", new { TopicIds = Selected, tenant = TenantRoute });
+    }
 
 
-        protected override EntityQuery CreateQuery()
-        {
-            var query = new EntityQuery(null, PageNumber, PageSize, Sort);
-            query.Filter = CreateFilter();
+    protected override EntityQuery CreateQuery()
+    {
+        var query = new EntityQuery(null, PageNumber, PageSize, Sort);
+        query.Filter = CreateFilter();
 
-            return query;
-        }
+        return query;
+    }
 
-        protected override EntityFilter CreateFilter()
+    protected override EntityFilter CreateFilter()
+    {
+        var filters = new List<EntityFilter>();
+        var filter = new EntityFilter
         {
-            var filters = new List<EntityFilter>();
-            var filter = new EntityFilter
-            {
-                Logic = EntityFilterLogic.And,
-                Filters = filters
-            };
+            Logic = EntityFilterLogic.And,
+            Filters = filters
+        };
 
-            AddQueryFilter(filters);
-            AddYearFilter(filters);
-            AddMonthFilter(filters);
+        AddQueryFilter(filters);
+        AddYearFilter(filters);
+        AddMonthFilter(filters);
 
-            return filter;
-        }
+        return filter;
+    }
 
 
-        private void AddYearFilter(List<EntityFilter> filters)
-        {
-            if (Year == null || Year == 0)
-                Year = DateTime.Now.Year;
+    private void AddYearFilter(List<EntityFilter> filters)
+    {
+        if (Year == null || Year == 0)
+            Year = DateTime.Now.Year;
 
-            var yearFilter = new EntityFilter
-            {
-                Name = nameof(TopicReadModel.CalendarYear),
-                Value = Year,
-                Operator = EntityFilterOperators.Equal
-            };
-            filters.Add(yearFilter);
-        }
-
-        private void AddMonthFilter(List<EntityFilter> filters)
+        var yearFilter = new EntityFilter
         {
-            if (Month.HasValue == false || Month.Value <= 0)
-                return;
+            Name = nameof(TopicReadModel.CalendarYear),
+            Value = Year,
+            Operator = EntityFilterOperators.Equal
+        };
+        filters.Add(yearFilter);
+    }
 
-            var monthFilter = new EntityFilter
-            {
-                Name = nameof(TopicReadModel.TargetMonth),
-                Value = Month,
-                Operator = EntityFilterOperators.Equal
-            };
-            filters.Add(monthFilter);
-        }
-
-        private void AddQueryFilter(List<EntityFilter> filters)
+    private void AddMonthFilter(List<EntityFilter> filters)
+    {
+        if (Month.HasValue == false || Month.Value <= 0)
+            return;
+
+        var monthFilter = new EntityFilter
         {
-            if (Query.IsNullOrWhiteSpace())
-                return;
+            Name = nameof(TopicReadModel.TargetMonth),
+            Value = Month,
+            Operator = EntityFilterOperators.Equal
+        };
+        filters.Add(monthFilter);
+    }
+
+    private void AddQueryFilter(List<EntityFilter> filters)
+    {
+        if (Query.IsNullOrWhiteSpace())
+            return;
 
-            var value = Query.Trim();
-            var textFilter = new EntityFilter
+        var value = Query.Trim();
+        var textFilter = new EntityFilter
+        {
+            Logic = EntityFilterLogic.Or,
+            Filters = new List<EntityFilter>
             {
-                Logic = EntityFilterLogic.Or,
-                Filters = new List<EntityFilter>
+                new EntityFilter
+                {
+                    Name = nameof(TopicReadModel.Title),
+                    Value = value,
+                    Operator = EntityFilterOperators.Contains
+                },
+                new EntityFilter
                 {
-                    new EntityFilter
-                    {
-                        Name = nameof(TopicReadModel.Title),
-                        Value = value,
-                        Operator = EntityFilterOperators.Contains
-                    },
-                    new EntityFilter
-                    {
-                        Name = nameof(TopicReadModel.Description),
-                        Value = value,
-                        Operator = EntityFilterOperators.Contains
-                    }
+                    Name = nameof(TopicReadModel.Description),
+                    Value = value,
+                    Operator = EntityFilterOperators.Contains
                 }
-            };
-            filters.Add(textFilter);
-        }
+            }
+        };
+        filters.Add(textFilter);
+    }
 
 
-        private void WriteHistory()
+    private void WriteHistory()
+    {
+        var state = new SessionQueryState
         {
-            var state = new SessionQueryState
-            {
-                Year = Year,
-                Month = Month,
-                Query = Query
-            };
+            Year = Year,
+            Month = Month,
+            Query = Query
+        };
 
-            _stateService.WriteState(state, "topic");
-        }
+        _stateService.WriteState(state, "topic");
+    }
 
-        private void ReadHistory()
-        {
-            var state = _stateService.ReadState<SessionQueryState>("topic");
-            if (Year == null || Year == 0)
-                Year = state?.Year ?? DateTime.Now.Year;
+    private void ReadHistory()
+    {
+        var state = _stateService.ReadState<SessionQueryState>("topic");
+        if (Year == null || Year == 0)
+            Year = state?.Year ?? DateTime.Now.Year;
 
-            if (Month == null)
-                Month = state?.Month;
+        if (Month == null)
+            Month = state?.Month;
 
-            if (!Request.Query.ContainsKey("q") && Request.Cookies.TryGetValue("_topic_query", out var queryCookie))
-                Query = state?.Query?.Trim();
-        }
+        if (!Request.Query.ContainsKey("q") && Request.Cookies.TryGetValue("_topic_query", out var queryCookie))
+            Query = state?.Query?.Trim();
     }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.WebApplication/Pages/Topic/Messaging/Introduction.cshtml.cs b/service/src/InstructorIQ.WebApplication/Pages/Topic/Messaging/Introduction.cshtml.cs
index 897ec6d6..94a12ea7 100644
--- a/service/src/InstructorIQ.WebApplication/Pages/Topic/Messaging/Introduction.cshtml.cs
+++ b/service/src/InstructorIQ.WebApplication/Pages/Topic/Messaging/Introduction.cshtml.cs
@@ -1,85 +1,87 @@
-using System.Globalization;
+using System.Globalization;
 using System.Linq;
 using System.Threading.Tasks;
+
 using InstructorIQ.Core.Domain.Commands;
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Multitenancy;
 using InstructorIQ.Core.Security;
 using InstructorIQ.Core.Services;
+
 using MediatR;
+
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 
-namespace InstructorIQ.WebApplication.Pages.Topic.Messaging
+namespace InstructorIQ.WebApplication.Pages.Topic.Messaging;
+
+[Authorize(Policy = UserPolicies.AdministratorPolicy)]
+public class IntroductionModel : MessagingModel
 {
-    [Authorize(Policy = UserPolicies.AdministratorPolicy)]
-    public class IntroductionModel : MessagingModel
+    private readonly UserClaimManager _userClaimManager;
+
+    public IntroductionModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory, UserClaimManager userClaimManager)
+        : base(tenant, mediator, loggerFactory)
     {
-        private readonly UserClaimManager _userClaimManager;
+        _userClaimManager = userClaimManager;
+    }
 
-        public IntroductionModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory, UserClaimManager userClaimManager)
-            : base(tenant, mediator, loggerFactory)
-        {
-            _userClaimManager = userClaimManager;
-        }
+    public override async Task<IActionResult> OnGetAsync()
+    {
+        await base.OnGetAsync();
 
-        public override async Task<IActionResult> OnGetAsync()
-        {
-            await base.OnGetAsync();
+        // set defaults
+        Message.Subject = $"{Entity.Title} Training";
 
-            // set defaults
-            Message.Subject = $"{Entity.Title} Training";
+        if (Entity.TargetMonth.HasValue)
+            Message.Subject += $" in {GetMonthName(Entity.TargetMonth.Value)}";
 
-            if (Entity.TargetMonth.HasValue) 
-                Message.Subject += $" in {GetMonthName(Entity.TargetMonth.Value)}";
+        return Page();
+    }
 
+    public async Task<IActionResult> OnPostAsync()
+    {
+        if (!ModelState.IsValid)
             return Page();
-        }
 
-        public async Task<IActionResult> OnPostAsync()
-        {
-            if (!ModelState.IsValid)
-                return Page();
+        var address = _userClaimManager.GetEmail(User) ?? User.Identity.Name;
+        var name = _userClaimManager.GetDisplayName(User);
 
-            var address = _userClaimManager.GetEmail(User) ?? User.Identity.Name;
-            var name = _userClaimManager.GetDisplayName(User);
+        var planLink = Url.Page(
+            "/topic/planning/view",
+            pageHandler: null,
+            values: new { id = Id, tenant = TenantRoute },
+            protocol: Request.Scheme);
 
-            var planLink = Url.Page(
-                "/topic/planning/view",
-                pageHandler: null,
-                values: new { id = Id, tenant = TenantRoute },
-                protocol: Request.Scheme);
+        var email = Message;
+        email.ReplyToAddress = address;
+        email.ReplyToName = name;
+        email.LinkUrl = planLink;
+        email.LinkText = "Edit Lesson Plan";
 
-            var email = Message;
-            email.ReplyToAddress = address;
-            email.ReplyToName = name;
-            email.LinkUrl = planLink;
-            email.LinkText = "Edit Lesson Plan";
+        var command = new SendUserLinkEmailCommand(User, email);
+        await Mediator.Send(command);
 
-            var command = new SendUserLinkEmailCommand(User, email);
-            await Mediator.Send(command);
+        ShowAlert("Successfully sent introduction email");
 
-            ShowAlert("Successfully sent introduction email");
-
-            return RedirectToPage("/topic/planning/view", new { id = Id, tenant = TenantRoute });
-        }
+        return RedirectToPage("/topic/planning/view", new { id = Id, tenant = TenantRoute });
+    }
 
-        public string TargetMonth()
-        {
-            if (Entity.TargetMonth.HasValue)
-                return GetMonthName(Entity.TargetMonth.Value);
+    public string TargetMonth()
+    {
+        if (Entity.TargetMonth.HasValue)
+            return GetMonthName(Entity.TargetMonth.Value);
 
-            var startDate = Sessions
-                .Where(s => s.StartDate.HasValue)
-                .Select(s => s.StartDate)
-                .FirstOrDefault();
+        var startDate = Sessions
+            .Where(s => s.StartDate.HasValue)
+            .Select(s => s.StartDate)
+            .FirstOrDefault();
 
-            if (startDate.HasValue)
-                return GetMonthName(startDate.Value.Month);
+        if (startDate.HasValue)
+            return GetMonthName(startDate.Value.Month);
 
-            return "TBD";
-        }
+        return "TBD";
     }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.WebApplication/Pages/Topic/Messaging/MessagingModel.cs b/service/src/InstructorIQ.WebApplication/Pages/Topic/Messaging/MessagingModel.cs
index ce005e63..b051d460 100644
--- a/service/src/InstructorIQ.WebApplication/Pages/Topic/Messaging/MessagingModel.cs
+++ b/service/src/InstructorIQ.WebApplication/Pages/Topic/Messaging/MessagingModel.cs
@@ -1,116 +1,120 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 using System.Threading.Tasks;
+
 using EntityChange.Extensions;
+
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Domain.Queries;
 using InstructorIQ.Core.Models;
 using InstructorIQ.Core.Multitenancy;
 using InstructorIQ.WebApplication.Models;
+
 using MediatR;
+
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
+
 using NaturalSort.Extension;
 
-namespace InstructorIQ.WebApplication.Pages.Topic.Messaging
+namespace InstructorIQ.WebApplication.Pages.Topic.Messaging;
+
+public abstract class MessagingModel : EntityIdentifierModelBase<TopicListModel>
 {
-    public abstract class MessagingModel : EntityIdentifierModelBase<TopicListModel>
+    protected MessagingModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
+        : base(tenant, mediator, loggerFactory)
     {
-        protected MessagingModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
-            : base(tenant, mediator, loggerFactory)
-        {
-        }
-
-        [BindProperty]
-        public UserLinkModel Message { get; set; }
+    }
 
-        public IReadOnlyCollection<MemberDropdownModel> Members { get; set; }
+    [BindProperty]
+    public UserLinkModel Message { get; set; }
 
-        public IReadOnlyCollection<SessionCalendarModel> Sessions { get; set; }
+    public IReadOnlyCollection<MemberDropdownModel> Members { get; set; }
 
+    public IReadOnlyCollection<SessionCalendarModel> Sessions { get; set; }
 
-        public override async Task<IActionResult> OnGetAsync()
-        {
-            var loadTask = base.OnGetAsync();
-            var loadMembers = LoadMembers();
-            var loadSessions = LoadSessions();
 
-            // load all in parallel
-            await Task.WhenAll(
-                loadTask,
-                loadMembers,
-                loadSessions
-            );
+    public override async Task<IActionResult> OnGetAsync()
+    {
+        var loadTask = base.OnGetAsync();
+        var loadMembers = LoadMembers();
+        var loadSessions = LoadSessions();
 
-            var recipients = GetInstructorEmails();
+        // load all in parallel
+        await Task.WhenAll(
+            loadTask,
+            loadMembers,
+            loadSessions
+        );
 
-            Message = new UserLinkModel();
-            Message.Recipients = recipients;
+        var recipients = GetInstructorEmails();
 
-            return Page();
-        }
+        Message = new UserLinkModel();
+        Message.Recipients = recipients;
 
+        return Page();
+    }
 
-        protected List<string> GetInstructorEmails()
-        {
-            var instructors = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
 
-            if (Entity.LeadInstructorEmail.HasValue())
-                instructors.Add(Entity.LeadInstructorEmail);
+    protected List<string> GetInstructorEmails()
+    {
+        var instructors = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
 
-            if (Sessions == null || Sessions.Count == 0)
-                return instructors.ToList();
+        if (Entity.LeadInstructorEmail.HasValue())
+            instructors.Add(Entity.LeadInstructorEmail);
 
-            foreach (var session in Sessions)
-            {
-                if (session.LeadInstructorEmail.HasValue())
-                    instructors.Add(session.LeadInstructorEmail);
+        if (Sessions == null || Sessions.Count == 0)
+            return instructors.ToList();
 
-                foreach (var instructor in session.AdditionalInstructors)
-                    if (instructor.Email.HasValue())
-                        instructors.Add(instructor.Email);
-            }
+        foreach (var session in Sessions)
+        {
+            if (session.LeadInstructorEmail.HasValue())
+                instructors.Add(session.LeadInstructorEmail);
 
-            return instructors.ToList(); ;
+            foreach (var instructor in session.AdditionalInstructors)
+                if (instructor.Email.HasValue())
+                    instructors.Add(instructor.Email);
         }
 
-        protected virtual async Task LoadMembers()
-        {
-            var command = new MemberDropdownQuery(User, Tenant.Value.Id);
-            command.RoleId = Core.Data.Constants.Role.Member;
+        return instructors.ToList(); ;
+    }
 
-            var members = await Mediator.Send(command);
+    protected virtual async Task LoadMembers()
+    {
+        var command = new MemberDropdownQuery(User, Tenant.Value.Id);
+        command.RoleId = Core.Data.Constants.Role.Member;
 
-            Members = members.ToList();
-        }
+        var members = await Mediator.Send(command);
 
-        protected virtual async Task LoadSessions()
-        {
-            var query = new SessionTopicQuery(User, Id);
-            var result = await Mediator.Send(query);
-
-            Sessions = result
-                .OrderBy(r => r.StartDate)
-                .ThenBy(r => r.StartTime)
-                .ThenBy(i => i.GroupName, StringComparer.OrdinalIgnoreCase.WithNaturalSort())
-                .ToList();
-        }
+        Members = members.ToList();
+    }
 
+    protected virtual async Task LoadSessions()
+    {
+        var query = new SessionTopicQuery(User, Id);
+        var result = await Mediator.Send(query);
+
+        Sessions = result
+            .OrderBy(r => r.StartDate)
+            .ThenBy(r => r.StartTime)
+            .ThenBy(i => i.GroupName, StringComparer.OrdinalIgnoreCase.WithNaturalSort())
+            .ToList();
+    }
 
-        public string GetMonthName(int month)
-        {
-            return CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(month);
-        }
 
-        private string FormatName(MemberReadModel member)
-        {
-            var name = member.SortName ?? member.DisplayName;
-            var email = member.Email;
+    public string GetMonthName(int month)
+    {
+        return CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(month);
+    }
 
-            return $"{name} <{email}>";
-        }
+    private string FormatName(MemberReadModel member)
+    {
+        var name = member.SortName ?? member.DisplayName;
+        var email = member.Email;
 
+        return $"{name} <{email}>";
     }
+
 }
diff --git a/service/src/InstructorIQ.WebApplication/Pages/Topic/Messaging/PlanUpdate.cshtml.cs b/service/src/InstructorIQ.WebApplication/Pages/Topic/Messaging/PlanUpdate.cshtml.cs
index 056fc3cd..a8dfb54f 100644
--- a/service/src/InstructorIQ.WebApplication/Pages/Topic/Messaging/PlanUpdate.cshtml.cs
+++ b/service/src/InstructorIQ.WebApplication/Pages/Topic/Messaging/PlanUpdate.cshtml.cs
@@ -1,69 +1,71 @@
-using System.Threading.Tasks;
+using System.Threading.Tasks;
+
 using InstructorIQ.Core.Domain.Commands;
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Multitenancy;
 using InstructorIQ.Core.Security;
+
 using MediatR;
+
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 
-namespace InstructorIQ.WebApplication.Pages.Topic.Messaging
+namespace InstructorIQ.WebApplication.Pages.Topic.Messaging;
+
+[Authorize(Policy = UserPolicies.AdministratorPolicy)]
+public class PlanUpdateModel : MessagingModel
 {
-    [Authorize(Policy = UserPolicies.AdministratorPolicy)]
-    public class PlanUpdateModel : MessagingModel
+    private readonly UserClaimManager _userClaimManager;
+
+    public PlanUpdateModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory, UserClaimManager userClaimManager)
+        : base(tenant, mediator, loggerFactory)
     {
-        private readonly UserClaimManager _userClaimManager;
+        _userClaimManager = userClaimManager;
+    }
 
-        public PlanUpdateModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory, UserClaimManager userClaimManager)
-            : base(tenant, mediator, loggerFactory)
-        {
-            _userClaimManager = userClaimManager;
-        }
+    public string SenderName { get; set; }
 
-        public string SenderName { get; set; }
+    public override async Task<IActionResult> OnGetAsync()
+    {
+        await base.OnGetAsync();
 
-        public override async Task<IActionResult> OnGetAsync()
-        {
-            await base.OnGetAsync();
+        var name = _userClaimManager.GetDisplayName(User);
 
-            var name = _userClaimManager.GetDisplayName(User);
+        // set defaults
+        Message.Subject = $"Update Lesson Plan for {Entity.Title}";
+        SenderName = name;
 
-            // set defaults
-            Message.Subject = $"Update Lesson Plan for {Entity.Title}";
-            SenderName = name;
+        return Page();
+    }
 
+    public async Task<IActionResult> OnPostAsync()
+    {
+        if (!ModelState.IsValid)
             return Page();
-        }
 
-        public async Task<IActionResult> OnPostAsync()
-        {
-            if (!ModelState.IsValid)
-                return Page();
+        var address = _userClaimManager.GetEmail(User) ?? User.Identity.Name;
+        var name = _userClaimManager.GetDisplayName(User);
 
-            var address = _userClaimManager.GetEmail(User) ?? User.Identity.Name;
-            var name = _userClaimManager.GetDisplayName(User);
+        var link = Url.Page(
+            "/topic/planning/view",
+            pageHandler: null,
+            values: new { id = Id, tenant = TenantRoute },
+            protocol: Request.Scheme);
 
-            var link = Url.Page(
-                "/topic/planning/view",
-                pageHandler: null,
-                values: new { id = Id, tenant = TenantRoute },
-                protocol: Request.Scheme);
+        var email = Message;
+        email.ReplyToAddress = address;
+        email.ReplyToName = name;
+        email.LinkText = "Update Lesson Plan";
+        email.LinkUrl = link;
 
-            var email = Message;
-            email.ReplyToAddress = address;
-            email.ReplyToName = name;
-            email.LinkText = "Update Lesson Plan";
-            email.LinkUrl = link;
+        var command = new SendUserLinkEmailCommand(User, email);
+        await Mediator.Send(command);
 
-            var command = new SendUserLinkEmailCommand(User, email);
-            await Mediator.Send(command);
+        ShowAlert("Successfully sent email");
 
-            ShowAlert("Successfully sent email");
-
-            return RedirectToPage("/topic/planning/view", new { id = Id, tenant = TenantRoute });
-        }
+        return RedirectToPage("/topic/planning/view", new { id = Id, tenant = TenantRoute });
+    }
 
 
-    }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.WebApplication/Pages/Topic/Multiple.cshtml.cs b/service/src/InstructorIQ.WebApplication/Pages/Topic/Multiple.cshtml.cs
index 7a22cb15..e3414357 100644
--- a/service/src/InstructorIQ.WebApplication/Pages/Topic/Multiple.cshtml.cs
+++ b/service/src/InstructorIQ.WebApplication/Pages/Topic/Multiple.cshtml.cs
@@ -1,121 +1,124 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+
 using EntityChange.Extensions;
+
 using InstructorIQ.Core.Domain.Commands;
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Multitenancy;
 using InstructorIQ.Core.Security;
 using InstructorIQ.WebApplication.Models;
+
 using MediatR;
 using MediatR.CommandQuery.Queries;
+
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 
-namespace InstructorIQ.WebApplication.Pages.Topic
+namespace InstructorIQ.WebApplication.Pages.Topic;
+
+[Authorize(Policy = UserPolicies.AdministratorPolicy)]
+public class MultipleModel : MediatorModelBase
 {
-    [Authorize(Policy = UserPolicies.AdministratorPolicy)]
-    public class MultipleModel : MediatorModelBase
+    public MultipleModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
+        : base(tenant, mediator, loggerFactory)
     {
-        public MultipleModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
-            : base(tenant, mediator, loggerFactory)
-        {
-            Selected = new List<Guid>();
-        }
+        Selected = new List<Guid>();
+    }
 
-        [BindProperty(SupportsGet = true)]
-        public List<Guid> TopicIds { get; set; }
+    [BindProperty(SupportsGet = true)]
+    public List<Guid> TopicIds { get; set; }
 
-        [BindProperty]
-        public List<Guid> Selected { get; set; }
+    [BindProperty]
+    public List<Guid> Selected { get; set; }
 
-        [BindProperty]
-        public List<TopicMultipleUpdateModel> Topics { get; set; }
+    [BindProperty]
+    public List<TopicMultipleUpdateModel> Topics { get; set; }
 
-        public async Task<IActionResult> OnGetAsync()
+    public async Task<IActionResult> OnGetAsync()
+    {
+        if (TopicIds != null && TopicIds.Count != 0)
         {
-            if (TopicIds != null && TopicIds.Count != 0)
-            {
-                ViewData["Title"] = "Update Topics";
-                Topics = await LoadTopics();
-                return Page();
-            }
-
-            ViewData["Title"] = "Create Topics";
-            Topics = new List<TopicMultipleUpdateModel>
-            {
-                CreateTopic(),
-                CreateTopic(),
-                CreateTopic(),
-                CreateTopic(),
-                CreateTopic()
-            };
-
+            ViewData["Title"] = "Update Topics";
+            Topics = await LoadTopics();
             return Page();
         }
 
-        public async Task<IActionResult> OnPostAsync()
+        ViewData["Title"] = "Create Topics";
+        Topics = new List<TopicMultipleUpdateModel>
         {
-            if (!ModelState.IsValid)
-                return Page();
+            CreateTopic(),
+            CreateTopic(),
+            CreateTopic(),
+            CreateTopic(),
+            CreateTopic()
+        };
+
+        return Page();
+    }
 
+    public async Task<IActionResult> OnPostAsync()
+    {
+        if (!ModelState.IsValid)
+            return Page();
 
-            var topics = Topics
-                .Where(t => t.Title.HasValue())
-                .ToList();
 
-            if (topics.Count == 0)
-            {
-                ShowAlert("Enter a title for at least one topic.", "warning");
-                return Page();
-            }
+        var topics = Topics
+            .Where(t => t.Title.HasValue())
+            .ToList();
 
-            // ensure required data
-            foreach (var topic in topics)
-            {
-                if (topic.TenantId == default)
-                    topic.TenantId = Tenant.Value.Id;
-                if (topic.Created == default)
-                    topic.Created = DateTimeOffset.UtcNow;
-                if (topic.CreatedBy.IsNullOrEmpty())
-                    topic.CreatedBy = User.Identity.Name;
+        if (topics.Count == 0)
+        {
+            ShowAlert("Enter a title for at least one topic.", "warning");
+            return Page();
+        }
 
-                topic.Updated = DateTimeOffset.UtcNow;
-                topic.UpdatedBy = User.Identity.Name;
-            }
+        // ensure required data
+        foreach (var topic in topics)
+        {
+            if (topic.TenantId == default)
+                topic.TenantId = Tenant.Value.Id;
+            if (topic.Created == default)
+                topic.Created = DateTimeOffset.UtcNow;
+            if (topic.CreatedBy.IsNullOrEmpty())
+                topic.CreatedBy = User.Identity.Name;
+
+            topic.Updated = DateTimeOffset.UtcNow;
+            topic.UpdatedBy = User.Identity.Name;
+        }
 
-            var command = new TopicMultipleUpdateCommand(User, topics);
-            var result = await Mediator.Send(command);
+        var command = new TopicMultipleUpdateCommand(User, topics);
+        var result = await Mediator.Send(command);
 
-            ShowAlert("Successfully saved topics");
+        ShowAlert("Successfully saved topics");
 
-            return RedirectToPage("/Topic/Index", new { tenant = TenantRoute });
-        }
+        return RedirectToPage("/Topic/Index", new { tenant = TenantRoute });
+    }
 
-        private async Task<List<TopicMultipleUpdateModel>> LoadTopics()
-        {
-            var command = new EntityIdentifiersQuery<Guid, TopicMultipleUpdateModel>(User, TopicIds);
-            var result = await Mediator.Send(command);
-
-            return result
-                .OrderBy(p => p.CalendarYear)
-                .ThenBy(p => p.TargetMonth)
-                .ThenBy(p => p.Title)
-                .ToList();
-        }
+    private async Task<List<TopicMultipleUpdateModel>> LoadTopics()
+    {
+        var command = new EntityIdentifiersQuery<Guid, TopicMultipleUpdateModel>(User, TopicIds);
+        var result = await Mediator.Send(command);
+
+        return result
+            .OrderBy(p => p.CalendarYear)
+            .ThenBy(p => p.TargetMonth)
+            .ThenBy(p => p.Title)
+            .ToList();
+    }
 
-        private TopicMultipleUpdateModel CreateTopic(short? year = null)
+    private TopicMultipleUpdateModel CreateTopic(short? year = null)
+    {
+        return new TopicMultipleUpdateModel
         {
-            return new TopicMultipleUpdateModel
-            {
-                Id = Guid.NewGuid(),
-                CalendarYear = year ?? (short)DateTime.Now.Year,
-                TenantId = Tenant.Value.Id,
-                Created = DateTimeOffset.UtcNow,
-                CreatedBy = User.Identity.Name
-            };
-        }
+            Id = Guid.NewGuid(),
+            CalendarYear = year ?? (short)DateTime.Now.Year,
+            TenantId = Tenant.Value.Id,
+            Created = DateTimeOffset.UtcNow,
+            CreatedBy = User.Identity.Name
+        };
     }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.WebApplication/Pages/Topic/Planning/Edit.cshtml.cs b/service/src/InstructorIQ.WebApplication/Pages/Topic/Planning/Edit.cshtml.cs
index 7e0393f3..634ef0d8 100644
--- a/service/src/InstructorIQ.WebApplication/Pages/Topic/Planning/Edit.cshtml.cs
+++ b/service/src/InstructorIQ.WebApplication/Pages/Topic/Planning/Edit.cshtml.cs
@@ -1,51 +1,53 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using MediatR.CommandQuery.Commands;
-using MediatR.CommandQuery.Queries;
+
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Domain.Queries;
 using InstructorIQ.Core.Multitenancy;
 using InstructorIQ.Core.Security;
 using InstructorIQ.WebApplication.Models;
+
 using MediatR;
+using MediatR.CommandQuery.Commands;
+using MediatR.CommandQuery.Queries;
+
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 
-namespace InstructorIQ.WebApplication.Pages.Topic.Planning
+namespace InstructorIQ.WebApplication.Pages.Topic.Planning;
+
+[Authorize(Policy = UserPolicies.InstructorPolicy)]
+public class EditModel : EntityIdentifierModelBase<TopicUpdateModel>
 {
-    [Authorize(Policy = UserPolicies.InstructorPolicy)]
-    public class EditModel : EntityIdentifierModelBase<TopicUpdateModel>
+    public EditModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
+        : base(tenant, mediator, loggerFactory)
     {
-        public EditModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
-            : base(tenant, mediator, loggerFactory)
-        {
-        }
-
-        public async Task<IActionResult> OnPostAsync()
-        {
-            if (!ModelState.IsValid)
-                return Page();
-
-            var readCommand = new EntityIdentifierQuery<Guid, TopicUpdateModel>(User, Id);
-            var updateModel = await Mediator.Send(readCommand);
-            if (updateModel == null)
-                return NotFound();
-
-            // only update input fields
-            await TryUpdateModelAsync(
-                updateModel,
-                nameof(Entity),
-                p => p.LessonPlan
-            );
-
-            var updateCommand = new EntityUpdateCommand<Guid, TopicUpdateModel, TopicReadModel>(User, Id, updateModel);
-            var result = await Mediator.Send(updateCommand);
-
-            ShowAlert("Successfully saved topic");
-
-            return RedirectToPage("/Topic/Planning/View", new { id = result.Id, tenant = TenantRoute });
-        }
     }
-}
\ No newline at end of file
+
+    public async Task<IActionResult> OnPostAsync()
+    {
+        if (!ModelState.IsValid)
+            return Page();
+
+        var readCommand = new EntityIdentifierQuery<Guid, TopicUpdateModel>(User, Id);
+        var updateModel = await Mediator.Send(readCommand);
+        if (updateModel == null)
+            return NotFound();
+
+        // only update input fields
+        await TryUpdateModelAsync(
+            updateModel,
+            nameof(Entity),
+            p => p.LessonPlan
+        );
+
+        var updateCommand = new EntityUpdateCommand<Guid, TopicUpdateModel, TopicReadModel>(User, Id, updateModel);
+        var result = await Mediator.Send(updateCommand);
+
+        ShowAlert("Successfully saved topic");
+
+        return RedirectToPage("/Topic/Planning/View", new { id = result.Id, tenant = TenantRoute });
+    }
+}
diff --git a/service/src/InstructorIQ.WebApplication/Pages/Topic/Planning/View.cshtml.cs b/service/src/InstructorIQ.WebApplication/Pages/Topic/Planning/View.cshtml.cs
index 83898abc..21e79b11 100644
--- a/service/src/InstructorIQ.WebApplication/Pages/Topic/Planning/View.cshtml.cs
+++ b/service/src/InstructorIQ.WebApplication/Pages/Topic/Planning/View.cshtml.cs
@@ -1,16 +1,17 @@
-using InstructorIQ.Core.Domain.Models;
+using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Multitenancy;
 using InstructorIQ.WebApplication.Models;
+
 using MediatR;
+
 using Microsoft.Extensions.Logging;
 
-namespace InstructorIQ.WebApplication.Pages.Topic.Planning
+namespace InstructorIQ.WebApplication.Pages.Topic.Planning;
+
+public class ViewModel : EntityIdentifierModelBase<TopicReadModel>
 {
-    public class ViewModel : EntityIdentifierModelBase<TopicReadModel>
+    public ViewModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
+        : base(tenant, mediator, loggerFactory)
     {
-        public ViewModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
-            : base(tenant, mediator, loggerFactory)
-        {
-        }
     }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.WebApplication/Pages/Topic/Session/Create.cshtml.cs b/service/src/InstructorIQ.WebApplication/Pages/Topic/Session/Create.cshtml.cs
index 2ca33124..60a48509 100644
--- a/service/src/InstructorIQ.WebApplication/Pages/Topic/Session/Create.cshtml.cs
+++ b/service/src/InstructorIQ.WebApplication/Pages/Topic/Session/Create.cshtml.cs
@@ -1,128 +1,130 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using MediatR.CommandQuery.Commands;
-using MediatR.CommandQuery.Queries;
+
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Domain.Queries;
 using InstructorIQ.Core.Multitenancy;
 using InstructorIQ.Core.Security;
 using InstructorIQ.WebApplication.Models;
+
 using MediatR;
+using MediatR.CommandQuery.Commands;
+using MediatR.CommandQuery.Queries;
+
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 
-namespace InstructorIQ.WebApplication.Pages.Topic.Session
+namespace InstructorIQ.WebApplication.Pages.Topic.Session;
+
+[Authorize(Policy = UserPolicies.AdministratorPolicy)]
+public class CreateModel : EntityCreateModelBase<SessionCreateModel>
 {
-    [Authorize(Policy = UserPolicies.AdministratorPolicy)]
-    public class CreateModel : EntityCreateModelBase<SessionCreateModel>
+    public CreateModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
+        : base(tenant, mediator, loggerFactory)
     {
-        public CreateModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
-            : base(tenant, mediator, loggerFactory)
-        {
 
-        }
+    }
 
 
-        [BindProperty(SupportsGet = true)]
-        public Guid TopicId { get; set; }
+    [BindProperty(SupportsGet = true)]
+    public Guid TopicId { get; set; }
 
-        public TopicReadModel Topic { get; set; }
+    public TopicReadModel Topic { get; set; }
 
-        public IReadOnlyCollection<MemberDropdownModel> Instructors { get; set; }
+    public IReadOnlyCollection<MemberDropdownModel> Instructors { get; set; }
 
-        public IReadOnlyCollection<LocationDropdownModel> Locations { get; set; }
+    public IReadOnlyCollection<LocationDropdownModel> Locations { get; set; }
 
-        public IReadOnlyCollection<GroupDropdownModel> Groups { get; set; }
+    public IReadOnlyCollection<GroupDropdownModel> Groups { get; set; }
 
 
-        public async Task<IActionResult> OnGetAsync()
-        {
-            var loadTopicTask = LoadTopic();
-            var instructorTask = LoadInstructors();
-            var locationTask = LoadLocations();
-            var groupTask = LoadGroups();
+    public async Task<IActionResult> OnGetAsync()
+    {
+        var loadTopicTask = LoadTopic();
+        var instructorTask = LoadInstructors();
+        var locationTask = LoadLocations();
+        var groupTask = LoadGroups();
 
-            // load all in parallel
-            await Task.WhenAll(loadTopicTask, instructorTask, locationTask, groupTask);
+        // load all in parallel
+        await Task.WhenAll(loadTopicTask, instructorTask, locationTask, groupTask);
 
-            Topic = loadTopicTask.Result;
-            Instructors = instructorTask.Result;
-            Locations = locationTask.Result;
-            Groups = groupTask.Result;
+        Topic = loadTopicTask.Result;
+        Instructors = instructorTask.Result;
+        Locations = locationTask.Result;
+        Groups = groupTask.Result;
 
-            // shared layout title
-            ViewData["TopicTitle"] = $" - {Topic.Title}";
+        // shared layout title
+        ViewData["TopicTitle"] = $" - {Topic.Title}";
 
-            Entity.LeadInstructorId = Topic.LeadInstructorId;
+        Entity.LeadInstructorId = Topic.LeadInstructorId;
 
+        return Page();
+    }
+
+    public async Task<IActionResult> OnPostAsync()
+    {
+        if (!ModelState.IsValid)
             return Page();
-        }
 
-        public async Task<IActionResult> OnPostAsync()
+        var createModel = new SessionCreateModel
         {
-            if (!ModelState.IsValid)
-                return Page();
-
-            var createModel = new SessionCreateModel
-            {
-                TopicId = TopicId
-            };
-
-            // only update input fields
-            await TryUpdateModelAsync(
-                createModel,
-                nameof(Entity),
-                p => p.Note,
-                p => p.StartDate,
-                p => p.StartTime,
-                p => p.EndDate,
-                p => p.EndTime,
-                p => p.LocationId,
-                p => p.GroupId,
-                p => p.LeadInstructorId
-            );
-
-            var command = new EntityCreateCommand<SessionCreateModel, SessionReadModel>(User, createModel);
-            var result = await Mediator.Send(command);
-
-            ShowAlert("Successfully created topic session");
-
-            return RedirectToPage("/Topic/Session/Edit", new { result.Id, TopicId, tenant = TenantRoute });
-        }
-
-
-        private async Task<TopicReadModel> LoadTopic()
-        {
-            var command = new EntityIdentifierQuery<Guid, TopicReadModel>(User, TopicId);
-            var result = await Mediator.Send(command);
+            TopicId = TopicId
+        };
+
+        // only update input fields
+        await TryUpdateModelAsync(
+            createModel,
+            nameof(Entity),
+            p => p.Note,
+            p => p.StartDate,
+            p => p.StartTime,
+            p => p.EndDate,
+            p => p.EndTime,
+            p => p.LocationId,
+            p => p.GroupId,
+            p => p.LeadInstructorId
+        );
+
+        var command = new EntityCreateCommand<SessionCreateModel, SessionReadModel>(User, createModel);
+        var result = await Mediator.Send(command);
+
+        ShowAlert("Successfully created topic session");
+
+        return RedirectToPage("/Topic/Session/Edit", new { result.Id, TopicId, tenant = TenantRoute });
+    }
 
-            return result;
-        }
 
-        private async Task<IReadOnlyCollection<MemberDropdownModel>> LoadInstructors()
-        {
-            var dropdownQuery = new MemberDropdownQuery(User, Tenant.Value.Id) { RoleId = Core.Data.Constants.Role.Instructor };
-            var items = await Mediator.Send(dropdownQuery);
+    private async Task<TopicReadModel> LoadTopic()
+    {
+        var command = new EntityIdentifierQuery<Guid, TopicReadModel>(User, TopicId);
+        var result = await Mediator.Send(command);
 
-            return items;
-        }
+        return result;
+    }
 
-        private async Task<IReadOnlyCollection<LocationDropdownModel>> LoadLocations()
-        {
-            var dropdownQuery = new LocationDropdownQuery(User);
-            var items = await Mediator.Send(dropdownQuery);
+    private async Task<IReadOnlyCollection<MemberDropdownModel>> LoadInstructors()
+    {
+        var dropdownQuery = new MemberDropdownQuery(User, Tenant.Value.Id) { RoleId = Core.Data.Constants.Role.Instructor };
+        var items = await Mediator.Send(dropdownQuery);
 
-            return items;
-        }
+        return items;
+    }
 
-        private async Task<IReadOnlyCollection<GroupDropdownModel>> LoadGroups()
-        {
-            var dropdownQuery = new GroupDropdownQuery(User);
-            var items = await Mediator.Send(dropdownQuery);
+    private async Task<IReadOnlyCollection<LocationDropdownModel>> LoadLocations()
+    {
+        var dropdownQuery = new LocationDropdownQuery(User);
+        var items = await Mediator.Send(dropdownQuery);
+
+        return items;
+    }
+
+    private async Task<IReadOnlyCollection<GroupDropdownModel>> LoadGroups()
+    {
+        var dropdownQuery = new GroupDropdownQuery(User);
+        var items = await Mediator.Send(dropdownQuery);
 
-            return items;
-        }
+        return items;
     }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.WebApplication/Pages/Topic/Session/Edit.cshtml.cs b/service/src/InstructorIQ.WebApplication/Pages/Topic/Session/Edit.cshtml.cs
index ed1f0fb5..91bbd8d7 100644
--- a/service/src/InstructorIQ.WebApplication/Pages/Topic/Session/Edit.cshtml.cs
+++ b/service/src/InstructorIQ.WebApplication/Pages/Topic/Session/Edit.cshtml.cs
@@ -1,164 +1,166 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using MediatR.CommandQuery.Commands;
-using MediatR.CommandQuery.Queries;
+
 using InstructorIQ.Core.Domain.Commands;
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Domain.Queries;
 using InstructorIQ.Core.Multitenancy;
 using InstructorIQ.Core.Security;
 using InstructorIQ.WebApplication.Models;
+
 using MediatR;
+using MediatR.CommandQuery.Commands;
+using MediatR.CommandQuery.Queries;
+
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 
-namespace InstructorIQ.WebApplication.Pages.Topic.Session
+namespace InstructorIQ.WebApplication.Pages.Topic.Session;
+
+[Authorize(Policy = UserPolicies.AdministratorPolicy)]
+public class EditModel : EntityIdentifierModelBase<SessionUpdateModel>
 {
-    [Authorize(Policy = UserPolicies.AdministratorPolicy)]
-    public class EditModel : EntityIdentifierModelBase<SessionUpdateModel>
+    public EditModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
+        : base(tenant, mediator, loggerFactory)
     {
-        public EditModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
-            : base(tenant, mediator, loggerFactory)
-        {
-            AdditionalInstructors = new List<Guid>();
-        }
-
-        [BindProperty(SupportsGet = true)]
-        public Guid TopicId { get; set; }
-
-        [BindProperty]
-        public List<Guid> AdditionalInstructors { get; set; }
-
-        public TopicReadModel Topic { get; set; }
-
-        public IReadOnlyCollection<MemberDropdownModel> Instructors { get; set; }
+        AdditionalInstructors = new List<Guid>();
+    }
 
-        public IReadOnlyCollection<LocationDropdownModel> Locations { get; set; }
+    [BindProperty(SupportsGet = true)]
+    public Guid TopicId { get; set; }
 
-        public IReadOnlyCollection<GroupDropdownModel> Groups { get; set; }
+    [BindProperty]
+    public List<Guid> AdditionalInstructors { get; set; }
 
+    public TopicReadModel Topic { get; set; }
 
-        public override async Task<IActionResult> OnGetAsync()
-        {
-            var loadTask = base.OnGetAsync();
-            var loadTopicTask = LoadTopic();
-            var instructorTask = LoadInstructors();
-            var additionalTask = LoadAdditionalInstructors();
-            var locationTask = LoadLocations();
-            var groupTask = LoadGroups();
+    public IReadOnlyCollection<MemberDropdownModel> Instructors { get; set; }
 
-            // load all in parallel
-            await Task.WhenAll(
-                loadTopicTask,
-                loadTask,
-                instructorTask,
-                additionalTask,
-                locationTask,
-                groupTask
-            );
+    public IReadOnlyCollection<LocationDropdownModel> Locations { get; set; }
 
-            Topic = loadTopicTask.Result;
-            Instructors = instructorTask.Result;
-            Locations = locationTask.Result;
-            Groups = groupTask.Result;
+    public IReadOnlyCollection<GroupDropdownModel> Groups { get; set; }
 
-            AdditionalInstructors = additionalTask.Result
-                .Select(i => i.InstructorId)
-                .ToList();
 
-            // shared layout title
-            ViewData["TopicTitle"] = $" - {Topic.Title}";
+    public override async Task<IActionResult> OnGetAsync()
+    {
+        var loadTask = base.OnGetAsync();
+        var loadTopicTask = LoadTopic();
+        var instructorTask = LoadInstructors();
+        var additionalTask = LoadAdditionalInstructors();
+        var locationTask = LoadLocations();
+        var groupTask = LoadGroups();
+
+        // load all in parallel
+        await Task.WhenAll(
+            loadTopicTask,
+            loadTask,
+            instructorTask,
+            additionalTask,
+            locationTask,
+            groupTask
+        );
+
+        Topic = loadTopicTask.Result;
+        Instructors = instructorTask.Result;
+        Locations = locationTask.Result;
+        Groups = groupTask.Result;
+
+        AdditionalInstructors = additionalTask.Result
+            .Select(i => i.InstructorId)
+            .ToList();
+
+        // shared layout title
+        ViewData["TopicTitle"] = $" - {Topic.Title}";
+
+        return Page();
+    }
 
+    public async Task<IActionResult> OnPostAsync()
+    {
+        if (!ModelState.IsValid)
             return Page();
-        }
-
-        public async Task<IActionResult> OnPostAsync()
-        {
-            if (!ModelState.IsValid)
-                return Page();
 
-            var readCommand = new EntityIdentifierQuery<Guid, SessionUpdateModel>(User, Id);
-            var updateModel = await Mediator.Send(readCommand);
-            if (updateModel == null)
-                return NotFound();
-
-            // only update input fields
-            await TryUpdateModelAsync(
-                updateModel,
-                nameof(Entity),
-                p => p.Note,
-                p => p.StartDate,
-                p => p.StartTime,
-                p => p.EndDate,
-                p => p.EndTime,
-                p => p.LocationId,
-                p => p.GroupId,
-                p => p.LeadInstructorId
-            );
-
-            var updateCommand = new EntityUpdateCommand<Guid, SessionUpdateModel, SessionReadModel>(User, Id, updateModel);
-            var result = await Mediator.Send(updateCommand);
-
-            var instructorCommand = new SessionInstructorUpdateCommand(User, Id, AdditionalInstructors);
-            await Mediator.Send(instructorCommand);
-
-            ShowAlert("Successfully saved topic session");
-
-            return RedirectToPage("/Topic/Session/View", new { result.Id, TopicId, tenant = TenantRoute });
-        }
+        var readCommand = new EntityIdentifierQuery<Guid, SessionUpdateModel>(User, Id);
+        var updateModel = await Mediator.Send(readCommand);
+        if (updateModel == null)
+            return NotFound();
+
+        // only update input fields
+        await TryUpdateModelAsync(
+            updateModel,
+            nameof(Entity),
+            p => p.Note,
+            p => p.StartDate,
+            p => p.StartTime,
+            p => p.EndDate,
+            p => p.EndTime,
+            p => p.LocationId,
+            p => p.GroupId,
+            p => p.LeadInstructorId
+        );
+
+        var updateCommand = new EntityUpdateCommand<Guid, SessionUpdateModel, SessionReadModel>(User, Id, updateModel);
+        var result = await Mediator.Send(updateCommand);
+
+        var instructorCommand = new SessionInstructorUpdateCommand(User, Id, AdditionalInstructors);
+        await Mediator.Send(instructorCommand);
+
+        ShowAlert("Successfully saved topic session");
+
+        return RedirectToPage("/Topic/Session/View", new { result.Id, TopicId, tenant = TenantRoute });
+    }
 
-        public async Task<IActionResult> OnPostDeleteEntity()
-        {
-            var command = new EntityDeleteCommand<Guid, SessionReadModel>(User, Id);
-            var result = await Mediator.Send(command);
+    public async Task<IActionResult> OnPostDeleteEntity()
+    {
+        var command = new EntityDeleteCommand<Guid, SessionReadModel>(User, Id);
+        var result = await Mediator.Send(command);
 
-            ShowAlert("Successfully deleted topic");
+        ShowAlert("Successfully deleted topic");
 
-            return RedirectToPage("/Topic/Session/Index", new { Id = TopicId, tenant = TenantRoute });
-        }
+        return RedirectToPage("/Topic/Session/Index", new { Id = TopicId, tenant = TenantRoute });
+    }
 
 
-        private async Task<TopicReadModel> LoadTopic()
-        {
-            var command = new EntityIdentifierQuery<Guid, TopicReadModel>(User, TopicId);
-            var result = await Mediator.Send(command);
+    private async Task<TopicReadModel> LoadTopic()
+    {
+        var command = new EntityIdentifierQuery<Guid, TopicReadModel>(User, TopicId);
+        var result = await Mediator.Send(command);
 
-            return result;
-        }
+        return result;
+    }
 
-        private async Task<IReadOnlyCollection<MemberDropdownModel>> LoadInstructors()
-        {
-            var dropdownQuery = new MemberDropdownQuery(User, Tenant.Value.Id) { RoleId = Core.Data.Constants.Role.Instructor };
-            var items = await Mediator.Send(dropdownQuery);
+    private async Task<IReadOnlyCollection<MemberDropdownModel>> LoadInstructors()
+    {
+        var dropdownQuery = new MemberDropdownQuery(User, Tenant.Value.Id) { RoleId = Core.Data.Constants.Role.Instructor };
+        var items = await Mediator.Send(dropdownQuery);
 
-            return items;
-        }
+        return items;
+    }
 
-        private async Task<IReadOnlyCollection<SessionInstructorModel>> LoadAdditionalInstructors()
-        {
-            var dropdownQuery = new SessionInstructorQuery(User, Id);
-            var items = await Mediator.Send(dropdownQuery);
+    private async Task<IReadOnlyCollection<SessionInstructorModel>> LoadAdditionalInstructors()
+    {
+        var dropdownQuery = new SessionInstructorQuery(User, Id);
+        var items = await Mediator.Send(dropdownQuery);
 
-            return items;
-        }
+        return items;
+    }
 
-        private async Task<IReadOnlyCollection<LocationDropdownModel>> LoadLocations()
-        {
-            var dropdownQuery = new LocationDropdownQuery(User);
-            var items = await Mediator.Send(dropdownQuery);
+    private async Task<IReadOnlyCollection<LocationDropdownModel>> LoadLocations()
+    {
+        var dropdownQuery = new LocationDropdownQuery(User);
+        var items = await Mediator.Send(dropdownQuery);
 
-            return items;
-        }
+        return items;
+    }
 
-        private async Task<IReadOnlyCollection<GroupDropdownModel>> LoadGroups()
-        {
-            var dropdownQuery = new GroupDropdownQuery(User);
-            var items = await Mediator.Send(dropdownQuery);
+    private async Task<IReadOnlyCollection<GroupDropdownModel>> LoadGroups()
+    {
+        var dropdownQuery = new GroupDropdownQuery(User);
+        var items = await Mediator.Send(dropdownQuery);
 
-            return items;
-        }
+        return items;
     }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.WebApplication/Pages/Topic/Session/Index.cshtml.cs b/service/src/InstructorIQ.WebApplication/Pages/Topic/Session/Index.cshtml.cs
index f30460da..a069be71 100644
--- a/service/src/InstructorIQ.WebApplication/Pages/Topic/Session/Index.cshtml.cs
+++ b/service/src/InstructorIQ.WebApplication/Pages/Topic/Session/Index.cshtml.cs
@@ -1,42 +1,44 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Domain.Queries;
 using InstructorIQ.Core.Multitenancy;
 using InstructorIQ.WebApplication.Models;
+
 using MediatR;
+
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 
-namespace InstructorIQ.WebApplication.Pages.Topic.Session
+namespace InstructorIQ.WebApplication.Pages.Topic.Session;
+
+public class IndexModel : EntityIdentifierModelBase<TopicUpdateModel>
 {
-    public class IndexModel : EntityIdentifierModelBase<TopicUpdateModel>
+    public IndexModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
+        : base(tenant, mediator, loggerFactory)
     {
-        public IndexModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
-            : base(tenant, mediator, loggerFactory)
-        {
-            Sort = nameof(SessionReadModel.StartDate);
-        }
+        Sort = nameof(SessionReadModel.StartDate);
+    }
 
-        [BindProperty(Name = "s", SupportsGet = true)]
-        public string Sort { get; set; }
+    [BindProperty(Name = "s", SupportsGet = true)]
+    public string Sort { get; set; }
 
-        public IReadOnlyCollection<SessionCalendarModel> Items { get; set; }
+    public IReadOnlyCollection<SessionCalendarModel> Items { get; set; }
 
-        public override async Task<IActionResult> OnGetAsync()
-        {
-            await base.OnGetAsync();
+    public override async Task<IActionResult> OnGetAsync()
+    {
+        await base.OnGetAsync();
 
-            var query = new SessionTopicQuery(User, Id);
-            var result = await Mediator.Send(query);
+        var query = new SessionTopicQuery(User, Id);
+        var result = await Mediator.Send(query);
 
-            Items = result
-                .OrderBy(r => r.StartDate)
-                .ThenBy(r => r.StartTime)
-                .ToList();
+        Items = result
+            .OrderBy(r => r.StartDate)
+            .ThenBy(r => r.StartTime)
+            .ToList();
 
-            return Page();
-        }
+        return Page();
     }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.WebApplication/Pages/Topic/Session/Multiple.cshtml.cs b/service/src/InstructorIQ.WebApplication/Pages/Topic/Session/Multiple.cshtml.cs
index 9148eb2b..92300f60 100644
--- a/service/src/InstructorIQ.WebApplication/Pages/Topic/Session/Multiple.cshtml.cs
+++ b/service/src/InstructorIQ.WebApplication/Pages/Topic/Session/Multiple.cshtml.cs
@@ -1,173 +1,175 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+
 using InstructorIQ.Core.Domain.Commands;
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Domain.Queries;
 using InstructorIQ.Core.Multitenancy;
 using InstructorIQ.Core.Security;
 using InstructorIQ.WebApplication.Models;
+
 using MediatR;
 using MediatR.CommandQuery.Queries;
+
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 
-namespace InstructorIQ.WebApplication.Pages.Topic.Session
+namespace InstructorIQ.WebApplication.Pages.Topic.Session;
+
+[Authorize(Policy = UserPolicies.AdministratorPolicy)]
+public class MultipleModel : MediatorModelBase
 {
-    [Authorize(Policy = UserPolicies.AdministratorPolicy)]
-    public class MultipleModel : MediatorModelBase
+    public MultipleModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
+        : base(tenant, mediator, loggerFactory)
     {
-        public MultipleModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
-            : base(tenant, mediator, loggerFactory)
-        {
-        }
+    }
 
-        [BindProperty(SupportsGet = true)]
-        public Guid Id { get; set; }
+    [BindProperty(SupportsGet = true)]
+    public Guid Id { get; set; }
 
-        [BindProperty]
-        public List<SessionMultipleUpdateModel> Sessions { get; set; }
+    [BindProperty]
+    public List<SessionMultipleUpdateModel> Sessions { get; set; }
 
-        public TopicReadModel Topic { get; set; }
+    public TopicReadModel Topic { get; set; }
 
-        public IReadOnlyCollection<MemberDropdownModel> Instructors { get; set; }
+    public IReadOnlyCollection<MemberDropdownModel> Instructors { get; set; }
 
-        public IReadOnlyCollection<LocationDropdownModel> Locations { get; set; }
+    public IReadOnlyCollection<LocationDropdownModel> Locations { get; set; }
 
-        public IReadOnlyCollection<GroupDropdownModel> Groups { get; set; }
+    public IReadOnlyCollection<GroupDropdownModel> Groups { get; set; }
 
-        public IReadOnlyCollection<SessionFrequentTimeModel> Times { get; private set; }
+    public IReadOnlyCollection<SessionFrequentTimeModel> Times { get; private set; }
 
-        public async Task<IActionResult> OnGetAsync()
-        {
-            var loadTask = LoadData();
-            var sessionsTask = LoadSessions();
-
-            // load all in parallel
-            await Task.WhenAll(
-                sessionsTask,
-                loadTask
-            );
-
-            // shared layout title
-            ViewData["TopicTitle"] = $" - {Topic.Title}";
-
-            // convert to update
-            Sessions = sessionsTask.Result
-                .OrderBy(s => s.StartDate)
-                .ThenBy(s => s.StartTime)
-                .Select(i => new SessionMultipleUpdateModel
-                {
-                    Id = i.Id,
-                    StartDate = i.StartDate,
-                    StartTime = i.StartTime,
-                    EndDate = i.EndDate,
-                    EndTime = i.EndTime,
-                    GroupId = i.GroupId,
-                    LeadInstructorId = i.LeadInstructorId,
-                    LocationId = i.LocationId,
-                    Note = i.Note,
-                    TopicId = i.TopicId,
-                    TopicTitle = i.TopicTitle,
-                    TenantId = i.TenantId,
-
-                    AdditionalInstructors = i.AdditionalInstructors.Select(s => s.InstructorId).ToList()
-                })
-                .ToList();
+    public async Task<IActionResult> OnGetAsync()
+    {
+        var loadTask = LoadData();
+        var sessionsTask = LoadSessions();
+
+        // load all in parallel
+        await Task.WhenAll(
+            sessionsTask,
+            loadTask
+        );
+
+        // shared layout title
+        ViewData["TopicTitle"] = $" - {Topic.Title}";
+
+        // convert to update
+        Sessions = sessionsTask.Result
+            .OrderBy(s => s.StartDate)
+            .ThenBy(s => s.StartTime)
+            .Select(i => new SessionMultipleUpdateModel
+            {
+                Id = i.Id,
+                StartDate = i.StartDate,
+                StartTime = i.StartTime,
+                EndDate = i.EndDate,
+                EndTime = i.EndTime,
+                GroupId = i.GroupId,
+                LeadInstructorId = i.LeadInstructorId,
+                LocationId = i.LocationId,
+                Note = i.Note,
+                TopicId = i.TopicId,
+                TopicTitle = i.TopicTitle,
+                TenantId = i.TenantId,
+
+                AdditionalInstructors = i.AdditionalInstructors.Select(s => s.InstructorId).ToList()
+            })
+            .ToList();
+
+        return Page();
+    }
 
+    public async Task<IActionResult> OnPostAsync()
+    {
+        if (!ModelState.IsValid)
+        {
+            await LoadData();
             return Page();
         }
 
-        public async Task<IActionResult> OnPostAsync()
-        {
-            if (!ModelState.IsValid)
-            {
-                await LoadData();
-                return Page();
-            }
-
-            var updateCommand = new SessionMultipleUpdateCommand(User, Sessions);
-            var result = await Mediator.Send(updateCommand);
+        var updateCommand = new SessionMultipleUpdateCommand(User, Sessions);
+        var result = await Mediator.Send(updateCommand);
 
-            ShowAlert("Successfully saved topic sessions");
+        ShowAlert("Successfully saved topic sessions");
 
-            return RedirectToPage("/Topic/Session/Index", new { Id, tenant = TenantRoute });
-        }
+        return RedirectToPage("/Topic/Session/Index", new { Id, tenant = TenantRoute });
+    }
 
-        private async Task LoadData()
-        {
-            var topicTask = LoadTopic();
-            var instructorTask = LoadInstructors();
-            var locationTask = LoadLocations();
-            var groupTask = LoadGroups();
-            var timesTask = LoadTimes();
-
-            // load all in parallel
-            await Task.WhenAll(
-                topicTask,
-                instructorTask,
-                locationTask,
-                groupTask,
-                timesTask
-            );
-
-            Topic = topicTask.Result;
-            Instructors = instructorTask.Result;
-            Locations = locationTask.Result;
-            Groups = groupTask.Result;
-            Times = timesTask.Result;
-        }
+    private async Task LoadData()
+    {
+        var topicTask = LoadTopic();
+        var instructorTask = LoadInstructors();
+        var locationTask = LoadLocations();
+        var groupTask = LoadGroups();
+        var timesTask = LoadTimes();
+
+        // load all in parallel
+        await Task.WhenAll(
+            topicTask,
+            instructorTask,
+            locationTask,
+            groupTask,
+            timesTask
+        );
+
+        Topic = topicTask.Result;
+        Instructors = instructorTask.Result;
+        Locations = locationTask.Result;
+        Groups = groupTask.Result;
+        Times = timesTask.Result;
+    }
 
-        private async Task<TopicReadModel> LoadTopic()
-        {
-            var command = new EntityIdentifierQuery<Guid, TopicReadModel>(User, Id);
-            var result = await Mediator.Send(command);
+    private async Task<TopicReadModel> LoadTopic()
+    {
+        var command = new EntityIdentifierQuery<Guid, TopicReadModel>(User, Id);
+        var result = await Mediator.Send(command);
 
-            return result;
-        }
+        return result;
+    }
 
-        private async Task<IReadOnlyCollection<SessionCalendarModel>> LoadSessions()
-        {
-            var query = new SessionTopicQuery(User, Id);
-            var items = await Mediator.Send(query);
+    private async Task<IReadOnlyCollection<SessionCalendarModel>> LoadSessions()
+    {
+        var query = new SessionTopicQuery(User, Id);
+        var items = await Mediator.Send(query);
 
-            return items;
-        }
+        return items;
+    }
 
-        private async Task<IReadOnlyCollection<MemberDropdownModel>> LoadInstructors()
-        {
-            var dropdownQuery = new MemberDropdownQuery(User, Tenant.Value.Id) { RoleId = Core.Data.Constants.Role.Instructor };
-            var items = await Mediator.Send(dropdownQuery);
+    private async Task<IReadOnlyCollection<MemberDropdownModel>> LoadInstructors()
+    {
+        var dropdownQuery = new MemberDropdownQuery(User, Tenant.Value.Id) { RoleId = Core.Data.Constants.Role.Instructor };
+        var items = await Mediator.Send(dropdownQuery);
 
-            return items;
-        }
+        return items;
+    }
 
-        private async Task<IReadOnlyCollection<LocationDropdownModel>> LoadLocations()
-        {
-            var dropdownQuery = new LocationDropdownQuery(User);
-            var items = await Mediator.Send(dropdownQuery);
+    private async Task<IReadOnlyCollection<LocationDropdownModel>> LoadLocations()
+    {
+        var dropdownQuery = new LocationDropdownQuery(User);
+        var items = await Mediator.Send(dropdownQuery);
 
-            return items;
-        }
+        return items;
+    }
 
-        private async Task<IReadOnlyCollection<GroupDropdownModel>> LoadGroups()
-        {
-            var dropdownQuery = new GroupDropdownQuery(User);
-            var items = await Mediator.Send(dropdownQuery);
+    private async Task<IReadOnlyCollection<GroupDropdownModel>> LoadGroups()
+    {
+        var dropdownQuery = new GroupDropdownQuery(User);
+        var items = await Mediator.Send(dropdownQuery);
 
-            return items;
-        }
+        return items;
+    }
 
-        private async Task<IReadOnlyCollection<SessionFrequentTimeModel>> LoadTimes()
-        {
-            var query = new SessionFrequentTimeQuery(User, Tenant.Value.Id);
-            var items = await Mediator.Send(query);
+    private async Task<IReadOnlyCollection<SessionFrequentTimeModel>> LoadTimes()
+    {
+        var query = new SessionFrequentTimeQuery(User, Tenant.Value.Id);
+        var items = await Mediator.Send(query);
 
-            return items;
-        }
+        return items;
+    }
 
 
-    }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.WebApplication/Pages/Topic/Session/Sequence.cshtml.cs b/service/src/InstructorIQ.WebApplication/Pages/Topic/Session/Sequence.cshtml.cs
index ce2a4f63..4079eae6 100644
--- a/service/src/InstructorIQ.WebApplication/Pages/Topic/Session/Sequence.cshtml.cs
+++ b/service/src/InstructorIQ.WebApplication/Pages/Topic/Session/Sequence.cshtml.cs
@@ -1,86 +1,88 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using MediatR.CommandQuery.Queries;
+
 using InstructorIQ.Core.Domain.Commands;
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Domain.Queries;
 using InstructorIQ.Core.Multitenancy;
 using InstructorIQ.Core.Security;
 using InstructorIQ.WebApplication.Models;
+
 using MediatR;
+using MediatR.CommandQuery.Queries;
+
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 
-namespace InstructorIQ.WebApplication.Pages.Topic.Session
+namespace InstructorIQ.WebApplication.Pages.Topic.Session;
+
+[Authorize(Policy = UserPolicies.AdministratorPolicy)]
+public class SequenceModel : MediatorModelBase
 {
-    [Authorize(Policy = UserPolicies.AdministratorPolicy)]
-    public class SequenceModel : MediatorModelBase
+    public SequenceModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
+        : base(tenant, mediator, loggerFactory)
     {
-        public SequenceModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
-            : base(tenant, mediator, loggerFactory)
-        {
-            Selected = new List<int>();
-        }
-
-        [BindProperty(SupportsGet = true)]
-        public Guid Id { get; set; }
+        Selected = new List<int>();
+    }
 
-        [BindProperty]
-        public List<int> Selected { get; set; }
+    [BindProperty(SupportsGet = true)]
+    public Guid Id { get; set; }
 
-        public TopicReadModel Topic { get; set; }
+    [BindProperty]
+    public List<int> Selected { get; set; }
 
-        public IReadOnlyCollection<GroupSequenceModel> Sequences { get; set; }
+    public TopicReadModel Topic { get; set; }
 
+    public IReadOnlyCollection<GroupSequenceModel> Sequences { get; set; }
 
-        public async Task<IActionResult> OnGetAsync()
-        {
-            var topicTask = LoadTopic();
-            var groupsTask = LoadGroups();
 
-            // load all in parallel
-            await Task.WhenAll(
-                topicTask,
-                groupsTask
-            );
+    public async Task<IActionResult> OnGetAsync()
+    {
+        var topicTask = LoadTopic();
+        var groupsTask = LoadGroups();
 
-            Topic = topicTask.Result;
-            Sequences = groupsTask.Result;
+        // load all in parallel
+        await Task.WhenAll(
+            topicTask,
+            groupsTask
+        );
 
-            // shared layout title
-            ViewData["TopicTitle"] = $" - {Topic.Title}";
+        Topic = topicTask.Result;
+        Sequences = groupsTask.Result;
 
-            return Page();
-        }
+        // shared layout title
+        ViewData["TopicTitle"] = $" - {Topic.Title}";
 
-        public async Task<IActionResult> OnPostAsync()
-        {
-            if (Selected.Count == 0)
-                return Page();
+        return Page();
+    }
 
-            var command = new SessionSequenceCreateCommand(User, Id, Selected);
-            var result = await Mediator.Send(command);
+    public async Task<IActionResult> OnPostAsync()
+    {
+        if (Selected.Count == 0)
+            return Page();
 
-            return RedirectToPage("/topic/session/multiple", new { Id, tenant = TenantRoute });
-        }
+        var command = new SessionSequenceCreateCommand(User, Id, Selected);
+        var result = await Mediator.Send(command);
 
-        private async Task<TopicReadModel> LoadTopic()
-        {
-            var command = new EntityIdentifierQuery<Guid, TopicReadModel>(User, Id);
-            var result = await Mediator.Send(command);
+        return RedirectToPage("/topic/session/multiple", new { Id, tenant = TenantRoute });
+    }
 
-            return result;
-        }
+    private async Task<TopicReadModel> LoadTopic()
+    {
+        var command = new EntityIdentifierQuery<Guid, TopicReadModel>(User, Id);
+        var result = await Mediator.Send(command);
 
-        private async Task<IReadOnlyCollection<GroupSequenceModel>> LoadGroups()
-        {
-            var dropdownQuery = new GroupSequenceQuery(User);
-            var items = await Mediator.Send(dropdownQuery);
+        return result;
+    }
 
-            return items;
-        }
+    private async Task<IReadOnlyCollection<GroupSequenceModel>> LoadGroups()
+    {
+        var dropdownQuery = new GroupSequenceQuery(User);
+        var items = await Mediator.Send(dropdownQuery);
 
+        return items;
     }
-}
\ No newline at end of file
+
+}
diff --git a/service/src/InstructorIQ.WebApplication/Pages/Topic/Session/View.cshtml.cs b/service/src/InstructorIQ.WebApplication/Pages/Topic/Session/View.cshtml.cs
index ba5d5311..73d133c4 100644
--- a/service/src/InstructorIQ.WebApplication/Pages/Topic/Session/View.cshtml.cs
+++ b/service/src/InstructorIQ.WebApplication/Pages/Topic/Session/View.cshtml.cs
@@ -1,52 +1,54 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
+
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Domain.Queries;
 using InstructorIQ.Core.Multitenancy;
 using InstructorIQ.WebApplication.Models;
+
 using MediatR;
+
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 
-namespace InstructorIQ.WebApplication.Pages.Topic.Session
+namespace InstructorIQ.WebApplication.Pages.Topic.Session;
+
+public class ViewModel : EntityIdentifierModelBase<SessionReadModel>
 {
-    public class ViewModel : EntityIdentifierModelBase<SessionReadModel>
+    public ViewModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
+        : base(tenant, mediator, loggerFactory)
     {
-        public ViewModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory) 
-            : base(tenant, mediator, loggerFactory)
-        {
-        }
-
-        [BindProperty(SupportsGet = true)]
-        public Guid TopicId { get; set; }
+    }
 
-        public IReadOnlyCollection<SessionInstructorModel> AdditionalInstructors { get; set; }
+    [BindProperty(SupportsGet = true)]
+    public Guid TopicId { get; set; }
 
-        public override async Task<IActionResult> OnGetAsync()
-        {
-            var loadTask = base.OnGetAsync();
-            var additionalTask = LoadAdditionalInstructors();
+    public IReadOnlyCollection<SessionInstructorModel> AdditionalInstructors { get; set; }
 
-            // load all in parallel
-            await Task.WhenAll(
-                loadTask,
-                additionalTask
-            );
+    public override async Task<IActionResult> OnGetAsync()
+    {
+        var loadTask = base.OnGetAsync();
+        var additionalTask = LoadAdditionalInstructors();
 
-            AdditionalInstructors = additionalTask.Result;
+        // load all in parallel
+        await Task.WhenAll(
+            loadTask,
+            additionalTask
+        );
 
-            return Page();
-        }
+        AdditionalInstructors = additionalTask.Result;
 
+        return Page();
+    }
 
-        private async Task<IReadOnlyCollection<SessionInstructorModel>> LoadAdditionalInstructors()
-        {
-            var dropdownQuery = new SessionInstructorQuery(User, Id);
-            var items = await Mediator.Send(dropdownQuery);
 
-            return items;
-        }
+    private async Task<IReadOnlyCollection<SessionInstructorModel>> LoadAdditionalInstructors()
+    {
+        var dropdownQuery = new SessionInstructorQuery(User, Id);
+        var items = await Mediator.Send(dropdownQuery);
 
+        return items;
     }
-}
\ No newline at end of file
+
+}
diff --git a/service/src/InstructorIQ.WebApplication/Pages/Topic/View.cshtml.cs b/service/src/InstructorIQ.WebApplication/Pages/Topic/View.cshtml.cs
index fa8a3f54..af46c63a 100644
--- a/service/src/InstructorIQ.WebApplication/Pages/Topic/View.cshtml.cs
+++ b/service/src/InstructorIQ.WebApplication/Pages/Topic/View.cshtml.cs
@@ -1,21 +1,23 @@
-using System.Globalization;
+using System.Globalization;
+
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Multitenancy;
 using InstructorIQ.WebApplication.Models;
+
 using MediatR;
+
 using Microsoft.Extensions.Logging;
 
-namespace InstructorIQ.WebApplication.Pages.Topic
+namespace InstructorIQ.WebApplication.Pages.Topic;
+
+public class ViewModel : EntityIdentifierModelBase<TopicReadModel>
 {
-    public class ViewModel : EntityIdentifierModelBase<TopicReadModel>
+    public ViewModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
+        : base(tenant, mediator, loggerFactory)
     {
-        public ViewModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
-            : base(tenant, mediator, loggerFactory)
-        {
-        }
-
-        public string MonthName => Entity.TargetMonth.HasValue
-            ? CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(Entity.TargetMonth.Value)
-            : string.Empty;
     }
-}
\ No newline at end of file
+
+    public string MonthName => Entity.TargetMonth.HasValue
+        ? CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(Entity.TargetMonth.Value)
+        : string.Empty;
+}
diff --git a/service/src/InstructorIQ.WebApplication/Pages/User/Notification.cshtml.cs b/service/src/InstructorIQ.WebApplication/Pages/User/Notification.cshtml.cs
index 23cacd58..063d8b08 100644
--- a/service/src/InstructorIQ.WebApplication/Pages/User/Notification.cshtml.cs
+++ b/service/src/InstructorIQ.WebApplication/Pages/User/Notification.cshtml.cs
@@ -1,84 +1,86 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
+
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Multitenancy;
 using InstructorIQ.WebApplication.Models;
+
 using MediatR;
 using MediatR.CommandQuery.Commands;
 using MediatR.CommandQuery.Queries;
+
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.JsonPatch;
 using Microsoft.AspNetCore.JsonPatch.Operations;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 
-namespace InstructorIQ.WebApplication.Pages.User
+namespace InstructorIQ.WebApplication.Pages.User;
+
+[Authorize]
+public class NotificationModel : EntityPagedModelBase<NotificationReadModel>
 {
-    [Authorize]
-    public class NotificationModel : EntityPagedModelBase<NotificationReadModel>
+    public NotificationModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
+        : base(tenant, mediator, loggerFactory)
     {
-        public NotificationModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory)
-            : base(tenant, mediator, loggerFactory)
-        {
-            Sort = $"{nameof(NotificationReadModel.Created)}:desc";
-        }
-
-        public async Task<IActionResult> OnPostMarkRead(Guid notificationId, bool read)
-        {
-            if (read)
-                return RedirectToPage("/user/notification");
+        Sort = $"{nameof(NotificationReadModel.Created)}:desc";
+    }
 
-            var patchModel = new JsonPatchDocument();
-            patchModel.Operations.Add(new Operation
-            {
-                op = "replace",
-                path = $"/{nameof(NotificationReadModel.Read)}",
-                value = DateTimeOffset.UtcNow
-            });
-            var updateCommand = new EntityPatchCommand<Guid, NotificationReadModel>(User, notificationId, patchModel);
-            var result = await Mediator.Send(updateCommand);
-            
+    public async Task<IActionResult> OnPostMarkRead(Guid notificationId, bool read)
+    {
+        if (read)
             return RedirectToPage("/user/notification");
-        }
 
-        protected override EntityQuery CreateQuery()
+        var patchModel = new JsonPatchDocument();
+        patchModel.Operations.Add(new Operation
         {
-            var query = new EntityQuery(null, PageNumber, PageSize, Sort);
-            query.Filter = CreateFilter();
+            op = "replace",
+            path = $"/{nameof(NotificationReadModel.Read)}",
+            value = DateTimeOffset.UtcNow
+        });
+        var updateCommand = new EntityPatchCommand<Guid, NotificationReadModel>(User, notificationId, patchModel);
+        var result = await Mediator.Send(updateCommand);
+
+        return RedirectToPage("/user/notification");
+    }
+
+    protected override EntityQuery CreateQuery()
+    {
+        var query = new EntityQuery(null, PageNumber, PageSize, Sort);
+        query.Filter = CreateFilter();
 
-            return query;
-        }
+        return query;
+    }
 
-        protected override EntityFilter CreateFilter()
+    protected override EntityFilter CreateFilter()
+    {
+        var filters = new List<EntityFilter>
         {
-            var filters = new List<EntityFilter>
+            new EntityFilter
             {
-                new EntityFilter
-                {
-                    Name = nameof(NotificationReadModel.UserName),
-                    Value = User.Identity.Name,
-                    Operator = EntityFilterOperators.Equal
-                }
-            };
+                Name = nameof(NotificationReadModel.UserName),
+                Value = User.Identity.Name,
+                Operator = EntityFilterOperators.Equal
+            }
+        };
 
-            var filter = new EntityFilter
-            {
-                Logic = EntityFilterLogic.And,
-                Filters = filters
-            };
+        var filter = new EntityFilter
+        {
+            Logic = EntityFilterLogic.And,
+            Filters = filters
+        };
 
-            if (string.IsNullOrWhiteSpace(Query))
-                return filter;
+        if (string.IsNullOrWhiteSpace(Query))
+            return filter;
 
-            filters.Add(new EntityFilter
-            {
-                Name = nameof(NotificationReadModel.Message),
-                Value = Query,
-                Operator = EntityFilterOperators.Contains
-            });
+        filters.Add(new EntityFilter
+        {
+            Name = nameof(NotificationReadModel.Message),
+            Value = Query,
+            Operator = EntityFilterOperators.Contains
+        });
 
-            return filter;
-        }
+        return filter;
     }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.WebApplication/Pages/User/Password.cshtml.cs b/service/src/InstructorIQ.WebApplication/Pages/User/Password.cshtml.cs
index 17d293a4..121bb50a 100644
--- a/service/src/InstructorIQ.WebApplication/Pages/User/Password.cshtml.cs
+++ b/service/src/InstructorIQ.WebApplication/Pages/User/Password.cshtml.cs
@@ -1,96 +1,98 @@
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 using System.Threading.Tasks;
+
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Multitenancy;
 using InstructorIQ.WebApplication.Models;
+
 using MediatR;
+
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 
-namespace InstructorIQ.WebApplication.Pages.User
+namespace InstructorIQ.WebApplication.Pages.User;
+
+[Authorize]
+public class PasswordModel : MediatorModelBase
 {
-    [Authorize]
-    public class PasswordModel : MediatorModelBase
+    private readonly UserManager<Core.Data.Entities.User> _userManager;
+    private readonly SignInManager<Core.Data.Entities.User> _signInManager;
+
+    public PasswordModel(
+        ITenant<TenantReadModel> tenant,
+        IMediator mediator,
+        ILoggerFactory loggerFactory,
+        UserManager<Core.Data.Entities.User> userManager,
+        SignInManager<Core.Data.Entities.User> signInManager)
+        : base(tenant, mediator, loggerFactory)
     {
-        private readonly UserManager<Core.Data.Entities.User> _userManager;
-        private readonly SignInManager<Core.Data.Entities.User> _signInManager;
-
-        public PasswordModel(
-            ITenant<TenantReadModel> tenant,
-            IMediator mediator,
-            ILoggerFactory loggerFactory,
-            UserManager<Core.Data.Entities.User> userManager,
-            SignInManager<Core.Data.Entities.User> signInManager)
-            : base(tenant, mediator, loggerFactory)
-        {
-            _userManager = userManager;
-            _signInManager = signInManager;
-        }
+        _userManager = userManager;
+        _signInManager = signInManager;
+    }
 
-        [BindProperty]
-        public InputModel Input { get; set; }
+    [BindProperty]
+    public InputModel Input { get; set; }
 
-        public class InputModel
-        {
-            [Required]
-            [DataType(DataType.Password)]
-            [Display(Name = "Current password")]
-            public string CurrentPassword { get; set; }
-
-            [Required]
-            [StringLength(100, ErrorMessage = "The {0} must be at least {2} and at max {1} characters long.", MinimumLength = 6)]
-            [DataType(DataType.Password)]
-            [Display(Name = "New password")]
-            public string NewPassword { get; set; }
-
-            [DataType(DataType.Password)]
-            [Display(Name = "Confirm new password")]
-            [Compare("NewPassword", ErrorMessage = "The new password and confirmation password do not match.")]
-            public string ConfirmPassword { get; set; }
-        }
+    public class InputModel
+    {
+        [Required]
+        [DataType(DataType.Password)]
+        [Display(Name = "Current password")]
+        public string CurrentPassword { get; set; }
+
+        [Required]
+        [StringLength(100, ErrorMessage = "The {0} must be at least {2} and at max {1} characters long.", MinimumLength = 6)]
+        [DataType(DataType.Password)]
+        [Display(Name = "New password")]
+        public string NewPassword { get; set; }
+
+        [DataType(DataType.Password)]
+        [Display(Name = "Confirm new password")]
+        [Compare("NewPassword", ErrorMessage = "The new password and confirmation password do not match.")]
+        public string ConfirmPassword { get; set; }
+    }
 
-        public async Task<IActionResult> OnGetAsync()
-        {
-            var user = await _userManager.GetUserAsync(User);
-            if (user == null)
-                return NotFound($"Unable to load user with ID '{_userManager.GetUserId(User)}'.");
+    public async Task<IActionResult> OnGetAsync()
+    {
+        var user = await _userManager.GetUserAsync(User);
+        if (user == null)
+            return NotFound($"Unable to load user with ID '{_userManager.GetUserId(User)}'.");
+
+        var hasPassword = await _userManager.HasPasswordAsync(user);
+        if (!hasPassword)
+            return RedirectToPage("./SetPassword");
 
-            var hasPassword = await _userManager.HasPasswordAsync(user);
-            if (!hasPassword)
-                return RedirectToPage("./SetPassword");
+        return Page();
+    }
 
+    public async Task<IActionResult> OnPostAsync()
+    {
+        if (!ModelState.IsValid)
             return Page();
-        }
 
-        public async Task<IActionResult> OnPostAsync()
+        var user = await _userManager.GetUserAsync(User);
+        if (user == null)
         {
-            if (!ModelState.IsValid)
-                return Page();
-
-            var user = await _userManager.GetUserAsync(User);
-            if (user == null)
-            {
-                var userId = _userManager.GetUserId(User);
-                return NotFound($"Unable to load user with ID '{userId}'.");
-            }
+            var userId = _userManager.GetUserId(User);
+            return NotFound($"Unable to load user with ID '{userId}'.");
+        }
 
-            var changePasswordResult = await _userManager.ChangePasswordAsync(user, Input.CurrentPassword, Input.NewPassword);
-            if (!changePasswordResult.Succeeded)
-            {
-                foreach (var error in changePasswordResult.Errors)
-                    ModelState.AddModelError(string.Empty, error.Description);
+        var changePasswordResult = await _userManager.ChangePasswordAsync(user, Input.CurrentPassword, Input.NewPassword);
+        if (!changePasswordResult.Succeeded)
+        {
+            foreach (var error in changePasswordResult.Errors)
+                ModelState.AddModelError(string.Empty, error.Description);
 
-                return Page();
-            }
+            return Page();
+        }
 
-            await _signInManager.RefreshSignInAsync(user);
+        await _signInManager.RefreshSignInAsync(user);
 
-            Logger.LogInformation("User changed their password successfully.");
-            ShowAlert("Your password has been changed");
+        Logger.LogInformation("User changed their password successfully.");
+        ShowAlert("Your password has been changed");
 
-            return RedirectToPage();
-        }
+        return RedirectToPage();
     }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.WebApplication/Pages/User/Profile.cshtml.cs b/service/src/InstructorIQ.WebApplication/Pages/User/Profile.cshtml.cs
index 21859258..d8b3c4cf 100644
--- a/service/src/InstructorIQ.WebApplication/Pages/User/Profile.cshtml.cs
+++ b/service/src/InstructorIQ.WebApplication/Pages/User/Profile.cshtml.cs
@@ -1,137 +1,139 @@
-using System;
+using System;
 using System.ComponentModel.DataAnnotations;
 using System.Threading.Tasks;
+
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Multitenancy;
 using InstructorIQ.WebApplication.Models;
+
 using MediatR;
+
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 
-namespace InstructorIQ.WebApplication.Pages.User
+namespace InstructorIQ.WebApplication.Pages.User;
+
+[Authorize]
+public class ProfileModel : MediatorModelBase
 {
-    [Authorize]
-    public class ProfileModel : MediatorModelBase
+    private readonly SignInManager<Core.Data.Entities.User> _signInManager;
+    private readonly UserManager<Core.Data.Entities.User> _userManager;
+
+    public ProfileModel(
+        ITenant<TenantReadModel> tenant,
+        IMediator mediator,
+        ILoggerFactory loggerFactory,
+        UserManager<Core.Data.Entities.User> userManager,
+        SignInManager<Core.Data.Entities.User> signInManager)
+        : base(tenant, mediator, loggerFactory)
     {
-        private readonly SignInManager<Core.Data.Entities.User> _signInManager;
-        private readonly UserManager<Core.Data.Entities.User> _userManager;
-
-        public ProfileModel(
-            ITenant<TenantReadModel> tenant,
-            IMediator mediator,
-            ILoggerFactory loggerFactory,
-            UserManager<Core.Data.Entities.User> userManager,
-            SignInManager<Core.Data.Entities.User> signInManager)
-            : base(tenant, mediator, loggerFactory)
-        {
-            _userManager = userManager;
-            _signInManager = signInManager;
-        }
+        _userManager = userManager;
+        _signInManager = signInManager;
+    }
 
-        [BindProperty]
-        public InputModel Input { get; set; }
+    [BindProperty]
+    public InputModel Input { get; set; }
 
-        public string Username { get; set; }
+    public string Username { get; set; }
 
-        public class InputModel
-        {
-            [Required]
-            [Display(Name = "Display Name")]
-            public string DisplayName { get; set; }
+    public class InputModel
+    {
+        [Required]
+        [Display(Name = "Display Name")]
+        public string DisplayName { get; set; }
 
-            [Required]
-            [EmailAddress]
-            [Display(Name = "Email Address")]
-            public string Email { get; set; }
+        [Required]
+        [EmailAddress]
+        [Display(Name = "Email Address")]
+        public string Email { get; set; }
 
-            [Phone]
-            [Display(Name = "Phone number")]
-            public string PhoneNumber { get; set; }
+        [Phone]
+        [Display(Name = "Phone number")]
+        public string PhoneNumber { get; set; }
 
-            [Display(Name = "First Name")]
-            public string GivenName { get; set; }
+        [Display(Name = "First Name")]
+        public string GivenName { get; set; }
 
-            [Display(Name = "Last Name")]
-            public string FamilyName { get; set; }
+        [Display(Name = "Last Name")]
+        public string FamilyName { get; set; }
 
-            [Display(Name = "Title")]
-            public string JobTitle { get; set; }
-        }
+        [Display(Name = "Title")]
+        public string JobTitle { get; set; }
+    }
+
+
+    public async Task<IActionResult> OnGetAsync()
+    {
+        var user = await _userManager.GetUserAsync(User);
+        if (user == null)
+            return NotFound($"Unable to load user with ID '{_userManager.GetUserId(User)}'.");
+
+        var displayName = user.DisplayName;
+        var userName = await _userManager.GetUserNameAsync(user);
+        var email = await _userManager.GetEmailAsync(user);
+        var phoneNumber = await _userManager.GetPhoneNumberAsync(user);
 
+        Username = userName;
 
-        public async Task<IActionResult> OnGetAsync()
+        Input = new InputModel
         {
-            var user = await _userManager.GetUserAsync(User);
-            if (user == null)
-                return NotFound($"Unable to load user with ID '{_userManager.GetUserId(User)}'.");
-
-            var displayName = user.DisplayName;
-            var userName = await _userManager.GetUserNameAsync(user);
-            var email = await _userManager.GetEmailAsync(user);
-            var phoneNumber = await _userManager.GetPhoneNumberAsync(user);
-
-            Username = userName;
-
-            Input = new InputModel
-            {
-                DisplayName = displayName,
-                Email = email,
-                PhoneNumber = phoneNumber,
-                JobTitle = user.JobTitle,
-                FamilyName = user.FamilyName,
-                GivenName = user.GivenName
-            };
+            DisplayName = displayName,
+            Email = email,
+            PhoneNumber = phoneNumber,
+            JobTitle = user.JobTitle,
+            FamilyName = user.FamilyName,
+            GivenName = user.GivenName
+        };
+
+        return Page();
+    }
 
+    public async Task<IActionResult> OnPostAsync()
+    {
+        if (!ModelState.IsValid)
             return Page();
-        }
 
-        public async Task<IActionResult> OnPostAsync()
+        var user = await _userManager.GetUserAsync(User);
+        if (user == null)
+            return NotFound($"Unable to load user '{User}'.");
+
+        var userId = await _userManager.GetUserIdAsync(user);
+
+        var email = await _userManager.GetEmailAsync(user);
+        if (Input.Email != email)
         {
-            if (!ModelState.IsValid)
-                return Page();
-
-            var user = await _userManager.GetUserAsync(User);
-            if (user == null)
-                return NotFound($"Unable to load user '{User}'.");
-
-            var userId = await _userManager.GetUserIdAsync(user);
-
-            var email = await _userManager.GetEmailAsync(user);
-            if (Input.Email != email)
-            {
-                var setEmailResult = await _userManager.SetEmailAsync(user, Input.Email);
-                CheckResult(setEmailResult, userId);
-            }
-
-            var phoneNumber = await _userManager.GetPhoneNumberAsync(user);
-            if (Input.PhoneNumber != phoneNumber)
-            {
-                var setPhoneResult = await _userManager.SetPhoneNumberAsync(user, Input.PhoneNumber);
-                CheckResult(setPhoneResult, userId);
-            }
-
-            user.DisplayName = Input.DisplayName;
-            user.GivenName = Input.GivenName;
-            user.FamilyName = Input.FamilyName;
-            user.JobTitle = Input.JobTitle;
-
-            var updateResult = await _userManager.UpdateAsync(user);
-            CheckResult(updateResult, userId);
-            
-            await _signInManager.RefreshSignInAsync(user);
-            ShowAlert("Your profile has been updated");
-
-            return RedirectToPage();
+            var setEmailResult = await _userManager.SetEmailAsync(user, Input.Email);
+            CheckResult(setEmailResult, userId);
         }
 
-        private void CheckResult(IdentityResult identityResult, string userId)
+        var phoneNumber = await _userManager.GetPhoneNumberAsync(user);
+        if (Input.PhoneNumber != phoneNumber)
         {
-            if (identityResult.Succeeded)
-                return;
-
-            throw new InvalidOperationException($"Unexpected error occurred updating user with ID '{userId}'.");
+            var setPhoneResult = await _userManager.SetPhoneNumberAsync(user, Input.PhoneNumber);
+            CheckResult(setPhoneResult, userId);
         }
+
+        user.DisplayName = Input.DisplayName;
+        user.GivenName = Input.GivenName;
+        user.FamilyName = Input.FamilyName;
+        user.JobTitle = Input.JobTitle;
+
+        var updateResult = await _userManager.UpdateAsync(user);
+        CheckResult(updateResult, userId);
+
+        await _signInManager.RefreshSignInAsync(user);
+        ShowAlert("Your profile has been updated");
+
+        return RedirectToPage();
+    }
+
+    private void CheckResult(IdentityResult identityResult, string userId)
+    {
+        if (identityResult.Succeeded)
+            return;
+
+        throw new InvalidOperationException($"Unexpected error occurred updating user with ID '{userId}'.");
     }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.WebApplication/Pages/User/SetPassword.cshtml.cs b/service/src/InstructorIQ.WebApplication/Pages/User/SetPassword.cshtml.cs
index 2c025897..d24058b8 100644
--- a/service/src/InstructorIQ.WebApplication/Pages/User/SetPassword.cshtml.cs
+++ b/service/src/InstructorIQ.WebApplication/Pages/User/SetPassword.cshtml.cs
@@ -1,87 +1,89 @@
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 using System.Threading.Tasks;
+
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Multitenancy;
 using InstructorIQ.WebApplication.Models;
+
 using MediatR;
+
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 
-namespace InstructorIQ.WebApplication.Pages.User
+namespace InstructorIQ.WebApplication.Pages.User;
+
+[Authorize]
+public class SetPasswordModel : MediatorModelBase
 {
-    [Authorize]
-    public class SetPasswordModel : MediatorModelBase
+    private readonly UserManager<Core.Data.Entities.User> _userManager;
+    private readonly SignInManager<Core.Data.Entities.User> _signInManager;
+
+    public SetPasswordModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory, UserManager<Core.Data.Entities.User> userManager, SignInManager<Core.Data.Entities.User> signInManager)
+        : base(tenant, mediator, loggerFactory)
     {
-        private readonly UserManager<Core.Data.Entities.User> _userManager;
-        private readonly SignInManager<Core.Data.Entities.User> _signInManager;
+        _userManager = userManager;
+        _signInManager = signInManager;
+    }
 
-        public SetPasswordModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory, UserManager<Core.Data.Entities.User> userManager, SignInManager<Core.Data.Entities.User> signInManager)
-            : base(tenant, mediator, loggerFactory)
-        {
-            _userManager = userManager;
-            _signInManager = signInManager;
-        }
+    [BindProperty]
+    public InputModel Input { get; set; }
 
-        [BindProperty]
-        public InputModel Input { get; set; }
+    public class InputModel
+    {
+        [Required]
+        [StringLength(100, ErrorMessage = "The {0} must be at least {2} and at max {1} characters long.", MinimumLength = 6)]
+        [DataType(DataType.Password)]
+        [Display(Name = "New password")]
+        public string NewPassword { get; set; }
+
+        [DataType(DataType.Password)]
+        [Display(Name = "Confirm new password")]
+        [Compare("NewPassword", ErrorMessage = "The new password and confirmation password do not match.")]
+        public string ConfirmPassword { get; set; }
+    }
 
-        public class InputModel
-        {
-            [Required]
-            [StringLength(100, ErrorMessage = "The {0} must be at least {2} and at max {1} characters long.", MinimumLength = 6)]
-            [DataType(DataType.Password)]
-            [Display(Name = "New password")]
-            public string NewPassword { get; set; }
-
-            [DataType(DataType.Password)]
-            [Display(Name = "Confirm new password")]
-            [Compare("NewPassword", ErrorMessage = "The new password and confirmation password do not match.")]
-            public string ConfirmPassword { get; set; }
-        }
+    public async Task<IActionResult> OnGetAsync()
+    {
+        var user = await _userManager.GetUserAsync(User);
+        if (user == null)
+            return NotFound($"Unable to load user with ID '{_userManager.GetUserId(User)}'.");
 
-        public async Task<IActionResult> OnGetAsync()
-        {
-            var user = await _userManager.GetUserAsync(User);
-            if (user == null)
-                return NotFound($"Unable to load user with ID '{_userManager.GetUserId(User)}'.");
+        var hasPassword = await _userManager.HasPasswordAsync(user);
+        if (hasPassword)
+            return RedirectToPage("/User/Password");
 
-            var hasPassword = await _userManager.HasPasswordAsync(user);
-            if (hasPassword)
-                return RedirectToPage("/User/Password");
+        return Page();
+    }
 
+    public async Task<IActionResult> OnPostAsync()
+    {
+        if (!ModelState.IsValid)
             return Page();
-        }
 
-        public async Task<IActionResult> OnPostAsync()
+        var user = await _userManager.GetUserAsync(User);
+        if (user == null)
         {
-            if (!ModelState.IsValid)
-                return Page();
-
-            var user = await _userManager.GetUserAsync(User);
-            if (user == null)
-            {
-                var userId = _userManager.GetUserId(User);
-                return NotFound($"Unable to load user with ID '{userId}'.");
-            }
-
-            var changePasswordResult = await _userManager.AddPasswordAsync(user, Input.NewPassword);
-            if (!changePasswordResult.Succeeded)
-            {
-                foreach (var error in changePasswordResult.Errors)
-                    ModelState.AddModelError(string.Empty, error.Description);
+            var userId = _userManager.GetUserId(User);
+            return NotFound($"Unable to load user with ID '{userId}'.");
+        }
 
-                return Page();
-            }
+        var changePasswordResult = await _userManager.AddPasswordAsync(user, Input.NewPassword);
+        if (!changePasswordResult.Succeeded)
+        {
+            foreach (var error in changePasswordResult.Errors)
+                ModelState.AddModelError(string.Empty, error.Description);
 
-            await _signInManager.RefreshSignInAsync(user);
+            return Page();
+        }
 
-            Logger.LogInformation("User set their password successfully.");
-            ShowAlert("Your password has been changed");
+        await _signInManager.RefreshSignInAsync(user);
 
-            return RedirectToPage();
-        }
+        Logger.LogInformation("User set their password successfully.");
+        ShowAlert("Your password has been changed");
 
+        return RedirectToPage();
     }
-}
\ No newline at end of file
+
+}
diff --git a/service/src/InstructorIQ.WebApplication/Pages/User/Tenant.cshtml.cs b/service/src/InstructorIQ.WebApplication/Pages/User/Tenant.cshtml.cs
index bab71db1..5d329af1 100644
--- a/service/src/InstructorIQ.WebApplication/Pages/User/Tenant.cshtml.cs
+++ b/service/src/InstructorIQ.WebApplication/Pages/User/Tenant.cshtml.cs
@@ -1,86 +1,88 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
+
 using InstructorIQ.Core.Domain.Commands;
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Domain.Queries;
 using InstructorIQ.Core.Multitenancy;
 using InstructorIQ.WebApplication.Models;
+
 using MediatR;
 using MediatR.CommandQuery.Queries;
+
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 
-namespace InstructorIQ.WebApplication.Pages.User
+namespace InstructorIQ.WebApplication.Pages.User;
+
+[Authorize]
+public class TenantModel : EntityPagedModelBase<TenantReadModel>
 {
-    [Authorize]
-    public class TenantModel : EntityPagedModelBase<TenantReadModel>
-    {
-        private readonly SignInManager<Core.Data.Entities.User> _signInManager;
-        private readonly UserManager<Core.Data.Entities.User> _userManager;
+    private readonly SignInManager<Core.Data.Entities.User> _signInManager;
+    private readonly UserManager<Core.Data.Entities.User> _userManager;
 
-        public TenantModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory, SignInManager<Core.Data.Entities.User> signInManager, UserManager<Core.Data.Entities.User> userManager)
-            : base(tenant, mediator, loggerFactory)
-        {
-            _signInManager = signInManager;
-            _userManager = userManager;
-        }
+    public TenantModel(ITenant<TenantReadModel> tenant, IMediator mediator, ILoggerFactory loggerFactory, SignInManager<Core.Data.Entities.User> signInManager, UserManager<Core.Data.Entities.User> userManager)
+        : base(tenant, mediator, loggerFactory)
+    {
+        _signInManager = signInManager;
+        _userManager = userManager;
+    }
 
-        public override async Task<IActionResult> OnGetAsync()
-        {
-            var query = CreateQuery();
-            var command = new TenantPagedQuery(User, query);
+    public override async Task<IActionResult> OnGetAsync()
+    {
+        var query = CreateQuery();
+        var command = new TenantPagedQuery(User, query);
 
-            var result = await Mediator.Send<EntityPagedResult<TenantReadModel>>(command);
-            Total = result.Total;
-            Items = result.Data;
+        var result = await Mediator.Send<EntityPagedResult<TenantReadModel>>(command);
+        Total = result.Total;
+        Items = result.Data;
 
-            return Page();
-        }
+        return Page();
+    }
 
-        public async Task<IActionResult> OnPostChangeTenant(Guid tenantId)
-        {
-            var user = await _userManager.GetUserAsync(User);
-            if (user == null)
-                return NotFound($"Unable to load user with ID '{_userManager.GetUserId(User)}'.");
+    public async Task<IActionResult> OnPostChangeTenant(Guid tenantId)
+    {
+        var user = await _userManager.GetUserAsync(User);
+        if (user == null)
+            return NotFound($"Unable to load user with ID '{_userManager.GetUserId(User)}'.");
 
-            // change tenant id
-            user.LastTenantId = tenantId;
+        // change tenant id
+        user.LastTenantId = tenantId;
 
-            var identityResult = await _userManager.UpdateAsync(user);
-            if (!identityResult.Succeeded)
-                throw new InvalidOperationException($"Unexpected error occurred updating user with ID '{_userManager.GetUserId(User)}'.");
+        var identityResult = await _userManager.UpdateAsync(user);
+        if (!identityResult.Succeeded)
+            throw new InvalidOperationException($"Unexpected error occurred updating user with ID '{_userManager.GetUserId(User)}'.");
 
-            await _signInManager.RefreshSignInAsync(user);
+        await _signInManager.RefreshSignInAsync(user);
 
-            return RedirectToPage("/Index");
-        }
+        return RedirectToPage("/Index");
+    }
 
-        protected override EntityFilter CreateFilter()
+    protected override EntityFilter CreateFilter()
+    {
+        var filter = new EntityFilter
         {
-            var filter = new EntityFilter
+            Logic = EntityFilterLogic.Or,
+            Filters = new List<EntityFilter>
             {
-                Logic = EntityFilterLogic.Or,
-                Filters = new List<EntityFilter>
+                new EntityFilter
+                {
+                    Name = nameof(TenantReadModel.Name),
+                    Value = Query,
+                    Operator = EntityFilterOperators.Contains
+                },
+                new EntityFilter
                 {
-                    new EntityFilter
-                    {
-                        Name = nameof(TenantReadModel.Name),
-                        Value = Query,
-                        Operator = EntityFilterOperators.Contains
-                    },
-                    new EntityFilter
-                    {
-                        Name = nameof(TenantReadModel.Description),
-                        Value = Query,
-                        Operator = EntityFilterOperators.Contains
-                    }
+                    Name = nameof(TenantReadModel.Description),
+                    Value = Query,
+                    Operator = EntityFilterOperators.Contains
                 }
-            };
+            }
+        };
 
-            return filter;
-        }
+        return filter;
     }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.WebApplication/Program.cs b/service/src/InstructorIQ.WebApplication/Program.cs
index ce09351e..7459b80a 100644
--- a/service/src/InstructorIQ.WebApplication/Program.cs
+++ b/service/src/InstructorIQ.WebApplication/Program.cs
@@ -1,67 +1,301 @@
 using System;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
 
-using Microsoft.AspNetCore.Hosting;
+using FluentValidation.AspNetCore;
+
+using InstructorIQ.Core.Converters;
+using InstructorIQ.Core.Data;
+using InstructorIQ.Core.Data.Entities;
+using InstructorIQ.Core.Domain.Models;
+using InstructorIQ.Core.Extensions;
+using InstructorIQ.Core.Multitenancy;
+using InstructorIQ.Core.Security;
+using InstructorIQ.WebApplication.Rewrite;
+
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.AspNetCore.ResponseCompression;
+using Microsoft.AspNetCore.Rewrite;
+using Microsoft.AspNetCore.StaticFiles;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 
 using Serilog;
 using Serilog.Events;
 using Serilog.Formatting.Compact;
 
-namespace InstructorIQ.WebApplication
+namespace InstructorIQ.WebApplication;
+
+public static class Program
 {
-    public static class Program
+    private const string OutputTemplate = "{Timestamp:HH:mm:ss.fff} [{Level:u1}] {Message:lj}{NewLine}{Exception}";
+
+    public static async Task<int> Main(string[] args)
     {
-        public static int Main(string[] args)
+        // azure home directory
+        var homeDirectory = Environment.GetEnvironmentVariable("HOME") ?? ".";
+        var logDirectory = Path.Combine(homeDirectory, "LogFiles");
+
+        Log.Logger = new LoggerConfiguration()
+            .MinimumLevel.Verbose()
+            .MinimumLevel.Override("Microsoft", LogEventLevel.Information)
+            .Enrich.FromLogContext()
+            .WriteTo.Console(outputTemplate: OutputTemplate)
+            .WriteTo.File(
+                path: $"{logDirectory}/boot.txt",
+                rollingInterval: RollingInterval.Day,
+                shared: true,
+                flushToDiskInterval: TimeSpan.FromSeconds(1),
+                outputTemplate: OutputTemplate,
+                retainedFileCountLimit: 10
+            )
+            .WriteTo.File(
+                formatter: new CompactJsonFormatter(),
+                path: $"{logDirectory}/boot.clef",
+                rollingInterval: RollingInterval.Day,
+                shared: true,
+                flushToDiskInterval: TimeSpan.FromSeconds(1),
+                retainedFileCountLimit: 30
+            )
+            .CreateBootstrapLogger();
+
+        try
+        {
+            Log.Information("Starting web host");
+
+            var builder = Microsoft.AspNetCore.Builder.WebApplication.CreateBuilder(args);
+
+            builder.Host
+                .UseSerilog((context, services, configuration) => configuration
+                    .ReadFrom.Configuration(context.Configuration)
+                    .ReadFrom.Services(services)
+                    .Enrich.FromLogContext()
+                    .Enrich.WithProperty("ApplicationName", builder.Environment.ApplicationName)
+                    .Enrich.WithProperty("EnvironmentName", builder.Environment.EnvironmentName)
+                    .WriteTo.Console(outputTemplate: OutputTemplate)
+                    .WriteTo.File(
+                        path: $"{logDirectory}/log.txt",
+                        rollingInterval: RollingInterval.Day,
+                        shared: true,
+                        flushToDiskInterval: TimeSpan.FromSeconds(1),
+                        outputTemplate: OutputTemplate,
+                        retainedFileCountLimit: 10
+                    )
+                    .WriteTo.AzureTableStorage(
+                        connectionString: context.Configuration.GetConnectionString("StorageAccount"),
+                        propertyColumns: new[] { "SourceContext", "RequestId", "RequestPath", "ConnectionId", "ApplicationName", "EnvironmentName" }
+                    )
+                );
+
+            ConfigureServices(builder);
+
+            var app = builder.Build();
+
+            ConfigureMiddleware(app);
+
+            await app.RunAsync();
+
+            return 0;
+        }
+        catch (Exception ex)
         {
-            // azure home directory
-            var homeDirectory = Environment.GetEnvironmentVariable("HOME") ?? ".";
-
-            Log.Logger = new LoggerConfiguration()
-                .MinimumLevel.Verbose()
-                .MinimumLevel.Override("Microsoft", LogEventLevel.Information)
-                .Enrich.FromLogContext()
-                .WriteTo.Console(outputTemplate: "{Timestamp:HH:mm:ss.fff} [{Level:u1}] {Message:lj}{NewLine}{Exception}")
-                .WriteTo.File(
-                    path: $"{homeDirectory}/LogFiles/WebApplication/log.txt",
-                    rollingInterval: RollingInterval.Day,
-                    shared: true,
-                    flushToDiskInterval: TimeSpan.FromSeconds(1),
-                    outputTemplate: "{Timestamp:HH:mm:ss.fff} [{Level:u1}] {Message:lj}{NewLine}{Exception}",
-                    retainedFileCountLimit: 10
+            Log.Fatal(ex, "Host terminated unexpectedly");
+            return 1;
+        }
+        finally
+        {
+            Log.CloseAndFlush();
+        }
+    }
+
+    private static void ConfigureServices(WebApplicationBuilder builder)
+    {
+        var services = builder.Services;
+        var configuration = builder.Configuration;
+
+        services.Configure<CookiePolicyOptions>(options =>
+        {
+            options.CheckConsentNeeded = context => false;
+            options.MinimumSameSitePolicy = SameSiteMode.None;
+        });
+        services.Configure<IdentityOptions>(options =>
+        {
+            options.Password.RequireDigit = false;
+            options.Password.RequireLowercase = false;
+            options.Password.RequireNonAlphanumeric = false;
+            options.Password.RequireUppercase = false;
+        });
+
+        services.ConfigureApplicationCookie(options =>
+        {
+            options.Cookie.HttpOnly = true;
+            options.Cookie.Name = ".InstructorIQ.Authentication";
+            options.SlidingExpiration = true;
+            options.LoginPath = "/Account/Login";
+            options.LogoutPath = "/Account/Logout";
+            options.AccessDeniedPath = "/Account/AccessDenied";
+        });
+
+        services.AddInstructorIQCore();
+        services.AddInstructorIQWebApplication();
+
+        services.AddIdentity<User, Role>()
+            .AddEntityFrameworkStores<InstructorIQContext>()
+            .AddDefaultTokenProviders();
+
+        services.AddMultitenancy<TenantReadModel, TenantContextResolver>();
+
+        services.AddResponseCaching();
+
+        services.AddResponseCompression(options =>
+        {
+            options.Providers.Add<BrotliCompressionProvider>();
+            options.Providers.Add<GzipCompressionProvider>();
+            options.MimeTypes = ResponseCompressionDefaults.MimeTypes.Concat(new[]
+            {
+                "font/woff2",
+                "image/svg+xml"
+            });
+            options.EnableForHttps = true;
+        });
+
+        services
+            .AddRazorPages()
+            .AddRazorPagesOptions(options =>
+            {
+                options.Conventions.AddPageTenantRoute("/Index", false);
+                options.Conventions.AddFolderTenantRoute("/Account", false);
+                options.Conventions.AddFolderTenantRoute("/Attendance");
+                options.Conventions.AddFolderTenantRoute("/Calendar");
+                options.Conventions.AddFolderTenantRoute("/Group");
+                options.Conventions.AddFolderTenantRoute("/Instructor");
+                options.Conventions.AddFolderTenantRoute("/Location");
+                options.Conventions.AddFolderTenantRoute("/Member");
+                options.Conventions.AddFolderTenantRoute("/Report");
+                options.Conventions.AddFolderTenantRoute("/Session");
+                options.Conventions.AddFolderTenantRoute("/SignUp");
+                options.Conventions.AddFolderTenantRoute("/Topic");
+                options.Conventions.AddFolderTenantRoute("/Template");
+                options.Conventions.AddFolderTenantRoute("/User", false);
+            })
+            .AddJsonOptions(options =>
+            {
+                options.JsonSerializerOptions.Converters.Add(new TimeSpanConverter());
+            });
+
+        services
+            .AddFluentValidationAutoValidation()
+            .AddFluentValidationClientsideAdapters();
+
+        services.AddUrlHelper();
+
+        services.AddAuthorization(options =>
+        {
+            options.AddPolicy(
+                UserPolicies.UserPolicy,
+                policy => policy.RequireRole(
+                    Core.Data.Constants.Role.GlobalAdministrator,
+                    Core.Data.Constants.Role.AdministratorName,
+                    Core.Data.Constants.Role.InstructorName,
+                    Core.Data.Constants.Role.AttendeeName,
+                    Core.Data.Constants.Role.MemberName
+                )
+            );
+            options.AddPolicy(
+                UserPolicies.InstructorPolicy,
+                policy => policy.RequireRole(
+                    Core.Data.Constants.Role.GlobalAdministrator,
+                    Core.Data.Constants.Role.AdministratorName,
+                    Core.Data.Constants.Role.InstructorName
                 )
-                .WriteTo.File(
-                    formatter: new CompactJsonFormatter(),
-                    path: $"{homeDirectory}/LogFiles/WebApplication/log.clef",
-                    rollingInterval: RollingInterval.Day,
-                    shared: true,
-                    flushToDiskInterval: TimeSpan.FromSeconds(1),
-                    retainedFileCountLimit: 30
+            );
+            options.AddPolicy(
+                UserPolicies.AdministratorPolicy,
+                policy => policy.RequireRole(
+                    Core.Data.Constants.Role.GlobalAdministrator,
+                    Core.Data.Constants.Role.AdministratorName
                 )
-                .CreateLogger();
+            );
+            options.AddPolicy(
+                UserPolicies.GlobalAdministratorPolicy,
+                policy => policy.RequireRole(
+                    Core.Data.Constants.Role.GlobalAdministrator
+                )
+            );
+        });
+
+    }
+
+    private static void ConfigureMiddleware(Microsoft.AspNetCore.Builder.WebApplication app)
+    {
+        if (app.Environment.IsDevelopment())
+        {
+            app.UseDeveloperExceptionPage();
+        }
+        else
+        {
+            app.UseExceptionHandler("/Error");
+            app.UseHsts();
+        }
 
-            try
+        var policyCollection = new HeaderPolicyCollection()
+            .AddXssProtectionBlock()
+            .AddContentTypeOptionsNoSniff()
+            .AddStrictTransportSecurityMaxAge()
+            .AddReferrerPolicyStrictOriginWhenCrossOrigin()
+            .RemoveServerHeader()
+            .AddContentSecurityPolicy(builder =>
             {
-                Log.Information("Starting web host");
+                builder.AddObjectSrc().None();
+                builder.AddFormAction().Self();
+            });
 
-                var host = Host
-                    .CreateDefaultBuilder(args)
-                    .ConfigureWebHostDefaults(webBuilder => webBuilder.UseStartup<Startup>())
-                    .UseSerilog()
-                    .Build();
+        app.UseSecurityHeaders(policyCollection);
 
-                host.Run();
+        app.UseResponseCompression();
 
-                return 0;
-            }
-            catch (Exception ex)
+        app.UseRewriter(new RewriteOptions()
+            .Add(new RedirectToNonWwwRule(308))
+            .AddRedirectToHttpsPermanent()
+        );
+        app.UseHttpsRedirection();
+
+        app.UseStaticFiles(new StaticFileOptions
+        {
+            ContentTypeProvider = new FileExtensionContentTypeProvider
             {
-                Log.Fatal(ex, "Host terminated unexpectedly");
-                return 1;
-            }
-            finally
+                Mappings =
+                {
+                    [".webmanifest"] = "application/manifest+json"
+                }
+            },
+            OnPrepareResponse = context =>
             {
-                Log.CloseAndFlush();
+                var headers = context.Context.Response.GetTypedHeaders();
+                headers.CacheControl = new Microsoft.Net.Http.Headers.CacheControlHeaderValue
+                {
+                    Public = true,
+                    MaxAge = TimeSpan.FromDays(365)
+                };
             }
-        }
+        });
+
+        app.UseCookiePolicy();
+
+        app.UseRouting();
+
+        app.UseAuthentication();
+        app.UseAuthorization();
+
+        app.UseResponseCaching();
+
+        app.UseMultitenancy<TenantReadModel>();
+
+        app.MapRazorPages();
+        app.MapControllers();
     }
 }
diff --git a/service/src/InstructorIQ.WebApplication/Rewrite/RedirectToNonWwwRule.cs b/service/src/InstructorIQ.WebApplication/Rewrite/RedirectToNonWwwRule.cs
index f3864308..73c48bb2 100644
--- a/service/src/InstructorIQ.WebApplication/Rewrite/RedirectToNonWwwRule.cs
+++ b/service/src/InstructorIQ.WebApplication/Rewrite/RedirectToNonWwwRule.cs
@@ -1,46 +1,46 @@
-using System;
+using System;
+
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Extensions;
 using Microsoft.AspNetCore.Rewrite;
 using Microsoft.Extensions.Logging;
 using Microsoft.Net.Http.Headers;
 
-namespace InstructorIQ.WebApplication.Rewrite
+namespace InstructorIQ.WebApplication.Rewrite;
+
+public class RedirectToNonWwwRule : IRule
 {
-    public class RedirectToNonWwwRule : IRule
+    public readonly int _statusCode;
+
+    public RedirectToNonWwwRule(int statusCode)
     {
-        public readonly int _statusCode;
+        _statusCode = statusCode;
+    }
 
-        public RedirectToNonWwwRule(int statusCode)
+    public virtual void ApplyRule(RewriteContext context)
+    {
+        var request = context.HttpContext.Request;
+        if (request.Host.Host.Equals("localhost", StringComparison.OrdinalIgnoreCase))
         {
-            _statusCode = statusCode;
+            context.Result = RuleResult.ContinueRules;
+            return;
         }
 
-        public virtual void ApplyRule(RewriteContext context)
+        if (!request.Host.Value.StartsWith("www.", StringComparison.OrdinalIgnoreCase))
         {
-            var request = context.HttpContext.Request;
-            if (request.Host.Host.Equals("localhost", StringComparison.OrdinalIgnoreCase))
-            {
-                context.Result = RuleResult.ContinueRules;
-                return;
-            }
-
-            if (!request.Host.Value.StartsWith("www.", StringComparison.OrdinalIgnoreCase))
-            {
-                context.Result = RuleResult.ContinueRules;
-                return;
-            }
+            context.Result = RuleResult.ContinueRules;
+            return;
+        }
 
-            var hostString = new HostString(request.Host.Value.Substring(4));
-            var newUrl = UriHelper.BuildAbsolute(request.Scheme, hostString, request.PathBase, request.Path, request.QueryString);
+        var hostString = new HostString(request.Host.Value.Substring(4));
+        var newUrl = UriHelper.BuildAbsolute(request.Scheme, hostString, request.PathBase, request.Path, request.QueryString);
 
-            var response = context.HttpContext.Response;
-            response.StatusCode = _statusCode;
-            response.Headers[HeaderNames.Location] = newUrl;
+        var response = context.HttpContext.Response;
+        response.StatusCode = _statusCode;
+        response.Headers[HeaderNames.Location] = newUrl;
 
-            context.Result = RuleResult.EndResponse;
+        context.Result = RuleResult.EndResponse;
 
-            context.Logger?.LogInformation("Request redirected to non-www");
-        }
+        context.Logger?.LogInformation("Request redirected to non-www");
     }
 }
diff --git a/service/src/InstructorIQ.WebApplication/Startup.cs b/service/src/InstructorIQ.WebApplication/Startup.cs
deleted file mode 100644
index 13d0a9ad..00000000
--- a/service/src/InstructorIQ.WebApplication/Startup.cs
+++ /dev/null
@@ -1,230 +0,0 @@
-using System;
-using System.Linq;
-
-using FluentValidation.AspNetCore;
-
-using InstructorIQ.Core.Converters;
-using InstructorIQ.Core.Data;
-using InstructorIQ.Core.Data.Entities;
-using InstructorIQ.Core.Domain.Models;
-using InstructorIQ.Core.Extensions;
-using InstructorIQ.Core.Multitenancy;
-using InstructorIQ.Core.Security;
-using InstructorIQ.WebApplication.Rewrite;
-
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Identity;
-using Microsoft.AspNetCore.ResponseCompression;
-using Microsoft.AspNetCore.Rewrite;
-using Microsoft.AspNetCore.StaticFiles;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.DependencyInjection.Extensions;
-using Microsoft.Extensions.Hosting;
-
-using SameSiteMode = Microsoft.AspNetCore.Http.SameSiteMode;
-
-namespace InstructorIQ.WebApplication
-{
-    public class Startup
-    {
-        public Startup(IConfiguration configuration)
-        {
-            Configuration = configuration;
-        }
-
-        public IConfiguration Configuration { get; }
-
-        public void ConfigureServices(IServiceCollection services)
-        {
-            var connectionString = Configuration.GetConnectionString("InstructorIQ");
-
-            services.Configure<CookiePolicyOptions>(options =>
-            {
-                options.CheckConsentNeeded = context => false;
-                options.MinimumSameSitePolicy = SameSiteMode.None;
-            });
-            services.Configure<IdentityOptions>(options =>
-            {
-                options.Password.RequireDigit = false;
-                options.Password.RequireLowercase = false;
-                options.Password.RequireNonAlphanumeric = false;
-                options.Password.RequireUppercase = false;
-            });
-
-            services.ConfigureApplicationCookie(options =>
-            {
-                options.Cookie.HttpOnly = true;
-                options.Cookie.Name = ".InstructorIQ.Authentication";
-                options.SlidingExpiration = true;
-                options.LoginPath = "/Account/Login";
-                options.LogoutPath = "/Account/Logout";
-                options.AccessDeniedPath = "/Account/AccessDenied";
-            });
-
-            services.AddInstructorIQCore();
-            services.AddInstructorIQWebApplication();
-
-            services.AddIdentity<User, Role>()
-                .AddEntityFrameworkStores<InstructorIQContext>()
-                .AddDefaultTokenProviders();
-
-            services.AddMultitenancy<TenantReadModel, TenantContextResolver>();
-
-            services.AddResponseCaching();
-
-            services.AddResponseCompression(options =>
-            {
-                options.Providers.Add<BrotliCompressionProvider>();
-                options.Providers.Add<GzipCompressionProvider>();
-                options.MimeTypes = ResponseCompressionDefaults.MimeTypes.Concat(new[]
-                {
-                    "font/woff2",
-                    "image/svg+xml"
-                });
-                options.EnableForHttps = true;
-            });
-
-            services
-                .AddRazorPages()
-                .AddRazorPagesOptions(options =>
-                {
-                    options.Conventions.AddPageTenantRoute("/Index", false);
-                    options.Conventions.AddFolderTenantRoute("/Account", false);
-                    options.Conventions.AddFolderTenantRoute("/Attendance");
-                    options.Conventions.AddFolderTenantRoute("/Calendar");
-                    options.Conventions.AddFolderTenantRoute("/Group");
-                    options.Conventions.AddFolderTenantRoute("/Instructor");
-                    options.Conventions.AddFolderTenantRoute("/Location");
-                    options.Conventions.AddFolderTenantRoute("/Member");
-                    options.Conventions.AddFolderTenantRoute("/Report");
-                    options.Conventions.AddFolderTenantRoute("/Session");
-                    options.Conventions.AddFolderTenantRoute("/SignUp");
-                    options.Conventions.AddFolderTenantRoute("/Topic");
-                    options.Conventions.AddFolderTenantRoute("/Template");
-                    options.Conventions.AddFolderTenantRoute("/User", false);
-                })
-                .AddJsonOptions(options =>
-                {
-                    options.JsonSerializerOptions.Converters.Add(new TimeSpanConverter());
-                });
-
-            services
-                .AddFluentValidationAutoValidation()
-                .AddFluentValidationClientsideAdapters();
-
-            services.AddUrlHelper();
-
-            services.AddAuthorization(options =>
-            {
-                options.AddPolicy(
-                    UserPolicies.UserPolicy,
-                    policy => policy.RequireRole(
-                        Core.Data.Constants.Role.GlobalAdministrator,
-                        Core.Data.Constants.Role.AdministratorName,
-                        Core.Data.Constants.Role.InstructorName,
-                        Core.Data.Constants.Role.AttendeeName,
-                        Core.Data.Constants.Role.MemberName
-                    )
-                );
-                options.AddPolicy(
-                    UserPolicies.InstructorPolicy,
-                    policy => policy.RequireRole(
-                        Core.Data.Constants.Role.GlobalAdministrator,
-                        Core.Data.Constants.Role.AdministratorName,
-                        Core.Data.Constants.Role.InstructorName
-                    )
-                );
-                options.AddPolicy(
-                    UserPolicies.AdministratorPolicy,
-                    policy => policy.RequireRole(
-                        Core.Data.Constants.Role.GlobalAdministrator,
-                        Core.Data.Constants.Role.AdministratorName
-                    )
-                );
-                options.AddPolicy(
-                    UserPolicies.GlobalAdministratorPolicy,
-                    policy => policy.RequireRole(
-                        Core.Data.Constants.Role.GlobalAdministrator
-                    )
-                );
-            });
-        }
-
-
-        public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
-        {
-            if (env.IsDevelopment())
-            {
-                app.UseDeveloperExceptionPage();
-            }
-            else
-            {
-                app.UseExceptionHandler("/Error");
-                app.UseHsts();
-            }
-
-            var policyCollection = new HeaderPolicyCollection()
-                .AddXssProtectionBlock()
-                .AddContentTypeOptionsNoSniff()
-                .AddStrictTransportSecurityMaxAge()
-                .AddReferrerPolicyStrictOriginWhenCrossOrigin()
-                .RemoveServerHeader()
-                .AddContentSecurityPolicy(builder =>
-                {
-                    builder.AddObjectSrc().None();
-                    builder.AddFormAction().Self();
-                });
-
-            app.UseSecurityHeaders(policyCollection);
-
-            app.UseResponseCompression();
-
-            app.UseRewriter(new RewriteOptions()
-                .Add(new RedirectToNonWwwRule(308))
-                .AddRedirectToHttpsPermanent()
-            );
-            app.UseHttpsRedirection();
-
-            app.UseStaticFiles(new StaticFileOptions
-            {
-                ContentTypeProvider = new FileExtensionContentTypeProvider
-                {
-                    Mappings =
-                    {
-                        [".webmanifest"] = "application/manifest+json"
-                    }
-                },
-                OnPrepareResponse = context =>
-                {
-                    var headers = context.Context.Response.GetTypedHeaders();
-                    headers.CacheControl = new Microsoft.Net.Http.Headers.CacheControlHeaderValue
-                    {
-                        Public = true,
-                        MaxAge = TimeSpan.FromDays(365)
-                    };
-                }
-            });
-
-            app.UseCookiePolicy();
-
-            app.UseRouting();
-
-            app.UseAuthentication();
-            app.UseAuthorization();
-
-            app.UseResponseCaching();
-
-            app.UseMultitenancy<TenantReadModel>();
-
-            app.UseEndpoints(endpoints =>
-            {
-                endpoints.MapRazorPages();
-                endpoints.MapControllers();
-            });
-
-        }
-    }
-}
diff --git a/service/src/InstructorIQ.WebApplication/TagHelpers/AlertTagHelper.cs b/service/src/InstructorIQ.WebApplication/TagHelpers/AlertTagHelper.cs
index 34f13fd2..5b46a848 100644
--- a/service/src/InstructorIQ.WebApplication/TagHelpers/AlertTagHelper.cs
+++ b/service/src/InstructorIQ.WebApplication/TagHelpers/AlertTagHelper.cs
@@ -1,61 +1,61 @@
-using System.Text.Encodings.Web;
+using System.Text.Encodings.Web;
+
 using Microsoft.AspNetCore.Mvc.Rendering;
 using Microsoft.AspNetCore.Mvc.TagHelpers;
 using Microsoft.AspNetCore.Razor.TagHelpers;
 
-namespace InstructorIQ.WebApplication.TagHelpers
+namespace InstructorIQ.WebApplication.TagHelpers;
+
+[HtmlTargetElement("alert", TagStructure = TagStructure.NormalOrSelfClosing)]
+public class AlertTagHelper : TagHelper
 {
-    [HtmlTargetElement("alert", TagStructure = TagStructure.NormalOrSelfClosing)]
-    public class AlertTagHelper : TagHelper
-    {
-        [HtmlAttributeName("type")]
-        public string Type { get; set; } = "success";
+    [HtmlAttributeName("type")]
+    public string Type { get; set; } = "success";
 
-        [HtmlAttributeName("message")]
-        public string Message { get; set; }
+    [HtmlAttributeName("message")]
+    public string Message { get; set; }
 
-        [HtmlAttributeName("dismissible")]
-        public bool Dismissible { get; set; } = true;
+    [HtmlAttributeName("dismissible")]
+    public bool Dismissible { get; set; } = true;
 
-        public override void Process(TagHelperContext context, TagHelperOutput output)
+    public override void Process(TagHelperContext context, TagHelperOutput output)
+    {
+        if (string.IsNullOrWhiteSpace(Message))
         {
-            if (string.IsNullOrWhiteSpace(Message))
-            {
-                output.SuppressOutput();
-                return;
-            }
+            output.SuppressOutput();
+            return;
+        }
 
-            var type = string.IsNullOrWhiteSpace(Type) ? "success" : Type;
+        var type = string.IsNullOrWhiteSpace(Type) ? "success" : Type;
 
-            output.TagName = "div";
-            output.TagMode = TagMode.StartTagAndEndTag;
-            output.AddClass("alert", HtmlEncoder.Default);
-            output.AddClass($"alert-{type}", HtmlEncoder.Default);
+        output.TagName = "div";
+        output.TagMode = TagMode.StartTagAndEndTag;
+        output.AddClass("alert", HtmlEncoder.Default);
+        output.AddClass($"alert-{type}", HtmlEncoder.Default);
 
-            output.Attributes.Add("role", "alert");
+        output.Attributes.Add("role", "alert");
 
-            output.Content.Append(Message);
+        output.Content.Append(Message);
 
-            if (!Dismissible)
-                return;
+        if (!Dismissible)
+            return;
 
-            output.AddClass("alert-dismissible", HtmlEncoder.Default);
-            output.AddClass("fade", HtmlEncoder.Default);
-            output.AddClass("show", HtmlEncoder.Default);
+        output.AddClass("alert-dismissible", HtmlEncoder.Default);
+        output.AddClass("fade", HtmlEncoder.Default);
+        output.AddClass("show", HtmlEncoder.Default);
 
-            var buttonTag = new TagBuilder("button");
-            buttonTag.AddCssClass("close");
-            buttonTag.Attributes["type"] = "button";
-            buttonTag.Attributes["data-dismiss"] = "alert";
-            buttonTag.Attributes["aria-label"] = "Close";
+        var buttonTag = new TagBuilder("button");
+        buttonTag.AddCssClass("close");
+        buttonTag.Attributes["type"] = "button";
+        buttonTag.Attributes["data-dismiss"] = "alert";
+        buttonTag.Attributes["aria-label"] = "Close";
 
-            var spanTag = new TagBuilder("span");
-            spanTag.Attributes["aria-hidden"] = "true";
-            spanTag.InnerHtml.AppendHtml("&times;");
+        var spanTag = new TagBuilder("span");
+        spanTag.Attributes["aria-hidden"] = "true";
+        spanTag.InnerHtml.AppendHtml("&times;");
 
-            buttonTag.InnerHtml.AppendHtml(spanTag);
+        buttonTag.InnerHtml.AppendHtml(spanTag);
 
-            output.Content.AppendHtml(buttonTag);
-        }
+        output.Content.AppendHtml(buttonTag);
     }
 }
diff --git a/service/src/InstructorIQ.WebApplication/TagHelpers/AuthorizationTagHelper.cs b/service/src/InstructorIQ.WebApplication/TagHelpers/AuthorizationTagHelper.cs
index a0b31ca0..105d60ed 100644
--- a/service/src/InstructorIQ.WebApplication/TagHelpers/AuthorizationTagHelper.cs
+++ b/service/src/InstructorIQ.WebApplication/TagHelpers/AuthorizationTagHelper.cs
@@ -1,84 +1,84 @@
-using System;
+using System;
 using System.Threading.Tasks;
+
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Authorization.Policy;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Razor.TagHelpers;
 
-namespace InstructorIQ.WebApplication.TagHelpers
+namespace InstructorIQ.WebApplication.TagHelpers;
+
+[HtmlTargetElement("authorize-content")]
+[HtmlTargetElement(Attributes = "authorize")]
+[HtmlTargetElement(Attributes = "authorize-policy")]
+[HtmlTargetElement(Attributes = "authorize-roles")]
+[HtmlTargetElement(Attributes = "authorize-schemes")]
+public class AuthorizationTagHelper : TagHelper, IAuthorizeData
 {
-    [HtmlTargetElement("authorize-content")]
-    [HtmlTargetElement(Attributes = "authorize")]
-    [HtmlTargetElement(Attributes = "authorize-policy")]
-    [HtmlTargetElement(Attributes = "authorize-roles")]
-    [HtmlTargetElement(Attributes = "authorize-schemes")]
-    public class AuthorizationTagHelper : TagHelper, IAuthorizeData
+    private readonly IAuthorizationPolicyProvider _policyProvider;
+    private readonly IPolicyEvaluator _policyEvaluator;
+    private readonly IHttpContextAccessor _httpContextAccessor;
+
+    public AuthorizationTagHelper(IHttpContextAccessor httpContextAccessor, IAuthorizationPolicyProvider policyProvider, IPolicyEvaluator policyEvaluator)
     {
-        private readonly IAuthorizationPolicyProvider _policyProvider;
-        private readonly IPolicyEvaluator _policyEvaluator;
-        private readonly IHttpContextAccessor _httpContextAccessor;
-
-        public AuthorizationTagHelper(IHttpContextAccessor httpContextAccessor, IAuthorizationPolicyProvider policyProvider, IPolicyEvaluator policyEvaluator)
-        {
-            _httpContextAccessor = httpContextAccessor;
-            _policyProvider = policyProvider;
-            _policyEvaluator = policyEvaluator;
-        }
-
-        /// <summary>
-        /// Gets or sets the policy name that determines access to the HTML block.
-        /// </summary>
-        [HtmlAttributeName("authorize-policy")]
-        public string Policy { get; set; }
-
-        /// <summary>
-        /// Gets or sets a comma delimited list of roles that are allowed to access the HTML  block.
-        /// </summary>
-        [HtmlAttributeName("authorize-roles")]
-        public string Roles { get; set; }
-
-        /// <summary>
-        /// Gets or sets a comma delimited list of schemes from which user information is constructed.
-        /// </summary>
-        [HtmlAttributeName("authorize-schemes")]
-        public string AuthenticationSchemes { get; set; }
-
-        /// <summary>
-        /// Gets or sets the owner to authorize.
-        /// </summary>
-        /// <value>
-        /// The owner to authorize.
-        /// </value>
-        [HtmlAttributeName("authorize-owner")]
-        public string Owner { get; set; }
-
-        public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
-        {
-            var ownerResult = EvaluateOwner();
-            var authorizeResult = await EvaluateAuthorization();
-
-            if (!ownerResult && !authorizeResult.Succeeded)
-                output.SuppressOutput();
-        }
-
-        private bool EvaluateOwner()
-        {
-            var currentUser = _httpContextAccessor.HttpContext?.User?.Identity?.Name;
-            if (string.IsNullOrEmpty(currentUser) || string.IsNullOrEmpty(Owner))
-                return false;
-
-            return string.Equals(currentUser, Owner, StringComparison.OrdinalIgnoreCase);
-        }
-
-        private async Task<PolicyAuthorizationResult> EvaluateAuthorization()
-        {
-            var policy = await AuthorizationPolicy.CombineAsync(_policyProvider, new[] { this });
-
-            var authenticateResult = await _policyEvaluator.AuthenticateAsync(policy, _httpContextAccessor.HttpContext);
-
-            var authorizeResult = await _policyEvaluator.AuthorizeAsync(policy, authenticateResult, _httpContextAccessor.HttpContext, null);
-
-            return authorizeResult;
-        }
+        _httpContextAccessor = httpContextAccessor;
+        _policyProvider = policyProvider;
+        _policyEvaluator = policyEvaluator;
+    }
+
+    /// <summary>
+    /// Gets or sets the policy name that determines access to the HTML block.
+    /// </summary>
+    [HtmlAttributeName("authorize-policy")]
+    public string Policy { get; set; }
+
+    /// <summary>
+    /// Gets or sets a comma delimited list of roles that are allowed to access the HTML  block.
+    /// </summary>
+    [HtmlAttributeName("authorize-roles")]
+    public string Roles { get; set; }
+
+    /// <summary>
+    /// Gets or sets a comma delimited list of schemes from which user information is constructed.
+    /// </summary>
+    [HtmlAttributeName("authorize-schemes")]
+    public string AuthenticationSchemes { get; set; }
+
+    /// <summary>
+    /// Gets or sets the owner to authorize.
+    /// </summary>
+    /// <value>
+    /// The owner to authorize.
+    /// </value>
+    [HtmlAttributeName("authorize-owner")]
+    public string Owner { get; set; }
+
+    public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
+    {
+        var ownerResult = EvaluateOwner();
+        var authorizeResult = await EvaluateAuthorization();
+
+        if (!ownerResult && !authorizeResult.Succeeded)
+            output.SuppressOutput();
+    }
+
+    private bool EvaluateOwner()
+    {
+        var currentUser = _httpContextAccessor.HttpContext?.User?.Identity?.Name;
+        if (string.IsNullOrEmpty(currentUser) || string.IsNullOrEmpty(Owner))
+            return false;
+
+        return string.Equals(currentUser, Owner, StringComparison.OrdinalIgnoreCase);
+    }
+
+    private async Task<PolicyAuthorizationResult> EvaluateAuthorization()
+    {
+        var policy = await AuthorizationPolicy.CombineAsync(_policyProvider, new[] { this });
+
+        var authenticateResult = await _policyEvaluator.AuthenticateAsync(policy, _httpContextAccessor.HttpContext);
+
+        var authorizeResult = await _policyEvaluator.AuthorizeAsync(policy, authenticateResult, _httpContextAccessor.HttpContext, null);
+
+        return authorizeResult;
     }
 }
diff --git a/service/src/InstructorIQ.WebApplication/TagHelpers/ConditionalTagHelper.cs b/service/src/InstructorIQ.WebApplication/TagHelpers/ConditionalTagHelper.cs
index dcf0fbbb..f1ab353c 100644
--- a/service/src/InstructorIQ.WebApplication/TagHelpers/ConditionalTagHelper.cs
+++ b/service/src/InstructorIQ.WebApplication/TagHelpers/ConditionalTagHelper.cs
@@ -1,35 +1,35 @@
-using System;
+using System;
+
 using Microsoft.AspNetCore.Razor.TagHelpers;
 
-namespace InstructorIQ.WebApplication.TagHelpers
+namespace InstructorIQ.WebApplication.TagHelpers;
+
+[HtmlTargetElement(Attributes = IncludeIfAttributeName)]
+[HtmlTargetElement(Attributes = ExcludeIfAttributeName)]
+public class ConditionalTagHelper : TagHelper
 {
-    [HtmlTargetElement(Attributes = IncludeIfAttributeName)]
-    [HtmlTargetElement(Attributes = ExcludeIfAttributeName)]
-    public class ConditionalTagHelper : TagHelper
-    {
-        private const string IncludeIfAttributeName = "include-if";
-        private const string ExcludeIfAttributeName = "exclude-if";
+    private const string IncludeIfAttributeName = "include-if";
+    private const string ExcludeIfAttributeName = "exclude-if";
 
-        public override int Order => -1000;
+    public override int Order => -1000;
 
-        [HtmlAttributeName(IncludeIfAttributeName)]
-        public bool? Include { get; set; }
+    [HtmlAttributeName(IncludeIfAttributeName)]
+    public bool? Include { get; set; }
 
-        [HtmlAttributeName(ExcludeIfAttributeName)]
-        public bool Exclude { get; set; } = false;
+    [HtmlAttributeName(ExcludeIfAttributeName)]
+    public bool Exclude { get; set; } = false;
 
-        public override void Process(TagHelperContext context, TagHelperOutput output)
-        {
-            output.Attributes.RemoveAll(IncludeIfAttributeName);
-            output.Attributes.RemoveAll(ExcludeIfAttributeName);
+    public override void Process(TagHelperContext context, TagHelperOutput output)
+    {
+        output.Attributes.RemoveAll(IncludeIfAttributeName);
+        output.Attributes.RemoveAll(ExcludeIfAttributeName);
 
-            var isExcluded = Exclude || (Include.HasValue && !Include.Value);
+        var isExcluded = Exclude || (Include.HasValue && !Include.Value);
 
-            if (!isExcluded)
-                return;
+        if (!isExcluded)
+            return;
 
-            output.TagName = null;
-            output.SuppressOutput();
-        }
+        output.TagName = null;
+        output.SuppressOutput();
     }
-}
\ No newline at end of file
+}
diff --git a/service/src/InstructorIQ.WebApplication/TagHelpers/ConfirmButtonTagHelper.cs b/service/src/InstructorIQ.WebApplication/TagHelpers/ConfirmButtonTagHelper.cs
index 6cf8160a..818d50d0 100644
--- a/service/src/InstructorIQ.WebApplication/TagHelpers/ConfirmButtonTagHelper.cs
+++ b/service/src/InstructorIQ.WebApplication/TagHelpers/ConfirmButtonTagHelper.cs
@@ -1,5 +1,6 @@
-using System;
+using System;
 using System.Collections.Generic;
+
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Rendering;
 using Microsoft.AspNetCore.Mvc.Routing;
@@ -7,253 +8,252 @@
 using Microsoft.AspNetCore.Razor.TagHelpers;
 using Microsoft.AspNetCore.Routing;
 
-namespace InstructorIQ.WebApplication.TagHelpers
+namespace InstructorIQ.WebApplication.TagHelpers;
+
+[HtmlTargetElement("confirm-button")]
+public class ConfirmButtonTagHelper : TagHelper
 {
-    [HtmlTargetElement("confirm-button")]
-    public class ConfirmButtonTagHelper : TagHelper
+    public ConfirmButtonTagHelper(IUrlHelperFactory urlHelperFactory)
     {
-        public ConfirmButtonTagHelper(IUrlHelperFactory urlHelperFactory)
-        {
-            UrlHelperFactory = urlHelperFactory;
-            RouteValues = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
-        }
+        UrlHelperFactory = urlHelperFactory;
+        RouteValues = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+    }
 
-        private const string ActionAttributeName = "asp-action";
-        private const string AreaAttributeName = "asp-area";
-        private const string ControllerAttributeName = "asp-controller";
-        private const string PageAttributeName = "asp-page";
-        private const string PageHandlerAttributeName = "asp-page-handler";
-        private const string FragmentAttributeName = "asp-fragment";
-        private const string RouteAttributeName = "asp-route";
-        private const string RouteValuesDictionaryName = "asp-all-route-data";
-        private const string RouteValuesPrefix = "asp-route-";
-        private const string FormAction = "formaction";
+    private const string ActionAttributeName = "asp-action";
+    private const string AreaAttributeName = "asp-area";
+    private const string ControllerAttributeName = "asp-controller";
+    private const string PageAttributeName = "asp-page";
+    private const string PageHandlerAttributeName = "asp-page-handler";
+    private const string FragmentAttributeName = "asp-fragment";
+    private const string RouteAttributeName = "asp-route";
+    private const string RouteValuesDictionaryName = "asp-all-route-data";
+    private const string RouteValuesPrefix = "asp-route-";
+    private const string FormAction = "formaction";
 
 
-        protected IUrlHelperFactory UrlHelperFactory { get; }
+    protected IUrlHelperFactory UrlHelperFactory { get; }
 
-        [HtmlAttributeName(ActionAttributeName)]
-        public string Action { get; set; }
+    [HtmlAttributeName(ActionAttributeName)]
+    public string Action { get; set; }
 
-        [HtmlAttributeName(ControllerAttributeName)]
-        public string Controller { get; set; }
+    [HtmlAttributeName(ControllerAttributeName)]
+    public string Controller { get; set; }
 
-        [HtmlAttributeName(AreaAttributeName)]
-        public string Area { get; set; }
+    [HtmlAttributeName(AreaAttributeName)]
+    public string Area { get; set; }
 
-        [HtmlAttributeName(PageAttributeName)]
-        public string Page { get; set; }
+    [HtmlAttributeName(PageAttributeName)]
+    public string Page { get; set; }
 
-        [HtmlAttributeName(PageHandlerAttributeName)]
-        public string PageHandler { get; set; }
+    [HtmlAttributeName(PageHandlerAttributeName)]
+    public string PageHandler { get; set; }
 
-        [HtmlAttributeName(FragmentAttributeName)]
-        public string Fragment { get; set; }
+    [HtmlAttributeName(FragmentAttributeName)]
+    public string Fragment { get; set; }
 
-        [HtmlAttributeName(RouteAttributeName)]
-        public string Route { get; set; }
+    [HtmlAttributeName(RouteAttributeName)]
+    public string Route { get; set; }
 
-        [HtmlAttributeName(RouteValuesDictionaryName, DictionaryAttributePrefix = RouteValuesPrefix)]
-        public IDictionary<string, string> RouteValues { get; set; }
+    [HtmlAttributeName(RouteValuesDictionaryName, DictionaryAttributePrefix = RouteValuesPrefix)]
+    public IDictionary<string, string> RouteValues { get; set; }
 
-        [HtmlAttributeNotBound]
-        [ViewContext]
-        public ViewContext ViewContext { get; set; }
+    [HtmlAttributeNotBound]
+    [ViewContext]
+    public ViewContext ViewContext { get; set; }
 
 
-        [HtmlAttributeName("modal-title")]
-        public string ModalTitle { get; set; }
+    [HtmlAttributeName("modal-title")]
+    public string ModalTitle { get; set; }
 
-        [HtmlAttributeName("modal-text")]
-        public string ModalText { get; set; }
+    [HtmlAttributeName("modal-text")]
+    public string ModalText { get; set; }
 
-        [HtmlAttributeName("modal-button")]
-        public string ModalButton { get; set; }
+    [HtmlAttributeName("modal-button")]
+    public string ModalButton { get; set; }
 
-        [HtmlAttributeName("modal-color")]
-        public string ModalColor { get; set; }
+    [HtmlAttributeName("modal-color")]
+    public string ModalColor { get; set; }
 
 
-        public override void Process(TagHelperContext context, TagHelperOutput output)
-        {
-            var uniqueId = Guid.NewGuid().ToString();
-            var modalId = $"modal-{uniqueId}";
+    public override void Process(TagHelperContext context, TagHelperOutput output)
+    {
+        var uniqueId = Guid.NewGuid().ToString();
+        var modalId = $"modal-{uniqueId}";
 
-            output.TagName = "button";
-            output.TagMode = TagMode.StartTagAndEndTag;
-            output.Attributes.SetAttribute("type", "button");
-            output.Attributes.SetAttribute("data-toggle", "modal");
-            output.Attributes.SetAttribute("data-target", $"#{modalId}");
+        output.TagName = "button";
+        output.TagMode = TagMode.StartTagAndEndTag;
+        output.Attributes.SetAttribute("type", "button");
+        output.Attributes.SetAttribute("data-toggle", "modal");
+        output.Attributes.SetAttribute("data-target", $"#{modalId}");
 
-            var modalTag = CreateModal(modalId, uniqueId);
-            output.PostElement.AppendHtml(modalTag);
-        }
+        var modalTag = CreateModal(modalId, uniqueId);
+        output.PostElement.AppendHtml(modalTag);
+    }
 
-        private TagBuilder CreateModal(string modalId, string uniqueId)
-        {
-            var labelId = $"label-{uniqueId}";
+    private TagBuilder CreateModal(string modalId, string uniqueId)
+    {
+        var labelId = $"label-{uniqueId}";
 
-            var modalTag = new TagBuilder("div");
-            modalTag.AddCssClass("modal");
-            modalTag.AddCssClass("fade");
-            modalTag.Attributes["id"] = modalId;
-            modalTag.Attributes["tabindex"] = "-1";
-            modalTag.Attributes["role"] = "dialog";
-            modalTag.Attributes["aria-labelledby"] = labelId;
-            modalTag.Attributes["aria-hidden"] = "true";
+        var modalTag = new TagBuilder("div");
+        modalTag.AddCssClass("modal");
+        modalTag.AddCssClass("fade");
+        modalTag.Attributes["id"] = modalId;
+        modalTag.Attributes["tabindex"] = "-1";
+        modalTag.Attributes["role"] = "dialog";
+        modalTag.Attributes["aria-labelledby"] = labelId;
+        modalTag.Attributes["aria-hidden"] = "true";
 
-            var dialogTag = new TagBuilder("div");
-            dialogTag.AddCssClass("modal-dialog");
-            dialogTag.Attributes["role"] = "document";
+        var dialogTag = new TagBuilder("div");
+        dialogTag.AddCssClass("modal-dialog");
+        dialogTag.Attributes["role"] = "document";
 
 
-            var contentTag = new TagBuilder("div");
-            contentTag.AddCssClass("modal-content");
+        var contentTag = new TagBuilder("div");
+        contentTag.AddCssClass("modal-content");
 
-            var headerTag = CreateHeader(labelId);
-            var bodyTag = CreateBodyTag();
-            var footerTag = CreateFooter();
+        var headerTag = CreateHeader(labelId);
+        var bodyTag = CreateBodyTag();
+        var footerTag = CreateFooter();
 
-            contentTag.InnerHtml.AppendHtml(headerTag);
-            contentTag.InnerHtml.AppendHtml(bodyTag);
-            contentTag.InnerHtml.AppendHtml(footerTag);
+        contentTag.InnerHtml.AppendHtml(headerTag);
+        contentTag.InnerHtml.AppendHtml(bodyTag);
+        contentTag.InnerHtml.AppendHtml(footerTag);
 
-            dialogTag.InnerHtml.AppendHtml(contentTag);
+        dialogTag.InnerHtml.AppendHtml(contentTag);
 
-            modalTag.InnerHtml.AppendHtml(dialogTag);
+        modalTag.InnerHtml.AppendHtml(dialogTag);
 
-            return modalTag;
-        }
+        return modalTag;
+    }
 
-        private TagBuilder CreateBodyTag()
-        {
-            var text = string.IsNullOrWhiteSpace(ModalText)
-                ? "Are you sure?"
-                : ModalText;
-
-            var bodyTag = new TagBuilder("div");
-            bodyTag.AddCssClass("modal-body");
-            bodyTag.InnerHtml.Append(text);
-            return bodyTag;
-        }
+    private TagBuilder CreateBodyTag()
+    {
+        var text = string.IsNullOrWhiteSpace(ModalText)
+            ? "Are you sure?"
+            : ModalText;
+
+        var bodyTag = new TagBuilder("div");
+        bodyTag.AddCssClass("modal-body");
+        bodyTag.InnerHtml.Append(text);
+        return bodyTag;
+    }
 
-        private TagBuilder CreateFooter()
-        {
-            var footerTag = new TagBuilder("div");
-            footerTag.AddCssClass("modal-footer");
+    private TagBuilder CreateFooter()
+    {
+        var footerTag = new TagBuilder("div");
+        footerTag.AddCssClass("modal-footer");
 
-            var cancelButton = new TagBuilder("button");
-            cancelButton.AddCssClass("btn");
-            cancelButton.AddCssClass("btn-secondary");
-            cancelButton.Attributes["type"] = "button";
-            cancelButton.Attributes["data-dismiss"] = "modal";
-            cancelButton.InnerHtml.Append("Cancel");
+        var cancelButton = new TagBuilder("button");
+        cancelButton.AddCssClass("btn");
+        cancelButton.AddCssClass("btn-secondary");
+        cancelButton.Attributes["type"] = "button";
+        cancelButton.Attributes["data-dismiss"] = "modal";
+        cancelButton.InnerHtml.Append("Cancel");
 
-            var acceptColor = string.IsNullOrWhiteSpace(ModalColor)
-                ? "primary"
-                : ModalColor;
+        var acceptColor = string.IsNullOrWhiteSpace(ModalColor)
+            ? "primary"
+            : ModalColor;
 
-            var acceptText = string.IsNullOrWhiteSpace(ModalButton)
-                ? "Ok"
-                : ModalButton;
+        var acceptText = string.IsNullOrWhiteSpace(ModalButton)
+            ? "Ok"
+            : ModalButton;
 
-            var acceptAction = GetFormAction();
+        var acceptAction = GetFormAction();
 
-            var acceptButton = new TagBuilder("button");
-            acceptButton.AddCssClass("btn");
-            acceptButton.AddCssClass($"btn-{acceptColor}");
-            acceptButton.Attributes["type"] = "submit";
-            acceptButton.Attributes[FormAction] = acceptAction;
-            acceptButton.InnerHtml.Append(acceptText);
+        var acceptButton = new TagBuilder("button");
+        acceptButton.AddCssClass("btn");
+        acceptButton.AddCssClass($"btn-{acceptColor}");
+        acceptButton.Attributes["type"] = "submit";
+        acceptButton.Attributes[FormAction] = acceptAction;
+        acceptButton.InnerHtml.Append(acceptText);
 
-            footerTag.InnerHtml.AppendHtml(cancelButton);
-            footerTag.InnerHtml.AppendHtml(acceptButton);
+        footerTag.InnerHtml.AppendHtml(cancelButton);
+        footerTag.InnerHtml.AppendHtml(acceptButton);
 
-            return footerTag;
-        }
+        return footerTag;
+    }
 
-        private TagBuilder CreateHeader(string labelId)
-        {
-            var headerTag = new TagBuilder("div");
-            headerTag.AddCssClass("modal-header");
+    private TagBuilder CreateHeader(string labelId)
+    {
+        var headerTag = new TagBuilder("div");
+        headerTag.AddCssClass("modal-header");
+
+        if (!string.IsNullOrWhiteSpace(ModalColor))
+            headerTag.AddCssClass($"modal-header-{ModalColor}");
 
-            if (!string.IsNullOrWhiteSpace(ModalColor))
-                headerTag.AddCssClass($"modal-header-{ModalColor}");
+        var titleTag = new TagBuilder("h5");
+        titleTag.AddCssClass("modal-title");
+        titleTag.Attributes["id"] = labelId;
 
-            var titleTag = new TagBuilder("h5");
-            titleTag.AddCssClass("modal-title");
-            titleTag.Attributes["id"] = labelId;
+        var titleText = string.IsNullOrWhiteSpace(ModalTitle)
+            ? "Confirmation"
+            : ModalTitle;
 
-            var titleText = string.IsNullOrWhiteSpace(ModalTitle)
-                ? "Confirmation"
-                : ModalTitle;
+        titleTag.InnerHtml.Append(titleText);
 
-            titleTag.InnerHtml.Append(titleText);
+        var closeTag = new TagBuilder("button");
+        closeTag.AddCssClass("close");
+        closeTag.Attributes["type"] = "button";
+        closeTag.Attributes["data-dismiss"] = "modal";
+        closeTag.Attributes["aria-label"] = "Close";
 
-            var closeTag = new TagBuilder("button");
-            closeTag.AddCssClass("close");
-            closeTag.Attributes["type"] = "button";
-            closeTag.Attributes["data-dismiss"] = "modal";
-            closeTag.Attributes["aria-label"] = "Close";
+        var spanTag = new TagBuilder("span");
+        spanTag.Attributes["aria-hidden"] = "true";
+        spanTag.InnerHtml.AppendHtml("&times;");
 
-            var spanTag = new TagBuilder("span");
-            spanTag.Attributes["aria-hidden"] = "true";
-            spanTag.InnerHtml.AppendHtml("&times;");
+        closeTag.InnerHtml.AppendHtml(spanTag);
+
+        headerTag.InnerHtml.AppendHtml(titleTag);
+        headerTag.InnerHtml.AppendHtml(closeTag);
+        return headerTag;
+    }
+
+
+    private string GetFormAction()
+    {
+        var routeLink = Route != null;
+        var actionLink = Controller != null || Action != null;
+        var pageLink = Page != null || PageHandler != null;
 
-            closeTag.InnerHtml.AppendHtml(spanTag);
+        // make local copy
+        var routeValues = new RouteValueDictionary(RouteValues);
 
-            headerTag.InnerHtml.AppendHtml(titleTag);
-            headerTag.InnerHtml.AppendHtml(closeTag);
-            return headerTag;
+        // Unconditionally replace any value from asp-route-area.
+        if (Area != null)
+            routeValues["area"] = Area;
+
+
+        var urlHelper = UrlHelperFactory.GetUrlHelper(ViewContext);
+
+        if (pageLink)
+        {
+            return urlHelper.Page(
+                Page,
+                PageHandler,
+                routeValues,
+                protocol: null,
+                host: null,
+                fragment: Fragment);
         }
 
 
-        private string GetFormAction()
+        if (routeLink)
         {
-            var routeLink = Route != null;
-            var actionLink = Controller != null || Action != null;
-            var pageLink = Page != null || PageHandler != null;
-
-            // make local copy
-            var routeValues = new RouteValueDictionary(RouteValues);
-
-            // Unconditionally replace any value from asp-route-area.
-            if (Area != null)
-                routeValues["area"] = Area;
-
-
-            var urlHelper = UrlHelperFactory.GetUrlHelper(ViewContext);
-
-            if (pageLink)
-            {
-                return urlHelper.Page(
-                    Page,
-                    PageHandler,
-                    routeValues,
-                    protocol: null,
-                    host: null,
-                    fragment: Fragment);
-            }
-
-
-            if (routeLink)
-            {
-                return urlHelper.RouteUrl(
-                    Route,
-                    routeValues,
-                    protocol: null,
-                    host: null,
-                    fragment: Fragment);
-            }
-
-            return urlHelper.Action(
-                Action,
-                Controller,
+            return urlHelper.RouteUrl(
+                Route,
                 routeValues,
                 protocol: null,
                 host: null,
                 fragment: Fragment);
         }
 
+        return urlHelper.Action(
+            Action,
+            Controller,
+            routeValues,
+            protocol: null,
+            host: null,
+            fragment: Fragment);
     }
+
 }
diff --git a/service/src/InstructorIQ.WebApplication/TagHelpers/GoogleMapTagHelper.cs b/service/src/InstructorIQ.WebApplication/TagHelpers/GoogleMapTagHelper.cs
index f9bde8df..abb9e02b 100644
--- a/service/src/InstructorIQ.WebApplication/TagHelpers/GoogleMapTagHelper.cs
+++ b/service/src/InstructorIQ.WebApplication/TagHelpers/GoogleMapTagHelper.cs
@@ -1,60 +1,61 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net;
 using System.Text;
 using System.Threading.Tasks;
+
 using InstructorIQ.Core.Extensions;
+
 using Microsoft.AspNetCore.Http.Extensions;
 using Microsoft.AspNetCore.Razor.TagHelpers;
 
-namespace InstructorIQ.WebApplication.TagHelpers
+namespace InstructorIQ.WebApplication.TagHelpers;
+
+[HtmlTargetElement("google-map")]
+public class GoogleMapTagHelper : TagHelper
 {
-    [HtmlTargetElement("google-map")]
-    public class GoogleMapTagHelper : TagHelper
-    {
-        public const string GoogleUrl = "https://www.google.com/maps/search/?api=1";
+    public const string GoogleUrl = "https://www.google.com/maps/search/?api=1";
+
+    [HtmlAttributeName("address")]
+    public string AddressLine1 { get; set; }
 
-        [HtmlAttributeName("address")]
-        public string AddressLine1 { get; set; }
+    [HtmlAttributeName("city")]
+    public string City { get; set; }
 
-        [HtmlAttributeName("city")]
-        public string City { get; set; }
+    [HtmlAttributeName("state")]
+    public string StateProvince { get; set; }
 
-        [HtmlAttributeName("state")]
-        public string StateProvince { get; set; }
+    [HtmlAttributeName("postal")]
+    public string PostalCode { get; set; }
 
-        [HtmlAttributeName("postal")]
-        public string PostalCode { get; set; }
 
+    public override void Process(TagHelperContext context, TagHelperOutput output)
+    {
+        var builder = new StringBuilder();
+
+        builder.AppendIf(AddressLine1, s => s.HasValue());
+        builder.AppendIf(", ", s => builder.Length > 0);
+        builder.AppendIf(City, s => s.HasValue());
+        builder.AppendIf(", ", s => builder.Length > 0);
+        builder.AppendIf(StateProvince, s => s.HasValue());
+        builder.AppendIf(", ", s => builder.Length > 0);
+        builder.AppendIf(PostalCode, s => s.HasValue());
 
-        public override void Process(TagHelperContext context, TagHelperOutput output)
+        if (builder.Length <= 0)
         {
-            var builder = new StringBuilder();
-
-            builder.AppendIf(AddressLine1, s => s.HasValue());
-            builder.AppendIf(", ", s => builder.Length > 0);
-            builder.AppendIf(City, s => s.HasValue());
-            builder.AppendIf(", ", s => builder.Length > 0);
-            builder.AppendIf(StateProvince, s => s.HasValue());
-            builder.AppendIf(", ", s => builder.Length > 0);
-            builder.AppendIf(PostalCode, s => s.HasValue());
-
-            if (builder.Length <= 0)
-            {
-                output.TagName = "span";
-                return;
-            }
-
-            var addess = builder.ToString();
-            addess = Uri.EscapeDataString(addess);
-
-            var url = $"{GoogleUrl}&query={addess}";
-
-            output.TagName = "a";
-            output.Attributes.SetAttribute("href", url);
-            output.Attributes.SetAttribute("target", "_blank");
-            output.Attributes.SetAttribute("title", "View Google Map");
+            output.TagName = "span";
+            return;
         }
+
+        var addess = builder.ToString();
+        addess = Uri.EscapeDataString(addess);
+
+        var url = $"{GoogleUrl}&query={addess}";
+
+        output.TagName = "a";
+        output.Attributes.SetAttribute("href", url);
+        output.Attributes.SetAttribute("target", "_blank");
+        output.Attributes.SetAttribute("title", "View Google Map");
     }
 }
diff --git a/service/src/InstructorIQ.WebApplication/TagHelpers/GravatarTagHelper.cs b/service/src/InstructorIQ.WebApplication/TagHelpers/GravatarTagHelper.cs
index 152c2761..bb4bcc34 100644
--- a/service/src/InstructorIQ.WebApplication/TagHelpers/GravatarTagHelper.cs
+++ b/service/src/InstructorIQ.WebApplication/TagHelpers/GravatarTagHelper.cs
@@ -1,86 +1,86 @@
-using System;
+using System;
 using System.ComponentModel.DataAnnotations;
 using System.Security.Cryptography;
 using System.Text;
+
 using Microsoft.AspNetCore.Http.Extensions;
 using Microsoft.AspNetCore.Razor.TagHelpers;
 
-namespace InstructorIQ.WebApplication.TagHelpers
-{
-    [HtmlTargetElement("gravatar", Attributes = "email")]
-    public class GravatarTagHelper : TagHelper
-    {
-        [HtmlAttributeName("email")]
-        public string Email { get; set; }
+namespace InstructorIQ.WebApplication.TagHelpers;
 
-        [HtmlAttributeName("mode")]
-        public Mode Mode { get; set; } = Mode.Mm;
+[HtmlTargetElement("gravatar", Attributes = "email")]
+public class GravatarTagHelper : TagHelper
+{
+    [HtmlAttributeName("email")]
+    public string Email { get; set; }
 
-        [HtmlAttributeName("rating")]
-        public Rating Rating { get; set; } = Rating.g;
+    [HtmlAttributeName("mode")]
+    public Mode Mode { get; set; } = Mode.Mm;
 
-        [HtmlAttributeName("size")]
-        public int Size { get; set; } = 50;
+    [HtmlAttributeName("rating")]
+    public Rating Rating { get; set; } = Rating.g;
 
-        public override void Process(TagHelperContext context, TagHelperOutput output)
-        {
-            var email = Email
-                .Trim()
-                .ToLower();
+    [HtmlAttributeName("size")]
+    public int Size { get; set; } = 50;
 
-            byte[] bytes;
-            using (var md5 = MD5.Create())
-                bytes = md5.ComputeHash(Encoding.ASCII.GetBytes(email));
+    public override void Process(TagHelperContext context, TagHelperOutput output)
+    {
+        var email = Email
+            .Trim()
+            .ToLower();
 
-            var hash = BitConverter
-                .ToString(bytes)
-                .Replace("-", "")
-                .ToLower();
+        byte[] bytes;
+        using (var md5 = MD5.Create())
+            bytes = md5.ComputeHash(Encoding.ASCII.GetBytes(email));
 
-            var queryBuilder = new QueryBuilder();
-            queryBuilder.Add("s", Size.ToString());
-            queryBuilder.Add("d", GetModeValue(Mode));
-            queryBuilder.Add("r", Rating.ToString());
-            var queryString = queryBuilder.ToQueryString().ToString();
+        var hash = BitConverter
+            .ToString(bytes)
+            .Replace("-", "")
+            .ToLower();
 
-            var url = $"https://gravatar.com/avatar/{hash}";
-            url = url + queryBuilder.ToQueryString();
+        var queryBuilder = new QueryBuilder();
+        queryBuilder.Add("s", Size.ToString());
+        queryBuilder.Add("d", GetModeValue(Mode));
+        queryBuilder.Add("r", Rating.ToString());
+        var queryString = queryBuilder.ToQueryString().ToString();
 
-            output.TagName = "img";
-            output.Attributes.SetAttribute("src", url);
-            output.Attributes.SetAttribute("alt", email);
+        var url = $"https://gravatar.com/avatar/{hash}";
+        url = url + queryBuilder.ToQueryString();
 
-        }
+        output.TagName = "img";
+        output.Attributes.SetAttribute("src", url);
+        output.Attributes.SetAttribute("alt", email);
 
-        private static string GetModeValue(Mode mode)
-        {
-            return mode == Mode.NotFound ? "404" : mode.ToString().ToLower();
-        }
     }
 
-    public enum Rating
+    private static string GetModeValue(Mode mode)
     {
-        g,
-        pg,
-        r,
-        x
+        return mode == Mode.NotFound ? "404" : mode.ToString().ToLower();
     }
+}
 
-    public enum Mode
-    {
-        [Display(Name = "404")]
-        NotFound,
-        [Display(Name = "Mm")]
-        Mm,
-        [Display(Name = "Identicon")]
-        Identicon,
-        [Display(Name = "Monsterid")]
-        Monsterid,
-        [Display(Name = "Wavatar")]
-        Wavatar,
-        [Display(Name = "Retro")]
-        Retro,
-        [Display(Name = "Blank")]
-        Blank
-    }
+public enum Rating
+{
+    g,
+    pg,
+    r,
+    x
+}
+
+public enum Mode
+{
+    [Display(Name = "404")]
+    NotFound,
+    [Display(Name = "Mm")]
+    Mm,
+    [Display(Name = "Identicon")]
+    Identicon,
+    [Display(Name = "Monsterid")]
+    Monsterid,
+    [Display(Name = "Wavatar")]
+    Wavatar,
+    [Display(Name = "Retro")]
+    Retro,
+    [Display(Name = "Blank")]
+    Blank
 }
diff --git a/service/src/InstructorIQ.WebApplication/TagHelpers/HeaderTagHelper.cs b/service/src/InstructorIQ.WebApplication/TagHelpers/HeaderTagHelper.cs
index 4e57f64c..0c3903e5 100644
--- a/service/src/InstructorIQ.WebApplication/TagHelpers/HeaderTagHelper.cs
+++ b/service/src/InstructorIQ.WebApplication/TagHelpers/HeaderTagHelper.cs
@@ -1,57 +1,58 @@
-using System;
+using System;
 using System.Text.Encodings.Web;
 using System.Threading.Tasks;
+
 using MailKit.Search;
+
 using Microsoft.AspNetCore.Mvc.TagHelpers;
 using Microsoft.AspNetCore.Mvc.ViewFeatures;
 using Microsoft.AspNetCore.Razor.TagHelpers;
 
-namespace InstructorIQ.WebApplication.TagHelpers
+namespace InstructorIQ.WebApplication.TagHelpers;
+
+[HtmlTargetElement("header", Attributes = "sort-by")]
+public class HeaderTagHelper : AnchorTagHelper
 {
-    [HtmlTargetElement("header", Attributes = "sort-by")]
-    public class HeaderTagHelper : AnchorTagHelper
-    {
 
-        public HeaderTagHelper(IHtmlGenerator generator) : base(generator)
-        {
-        }
+    public HeaderTagHelper(IHtmlGenerator generator) : base(generator)
+    {
+    }
 
-        public override int Order => -1001;
+    public override int Order => -1001;
 
-        [HtmlAttributeName("sort-by")]
-        public string SortField { get; set; }
+    [HtmlAttributeName("sort-by")]
+    public string SortField { get; set; }
 
-        [HtmlAttributeName("sort-by-descending")]
-        public string SortFieldDescending { get; set; }
+    [HtmlAttributeName("sort-by-descending")]
+    public string SortFieldDescending { get; set; }
 
 
-        [HtmlAttributeName("sort-current")]
-        public string SortCurrent { get; set; }
+    [HtmlAttributeName("sort-current")]
+    public string SortCurrent { get; set; }
 
-        [HtmlAttributeName("sort-route-name")]
-        public string SortRouteName { get; set; } = "s";
+    [HtmlAttributeName("sort-route-name")]
+    public string SortRouteName { get; set; } = "s";
 
-        public override void Process(TagHelperContext context, TagHelperOutput output)
-        {
-            output.TagName = "a";
-            output.TagMode = TagMode.StartTagAndEndTag;
+    public override void Process(TagHelperContext context, TagHelperOutput output)
+    {
+        output.TagName = "a";
+        output.TagMode = TagMode.StartTagAndEndTag;
 
-            if (string.IsNullOrWhiteSpace(SortFieldDescending))
-                SortFieldDescending = $"{SortField}:desc";
+        if (string.IsNullOrWhiteSpace(SortFieldDescending))
+            SortFieldDescending = $"{SortField}:desc";
 
-            bool isFieldAscending = String.Equals(SortField, SortCurrent, StringComparison.OrdinalIgnoreCase);
-            bool isFieldDescending = String.Equals(SortFieldDescending, SortCurrent, StringComparison.OrdinalIgnoreCase);
+        bool isFieldAscending = String.Equals(SortField, SortCurrent, StringComparison.OrdinalIgnoreCase);
+        bool isFieldDescending = String.Equals(SortFieldDescending, SortCurrent, StringComparison.OrdinalIgnoreCase);
 
-            RouteValues[SortRouteName] = isFieldAscending ? SortFieldDescending : SortField;
+        RouteValues[SortRouteName] = isFieldAscending ? SortFieldDescending : SortField;
 
-            base.Process(context, output);
+        base.Process(context, output);
 
-            output.AddClass("sort-by", HtmlEncoder.Default);
+        output.AddClass("sort-by", HtmlEncoder.Default);
 
-            if (isFieldAscending)
-                output.AddClass("ascending", HtmlEncoder.Default);
-            else if (isFieldDescending)
-                output.AddClass("descending", HtmlEncoder.Default);
-        }
+        if (isFieldAscending)
+            output.AddClass("ascending", HtmlEncoder.Default);
+        else if (isFieldDescending)
+            output.AddClass("descending", HtmlEncoder.Default);
     }
 }
diff --git a/service/src/InstructorIQ.WebApplication/TagHelpers/JsonDisplayTagHelper.cs b/service/src/InstructorIQ.WebApplication/TagHelpers/JsonDisplayTagHelper.cs
new file mode 100644
index 00000000..c4092866
--- /dev/null
+++ b/service/src/InstructorIQ.WebApplication/TagHelpers/JsonDisplayTagHelper.cs
@@ -0,0 +1,104 @@
+using System.Text.Json;
+using System.Threading.Tasks;
+
+using InstructorIQ.Core.Extensions;
+using InstructorIQ.Core.Services;
+
+using Microsoft.AspNetCore.Html;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+
+namespace InstructorIQ.WebApplication.TagHelpers;
+
+[HtmlTargetElement("json-display", TagStructure = TagStructure.NormalOrSelfClosing)]
+public class JsonDisplayTagHelper : TagHelper
+{
+    private readonly IHtmlService _htmlService;
+
+    public JsonDisplayTagHelper(IHtmlService htmlService)
+    {
+        _htmlService = htmlService;
+    }
+
+    public ModelExpression Content { get; set; }
+
+    public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
+    {
+        output.TagName = null;
+
+        var content = await GetContent(output);
+        if (content.IsNullOrWhiteSpace())
+        {
+            output.Content.SetContent("");
+            return;
+        }
+
+        var text = _htmlService.PlainText(content);
+        var document = JsonDocument.Parse(text);
+
+        AppendValue(output.Content, document.RootElement);
+    }
+
+    private async Task<string> GetContent(TagHelperOutput output)
+    {
+        if (Content != null)
+            return Content.Model?.ToString();
+
+        var childContent = await output.GetChildContentAsync();
+        return childContent.GetContent();
+    }
+
+    private void AppendValue(IHtmlContentBuilder parent, JsonElement jsonElement)
+    {
+        switch (jsonElement.ValueKind)
+        {
+            case JsonValueKind.Object:
+                AppendObject(parent, jsonElement);
+                break;
+            case JsonValueKind.Array:
+                foreach (var arrayElement in jsonElement.EnumerateArray())
+                    AppendValue(parent, arrayElement);
+
+                break;
+            case JsonValueKind.String:
+            case JsonValueKind.Number:
+            case JsonValueKind.True:
+            case JsonValueKind.False:
+                parent.Append(jsonElement.ToString());
+                break;
+            case JsonValueKind.Undefined:
+            case JsonValueKind.Null:
+            default:
+                parent.Append(string.Empty);
+                break;
+        }
+    }
+
+    private void AppendObject(IHtmlContentBuilder parent, JsonElement jsonElement)
+    {
+        var tableTag = new TagBuilder("table");
+        tableTag.AddCssClass("json-object");
+
+        foreach (var jsonProperty in jsonElement.EnumerateObject())
+        {
+            var rowTag = new TagBuilder("tr");
+
+            var nameTag = new TagBuilder("th");
+            nameTag.AddCssClass("json-name");
+            nameTag.InnerHtml.Append(jsonProperty.Name);
+
+            var valueTag = new TagBuilder("td");
+            valueTag.AddCssClass("json-value");
+
+            AppendValue(valueTag.InnerHtml, jsonProperty.Value);
+
+            rowTag.InnerHtml.AppendHtml(nameTag);
+            rowTag.InnerHtml.AppendHtml(valueTag);
+
+            tableTag.InnerHtml.AppendHtml(rowTag);
+        }
+
+        parent.AppendHtml(tableTag);
+    }
+}
diff --git a/service/src/InstructorIQ.WebApplication/TagHelpers/MarkdownTagHelper.cs b/service/src/InstructorIQ.WebApplication/TagHelpers/MarkdownTagHelper.cs
index 246831aa..c6cbf139 100644
--- a/service/src/InstructorIQ.WebApplication/TagHelpers/MarkdownTagHelper.cs
+++ b/service/src/InstructorIQ.WebApplication/TagHelpers/MarkdownTagHelper.cs
@@ -1,39 +1,40 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+
 using CommonMark;
+
 using Microsoft.AspNetCore.Mvc.ViewFeatures;
 using Microsoft.AspNetCore.Razor.TagHelpers;
 
-namespace InstructorIQ.WebApplication.TagHelpers
+namespace InstructorIQ.WebApplication.TagHelpers;
+
+[HtmlTargetElement("markdown", TagStructure = TagStructure.NormalOrSelfClosing)]
+[HtmlTargetElement(Attributes = "markdown")]
+public class MarkdownTagHelper : TagHelper
 {
-    [HtmlTargetElement("markdown", TagStructure = TagStructure.NormalOrSelfClosing)]
-    [HtmlTargetElement(Attributes = "markdown")]
-    public class MarkdownTagHelper : TagHelper
-    {
-        public ModelExpression Content { get; set; }
+    public ModelExpression Content { get; set; }
 
-        public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
-        {
-            if (output.TagName == "markdown")
-                output.TagName = null;
+    public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
+    {
+        if (output.TagName == "markdown")
+            output.TagName = null;
 
-            output.Attributes.RemoveAll("markdown");
+        output.Attributes.RemoveAll("markdown");
 
-            var content = await GetContent(output);
-            var html = CommonMarkConverter.Convert(content);
+        var content = await GetContent(output);
+        var html = CommonMarkConverter.Convert(content);
 
-            output.Content.SetHtmlContent(html ?? "");
-        }
+        output.Content.SetHtmlContent(html ?? "");
+    }
 
-        private async Task<string> GetContent(TagHelperOutput output)
-        {
-            if (Content != null)
-                return Content.Model?.ToString();
+    private async Task<string> GetContent(TagHelperOutput output)
+    {
+        if (Content != null)
+            return Content.Model?.ToString();
 
-            var childContent = await output.GetChildContentAsync();
-            return childContent.GetContent();
-        }
+        var childContent = await output.GetChildContentAsync();
+        return childContent.GetContent();
     }
 }
diff --git a/service/src/InstructorIQ.WebApplication/TagHelpers/PaginationTagHelper.cs b/service/src/InstructorIQ.WebApplication/TagHelpers/PaginationTagHelper.cs
index 2ecef07e..dc6ae4a3 100644
--- a/service/src/InstructorIQ.WebApplication/TagHelpers/PaginationTagHelper.cs
+++ b/service/src/InstructorIQ.WebApplication/TagHelpers/PaginationTagHelper.cs
@@ -1,423 +1,423 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Text.Encodings.Web;
+
 using Microsoft.AspNetCore.Mvc.Rendering;
 using Microsoft.AspNetCore.Mvc.TagHelpers;
 using Microsoft.AspNetCore.Mvc.ViewFeatures;
 using Microsoft.AspNetCore.Razor.TagHelpers;
 using Microsoft.AspNetCore.Routing;
 
-namespace InstructorIQ.WebApplication.TagHelpers
+namespace InstructorIQ.WebApplication.TagHelpers;
+
+[HtmlTargetElement("pagination")]
+public class PaginationTagHelper : TagHelper
 {
-    [HtmlTargetElement("pagination")]
-    public class PaginationTagHelper : TagHelper
+    private const string ActionAttributeName = "asp-action";
+    private const string AreaAttributeName = "asp-area";
+    private const string ControllerAttributeName = "asp-controller";
+    private const string PageAttributeName = "asp-page";
+    private const string PageHandlerAttributeName = "asp-page-handler";
+    private const string FragmentAttributeName = "asp-fragment";
+    private const string HostAttributeName = "asp-host";
+    private const string ProtocolAttributeName = "asp-protocol";
+    private const string RouteAttributeName = "asp-route";
+    private const string RouteValuesDictionaryName = "asp-all-route-data";
+    private const string RouteValuesPrefix = "asp-route-";
+
+    public PaginationTagHelper(IHtmlGenerator generator)
     {
-        private const string ActionAttributeName = "asp-action";
-        private const string AreaAttributeName = "asp-area";
-        private const string ControllerAttributeName = "asp-controller";
-        private const string PageAttributeName = "asp-page";
-        private const string PageHandlerAttributeName = "asp-page-handler";
-        private const string FragmentAttributeName = "asp-fragment";
-        private const string HostAttributeName = "asp-host";
-        private const string ProtocolAttributeName = "asp-protocol";
-        private const string RouteAttributeName = "asp-route";
-        private const string RouteValuesDictionaryName = "asp-all-route-data";
-        private const string RouteValuesPrefix = "asp-route-";
-
-        public PaginationTagHelper(IHtmlGenerator generator)
-        {
-            Generator = generator;
-            RouteValues = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
-        }
+        Generator = generator;
+        RouteValues = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+    }
 
-        /// <inheritdoc />
-        public override int Order => -1000;
+    /// <inheritdoc />
+    public override int Order => -1000;
 
-        protected IHtmlGenerator Generator { get; }
+    protected IHtmlGenerator Generator { get; }
 
 
-        [HtmlAttributeName("page-size")]
-        public int PageSize { get; set; } = 10;
+    [HtmlAttributeName("page-size")]
+    public int PageSize { get; set; } = 10;
 
-        [HtmlAttributeName("current-page")]
-        public int CurrentPage { get; set; } = 1;
+    [HtmlAttributeName("current-page")]
+    public int CurrentPage { get; set; } = 1;
 
-        [HtmlAttributeName("total-items")]
-        public long TotalItems { get; set; }
+    [HtmlAttributeName("total-items")]
+    public long TotalItems { get; set; }
 
-        [HtmlAttributeName("display-size")]
-        public int DisplaySize { get; set; } = 5;
+    [HtmlAttributeName("display-size")]
+    public int DisplaySize { get; set; } = 5;
 
-        [HtmlAttributeName("show-boundary")]
-        public bool ShowBoundary { get; set; } = true;
+    [HtmlAttributeName("show-boundary")]
+    public bool ShowBoundary { get; set; } = true;
 
-        [HtmlAttributeName("show-direction")]
-        public bool ShowDirection { get; set; } = true;
+    [HtmlAttributeName("show-direction")]
+    public bool ShowDirection { get; set; } = true;
 
-        [HtmlAttributeName("show-page")]
-        public bool ShowPage { get; set; } = true;
+    [HtmlAttributeName("show-page")]
+    public bool ShowPage { get; set; } = true;
 
-        [HtmlAttributeName("center-selected")]
-        public bool CenterSelected { get; set; } = true;
+    [HtmlAttributeName("center-selected")]
+    public bool CenterSelected { get; set; } = true;
 
-        [HtmlAttributeName("previous-text")]
-        public string PreviousText { get; set; } = "‹";
+    [HtmlAttributeName("previous-text")]
+    public string PreviousText { get; set; } = "‹";
 
-        [HtmlAttributeName("next-text")]
-        public string NextText { get; set; } = "›";
+    [HtmlAttributeName("next-text")]
+    public string NextText { get; set; } = "›";
 
-        [HtmlAttributeName("first-text")]
-        public string FirstText { get; set; } = "«";
+    [HtmlAttributeName("first-text")]
+    public string FirstText { get; set; } = "«";
 
-        [HtmlAttributeName("last-text")]
-        public string LastText { get; set; } = "»";
+    [HtmlAttributeName("last-text")]
+    public string LastText { get; set; } = "»";
 
-        [HtmlAttributeName("page-route-name")]
-        public string PageRouteName { get; set; } = "p";
+    [HtmlAttributeName("page-route-name")]
+    public string PageRouteName { get; set; } = "p";
 
 
-        [HtmlAttributeName(ActionAttributeName)]
-        public string Action { get; set; }
+    [HtmlAttributeName(ActionAttributeName)]
+    public string Action { get; set; }
 
-        [HtmlAttributeName(ControllerAttributeName)]
-        public string Controller { get; set; }
+    [HtmlAttributeName(ControllerAttributeName)]
+    public string Controller { get; set; }
 
-        [HtmlAttributeName(AreaAttributeName)]
-        public string Area { get; set; }
+    [HtmlAttributeName(AreaAttributeName)]
+    public string Area { get; set; }
 
-        [HtmlAttributeName(PageAttributeName)]
-        public string Page { get; set; }
+    [HtmlAttributeName(PageAttributeName)]
+    public string Page { get; set; }
 
-        [HtmlAttributeName(PageHandlerAttributeName)]
-        public string PageHandler { get; set; }
+    [HtmlAttributeName(PageHandlerAttributeName)]
+    public string PageHandler { get; set; }
 
-        [HtmlAttributeName(ProtocolAttributeName)]
-        public string Protocol { get; set; }
+    [HtmlAttributeName(ProtocolAttributeName)]
+    public string Protocol { get; set; }
 
-        [HtmlAttributeName(HostAttributeName)]
-        public string Host { get; set; }
+    [HtmlAttributeName(HostAttributeName)]
+    public string Host { get; set; }
 
-        [HtmlAttributeName(FragmentAttributeName)]
-        public string Fragment { get; set; }
+    [HtmlAttributeName(FragmentAttributeName)]
+    public string Fragment { get; set; }
 
-        [HtmlAttributeName(RouteAttributeName)]
-        public string Route { get; set; }
+    [HtmlAttributeName(RouteAttributeName)]
+    public string Route { get; set; }
 
-        [HtmlAttributeName(RouteValuesDictionaryName, DictionaryAttributePrefix = RouteValuesPrefix)]
-        public IDictionary<string, string> RouteValues { get; set; }
+    [HtmlAttributeName(RouteValuesDictionaryName, DictionaryAttributePrefix = RouteValuesPrefix)]
+    public IDictionary<string, string> RouteValues { get; set; }
 
-        [HtmlAttributeNotBound]
-        [ViewContext]
-        public ViewContext ViewContext { get; set; }
+    [HtmlAttributeNotBound]
+    [ViewContext]
+    public ViewContext ViewContext { get; set; }
 
 
-        [HtmlAttributeNotBound]
-        protected int PageCount => TotalItems > 0 ? (int)Math.Ceiling(TotalItems / (double)PageSize) : 0;
+    [HtmlAttributeNotBound]
+    protected int PageCount => TotalItems > 0 ? (int)Math.Ceiling(TotalItems / (double)PageSize) : 0;
 
-        [HtmlAttributeNotBound]
-        protected bool HasPreviousPage => CurrentPage > 1;
+    [HtmlAttributeNotBound]
+    protected bool HasPreviousPage => CurrentPage > 1;
 
-        [HtmlAttributeNotBound]
-        protected bool HasNextPage => CurrentPage < PageCount;
+    [HtmlAttributeNotBound]
+    protected bool HasNextPage => CurrentPage < PageCount;
 
-        [HtmlAttributeNotBound]
-        public bool IsFirstPage => CurrentPage <= 1;
+    [HtmlAttributeNotBound]
+    public bool IsFirstPage => CurrentPage <= 1;
 
-        [HtmlAttributeNotBound]
-        public bool IsLastPage => CurrentPage >= PageCount;
+    [HtmlAttributeNotBound]
+    public bool IsLastPage => CurrentPage >= PageCount;
 
-        public override void Process(TagHelperContext context, TagHelperOutput output)
+    public override void Process(TagHelperContext context, TagHelperOutput output)
+    {
+        // don't show if only 1 page
+        if (PageCount <= 1)
         {
-            // don't show if only 1 page
-            if (PageCount <= 1)
-            {
-                output.SuppressOutput();
-                return;
-            }
+            output.SuppressOutput();
+            return;
+        }
 
-            output.TagName = "ul";
-            output.TagMode = TagMode.StartTagAndEndTag;
-            output.AddClass("pagination", HtmlEncoder.Default);
+        output.TagName = "ul";
+        output.TagMode = TagMode.StartTagAndEndTag;
+        output.AddClass("pagination", HtmlEncoder.Default);
 
-            AppendFirstLink(output.Content);
-            AppendPreviousLink(output.Content);
+        AppendFirstLink(output.Content);
+        AppendPreviousLink(output.Content);
 
-            var (start, end) = GetPageEnds();
+        var (start, end) = GetPageEnds();
 
-            if (start > 1)
-                AppendPageSet(output.Content, start - 1);
+        if (start > 1)
+            AppendPageSet(output.Content, start - 1);
 
-            for (int page = start; page <= end; page++)
-                AppendPageLink(output.Content, page);
+        for (int page = start; page <= end; page++)
+            AppendPageLink(output.Content, page);
 
-            if (end < PageCount)
-                AppendPageSet(output.Content, end + 1);
+        if (end < PageCount)
+            AppendPageSet(output.Content, end + 1);
 
-            AppendNextLink(output.Content);
-            AppendLastLink(output.Content);
-        }
+        AppendNextLink(output.Content);
+        AppendLastLink(output.Content);
+    }
 
 
-        private (int start, int end) GetPageEnds()
+    private (int start, int end) GetPageEnds()
+    {
+        var start = 1;
+        var end = PageCount;
+        var isMax = DisplaySize > 0 && DisplaySize < PageCount;
+
+        if (!isMax)
+            return (start, end);
+
+        if (CenterSelected)
         {
-            var start = 1;
-            var end = PageCount;
-            var isMax = DisplaySize > 0 && DisplaySize < PageCount;
+            int f = (int)Math.Floor(DisplaySize / 2d);
+
+            start = Math.Max(CurrentPage - f, 1);
+            end = start + DisplaySize - 1;
 
-            if (!isMax)
+            if (end <= PageCount)
                 return (start, end);
 
-            if (CenterSelected)
-            {
-                int f = (int) Math.Floor(DisplaySize / 2d);
+            end = PageCount;
+            start = end - DisplaySize + 1;
 
-                start = Math.Max(CurrentPage - f, 1);
-                end = start + DisplaySize - 1;
+            return (start, end);
+        }
 
-                if (end <= PageCount)
-                    return (start, end);
 
-                end = PageCount;
-                start = end - DisplaySize + 1;
+        int c = (int)Math.Ceiling(CurrentPage / (double)DisplaySize);
 
-                return (start, end);
-            }
+        start = (c - 1) * DisplaySize + 1;
+        end = Math.Min(start + DisplaySize - 1, PageCount);
+        return (start, end);
+    }
 
+    private void AppendPageSet(TagHelperContent parent, int page)
+    {
+        var pageItem = new TagBuilder("li");
+        pageItem.AddCssClass("page-item");
+        pageItem.Attributes.Add("title", $"Goto to page {page}");
 
-            int c = (int) Math.Ceiling(CurrentPage / (double) DisplaySize);
+        var pageAnchor = CreatePageLink("...", page);
+        pageAnchor.AddCssClass("page-link");
 
-            start = (c - 1) * DisplaySize + 1;
-            end = Math.Min(start + DisplaySize - 1, PageCount);
-            return (start, end);
-        }
+        pageItem.InnerHtml.AppendHtml(pageAnchor);
 
-        private void AppendPageSet(TagHelperContent parent, int page)
-        {
-            var pageItem = new TagBuilder("li");
-            pageItem.AddCssClass("page-item");
-            pageItem.Attributes.Add("title", $"Goto to page {page}");
+        parent.AppendHtml(pageItem);
+    }
 
-            var pageAnchor = CreatePageLink("...", page);
-            pageAnchor.AddCssClass("page-link");
 
-            pageItem.InnerHtml.AppendHtml(pageAnchor);
+    private void AppendPreviousLink(TagHelperContent parent)
+    {
+        if (!ShowDirection)
+            return;
 
-            parent.AppendHtml(pageItem);
-        }
+        var previousItem = new TagBuilder("li");
+        previousItem.AddCssClass("page-item");
 
+        var page = CurrentPage - 1;
+        if (page < 1)
+            page = 1;
 
-        private void AppendPreviousLink(TagHelperContent parent)
+        var previousAnchor = CreatePageLink(PreviousText, page);
+        previousAnchor.AddCssClass("page-link");
+
+        if (HasPreviousPage)
+        {
+            previousAnchor.Attributes.Add("title", "Goto to previous page");
+        }
+        else
         {
-            if (!ShowDirection)
-                return;
+            previousItem.AddCssClass("disabled");
 
-            var previousItem = new TagBuilder("li");
-            previousItem.AddCssClass("page-item");
+            previousAnchor.Attributes["tabindex"] = "-1";
+            previousAnchor.Attributes["aria-disabled"] = "true";
+        }
 
-            var page = CurrentPage - 1;
-            if (page < 1)
-                page = 1;
+        previousItem.InnerHtml.AppendHtml(previousAnchor);
+        parent.AppendHtml(previousItem);
+    }
 
-            var previousAnchor = CreatePageLink(PreviousText, page);
-            previousAnchor.AddCssClass("page-link");
+    private void AppendNextLink(TagHelperContent parent)
+    {
+        if (!ShowDirection)
+            return;
 
-            if (HasPreviousPage)
-            {
-                previousAnchor.Attributes.Add("title", "Goto to previous page");
-            }
-            else
-            {
-                previousItem.AddCssClass("disabled");
+        var nextItem = new TagBuilder("li");
+        nextItem.AddCssClass("page-item");
 
-                previousAnchor.Attributes["tabindex"] = "-1";
-                previousAnchor.Attributes["aria-disabled"] = "true";
-            }
+        var page = CurrentPage + 1;
+        if (page > PageCount)
+            page = PageCount;
 
-            previousItem.InnerHtml.AppendHtml(previousAnchor);
-            parent.AppendHtml(previousItem);
-        }
+        var nextAnchor = CreatePageLink(NextText, page);
+        nextAnchor.AddCssClass("page-link");
 
-        private void AppendNextLink(TagHelperContent parent)
+        if (HasNextPage)
+        {
+            nextAnchor.Attributes.Add("title", "Goto to next page");
+        }
+        else
         {
-            if (!ShowDirection)
-                return;
+            nextItem.AddCssClass("disabled");
 
-            var nextItem = new TagBuilder("li");
-            nextItem.AddCssClass("page-item");
+            nextAnchor.Attributes["tabindex"] = "-1";
+            nextAnchor.Attributes["aria-disabled"] = "true";
+        }
 
-            var page = CurrentPage + 1;
-            if (page > PageCount)
-                page = PageCount;
+        nextItem.InnerHtml.AppendHtml(nextAnchor);
+        parent.AppendHtml(nextItem);
+    }
 
-            var nextAnchor = CreatePageLink(NextText, page);
-            nextAnchor.AddCssClass("page-link");
 
-            if (HasNextPage)
-            {
-                nextAnchor.Attributes.Add("title", "Goto to next page");
-            }
-            else
-            {
-                nextItem.AddCssClass("disabled");
+    private void AppendFirstLink(TagHelperContent parent)
+    {
+        if (!ShowBoundary)
+            return;
 
-                nextAnchor.Attributes["tabindex"] = "-1";
-                nextAnchor.Attributes["aria-disabled"] = "true";
-            }
+        var firstItem = new TagBuilder("li");
+        firstItem.AddCssClass("page-item");
 
-            nextItem.InnerHtml.AppendHtml(nextAnchor);
-            parent.AppendHtml(nextItem);
-        }
+        var firstAnchor = CreatePageLink(FirstText, 1);
+        firstAnchor.AddCssClass("page-link");
 
+        if (IsFirstPage)
+        {
+            firstItem.AddCssClass("disabled");
 
-        private void AppendFirstLink(TagHelperContent parent)
+            firstAnchor.Attributes["tabindex"] = "-1";
+            firstAnchor.Attributes["aria-disabled"] = "true";
+        }
+        else
         {
-            if (!ShowBoundary)
-                return;
+            firstAnchor.Attributes.Add("title", "Goto to first page");
+        }
+
+        firstItem.InnerHtml.AppendHtml(firstAnchor);
+        parent.AppendHtml(firstItem);
+    }
 
-            var firstItem = new TagBuilder("li");
-            firstItem.AddCssClass("page-item");
+    private void AppendLastLink(TagHelperContent parent)
+    {
+        if (!ShowBoundary)
+            return;
 
-            var firstAnchor = CreatePageLink(FirstText, 1);
-            firstAnchor.AddCssClass("page-link");
+        var lastItem = new TagBuilder("li");
+        lastItem.AddCssClass("page-item");
 
-            if (IsFirstPage)
-            {
-                firstItem.AddCssClass("disabled");
+        var lastAnchor = CreatePageLink(LastText, PageCount);
+        lastAnchor.AddCssClass("page-link");
 
-                firstAnchor.Attributes["tabindex"] = "-1";
-                firstAnchor.Attributes["aria-disabled"] = "true";
-            }
-            else
-            {
-                firstAnchor.Attributes.Add("title", "Goto to first page");
-            }
+        if (IsLastPage)
+        {
+            lastItem.AddCssClass("disabled");
 
-            firstItem.InnerHtml.AppendHtml(firstAnchor);
-            parent.AppendHtml(firstItem);
+            lastAnchor.Attributes["tabindex"] = "-1";
+            lastAnchor.Attributes["aria-disabled"] = "true";
         }
-
-        private void AppendLastLink(TagHelperContent parent)
+        else
         {
-            if (!ShowBoundary)
-                return;
+            lastAnchor.Attributes.Add("title", "Goto to last page");
+        }
 
-            var lastItem = new TagBuilder("li");
-            lastItem.AddCssClass("page-item");
+        lastItem.InnerHtml.AppendHtml(lastAnchor);
+        parent.AppendHtml(lastItem);
+    }
 
-            var lastAnchor = CreatePageLink(LastText, PageCount);
-            lastAnchor.AddCssClass("page-link");
 
-            if (IsLastPage)
-            {
-                lastItem.AddCssClass("disabled");
+    private void AppendPageLink(TagHelperContent parent, int page)
+    {
+        if (!ShowPage)
+            return;
 
-                lastAnchor.Attributes["tabindex"] = "-1";
-                lastAnchor.Attributes["aria-disabled"] = "true";
-            }
-            else
-            {
-                lastAnchor.Attributes.Add("title", "Goto to last page");
-            }
+        var pageItem = new TagBuilder("li");
+        pageItem.AddCssClass("page-item");
 
-            lastItem.InnerHtml.AppendHtml(lastAnchor);
-            parent.AppendHtml(lastItem);
-        }
+        if (CurrentPage == page)
+        {
+            pageItem.AddCssClass("active");
+            pageItem.Attributes["aria-current"] = "page";
+
+            var spanLink = new TagBuilder("span");
+            spanLink.AddCssClass("page-link");
+            spanLink.InnerHtml.Append(page.ToString());
+            spanLink.Attributes.Add("title", "Current Page");
 
+            var spanCurrent = new TagBuilder("span");
+            spanCurrent.AddCssClass("sr-only");
+            spanCurrent.InnerHtml.Append(" (current)");
 
-        private void AppendPageLink(TagHelperContent parent, int page)
+            spanLink.InnerHtml.AppendHtml(spanCurrent);
+            pageItem.InnerHtml.AppendHtml(spanLink);
+        }
+        else
         {
-            if (!ShowPage)
-                return;
-
-            var pageItem = new TagBuilder("li");
-            pageItem.AddCssClass("page-item");
-
-            if (CurrentPage == page)
-            {
-                pageItem.AddCssClass("active");
-                pageItem.Attributes["aria-current"] = "page";
-
-                var spanLink = new TagBuilder("span");
-                spanLink.AddCssClass("page-link");
-                spanLink.InnerHtml.Append(page.ToString());
-                spanLink.Attributes.Add("title", "Current Page");
-
-                var spanCurrent = new TagBuilder("span");
-                spanCurrent.AddCssClass("sr-only");
-                spanCurrent.InnerHtml.Append(" (current)");
-
-                spanLink.InnerHtml.AppendHtml(spanCurrent);
-                pageItem.InnerHtml.AppendHtml(spanLink);
-            }
-            else
-            {
-                var pageAnchor = CreatePageLink(page.ToString(), page);
-                pageAnchor.AddCssClass("page-link");
-                pageAnchor.Attributes.Add("title", $"Goto to page {page}");
-
-                pageItem.InnerHtml.AppendHtml(pageAnchor);
-            }
-
-            parent.AppendHtml(pageItem);
+            var pageAnchor = CreatePageLink(page.ToString(), page);
+            pageAnchor.AddCssClass("page-link");
+            pageAnchor.Attributes.Add("title", $"Goto to page {page}");
+
+            pageItem.InnerHtml.AppendHtml(pageAnchor);
         }
 
-        private TagBuilder CreatePageLink(string linkText, int page)
+        parent.AppendHtml(pageItem);
+    }
+
+    private TagBuilder CreatePageLink(string linkText, int page)
+    {
+        var routeLink = Route != null;
+        var pageLink = Page != null || PageHandler != null;
+
+        // make local copy
+        var routeValues = new RouteValueDictionary(RouteValues);
+
+        // Unconditionally replace any value from asp-route-area.
+        if (Area != null)
+            routeValues["area"] = Area;
+
+        // add page route
+        routeValues[PageRouteName] = page;
+
+
+        TagBuilder tagBuilder;
+        if (pageLink)
+        {
+            tagBuilder = Generator.GeneratePageLink(
+                ViewContext,
+                linkText: linkText,
+                pageName: Page,
+                pageHandler: PageHandler,
+                protocol: Protocol,
+                hostname: Host,
+                fragment: Fragment,
+                routeValues: routeValues,
+                htmlAttributes: null);
+        }
+        else if (routeLink)
+        {
+            tagBuilder = Generator.GenerateRouteLink(
+                ViewContext,
+                linkText: linkText,
+                routeName: Route,
+                protocol: Protocol,
+                hostName: Host,
+                fragment: Fragment,
+                routeValues: routeValues,
+                htmlAttributes: null);
+        }
+        else
         {
-            var routeLink = Route != null;
-            var pageLink = Page != null || PageHandler != null;
-
-            // make local copy
-            var routeValues = new RouteValueDictionary(RouteValues);
-
-            // Unconditionally replace any value from asp-route-area.
-            if (Area != null)
-                routeValues["area"] = Area;
-
-            // add page route
-            routeValues[PageRouteName] = page;
-
-
-            TagBuilder tagBuilder;
-            if (pageLink)
-            {
-                tagBuilder = Generator.GeneratePageLink(
-                    ViewContext,
-                    linkText: linkText,
-                    pageName: Page,
-                    pageHandler: PageHandler,
-                    protocol: Protocol,
-                    hostname: Host,
-                    fragment: Fragment,
-                    routeValues: routeValues,
-                    htmlAttributes: null);
-            }
-            else if (routeLink)
-            {
-                tagBuilder = Generator.GenerateRouteLink(
-                    ViewContext,
-                    linkText: linkText,
-                    routeName: Route,
-                    protocol: Protocol,
-                    hostName: Host,
-                    fragment: Fragment,
-                    routeValues: routeValues,
-                    htmlAttributes: null);
-            }
-            else
-            {
-                tagBuilder = Generator.GenerateActionLink(
-                   ViewContext,
-                   linkText: linkText,
-                   actionName: Action,
-                   controllerName: Controller,
-                   protocol: Protocol,
-                   hostname: Host,
-                   fragment: Fragment,
-                   routeValues: routeValues,
-                   htmlAttributes: null);
-            }
-
-            return tagBuilder;
+            tagBuilder = Generator.GenerateActionLink(
+               ViewContext,
+               linkText: linkText,
+               actionName: Action,
+               controllerName: Controller,
+               protocol: Protocol,
+               hostname: Host,
+               fragment: Fragment,
+               routeValues: routeValues,
+               htmlAttributes: null);
         }
+
+        return tagBuilder;
     }
 }
diff --git a/service/src/InstructorIQ.WebApplication/TagHelpers/RequiredTagHelper.cs b/service/src/InstructorIQ.WebApplication/TagHelpers/RequiredTagHelper.cs
index e2ce0a3f..085791e6 100644
--- a/service/src/InstructorIQ.WebApplication/TagHelpers/RequiredTagHelper.cs
+++ b/service/src/InstructorIQ.WebApplication/TagHelpers/RequiredTagHelper.cs
@@ -1,21 +1,21 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+
 using Microsoft.AspNetCore.Razor.TagHelpers;
 
-namespace InstructorIQ.WebApplication.TagHelpers
+namespace InstructorIQ.WebApplication.TagHelpers;
+
+[HtmlTargetElement("required", TagStructure = TagStructure.NormalOrSelfClosing)]
+public class RequiredTagHelper : TagHelper
 {
-    [HtmlTargetElement("required", TagStructure = TagStructure.NormalOrSelfClosing)]
-    public class RequiredTagHelper : TagHelper
+    public override void Process(TagHelperContext context, TagHelperOutput output)
     {
-        public override void Process(TagHelperContext context, TagHelperOutput output)
-        {
-            output.TagName = "span";
-            output.TagMode = TagMode.StartTagAndEndTag;
-            output.Attributes.SetAttribute("class", "text-danger");
-            output.Attributes.SetAttribute("title", "This input field is required");
-            output.Content.SetContent("*");
-        }
+        output.TagName = "span";
+        output.TagMode = TagMode.StartTagAndEndTag;
+        output.Attributes.SetAttribute("class", "text-danger");
+        output.Attributes.SetAttribute("title", "This input field is required");
+        output.Content.SetContent("*");
     }
 }
diff --git a/service/src/InstructorIQ.WebApplication/TagHelpers/SummaryTagHelper.cs b/service/src/InstructorIQ.WebApplication/TagHelpers/SummaryTagHelper.cs
index fcc12bee..4da021d8 100644
--- a/service/src/InstructorIQ.WebApplication/TagHelpers/SummaryTagHelper.cs
+++ b/service/src/InstructorIQ.WebApplication/TagHelpers/SummaryTagHelper.cs
@@ -1,59 +1,62 @@
-using System.Threading.Tasks;
+using System;
+using System.Threading.Tasks;
+
 using Humanizer;
+
 using InstructorIQ.Core.Extensions;
 using InstructorIQ.Core.Services;
+
 using Microsoft.AspNetCore.Mvc.ViewFeatures;
 using Microsoft.AspNetCore.Razor.TagHelpers;
 
-namespace InstructorIQ.WebApplication.TagHelpers
+namespace InstructorIQ.WebApplication.TagHelpers;
+
+[HtmlTargetElement("summary-text", TagStructure = TagStructure.NormalOrSelfClosing)]
+public class SummaryTagHelper : TagHelper
 {
-    [HtmlTargetElement("summary-text", TagStructure = TagStructure.NormalOrSelfClosing)]
-    public class SummaryTagHelper : TagHelper
+    private readonly IHtmlService _htmlService;
+
+    public SummaryTagHelper(IHtmlService htmlService)
     {
-        private readonly IHtmlService _htmlService;
+        _htmlService = htmlService;
+    }
 
-        public SummaryTagHelper(IHtmlService htmlService)
-        {
-            _htmlService = htmlService;
-        }
+    public ModelExpression Content { get; set; }
 
-        public ModelExpression Content { get; set; }
+    [HtmlAttributeName("truncate")]
+    public int? Truncate { get; set; }
 
-        [HtmlAttributeName("truncate")]
-        public int? Truncate { get; set; }
+    [HtmlAttributeName("default-text")]
+    public string DefaultText { get; set; } = string.Empty;
 
-        [HtmlAttributeName("default-text")]
-        public string DefaultText { get; set; } = string.Empty;
+    public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
+    {
+        output.TagName = null;
 
-        public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
+        var content = await GetContent(output);
+        if (content.IsNullOrWhiteSpace())
         {
-            output.TagName = null;
-
-            var content = await GetContent(output);
-            if (content.IsNullOrWhiteSpace())
-            {
-                output.Content.SetContent(DefaultText);
-                return;
-            }
+            output.Content.SetContent(DefaultText);
+            return;
+        }
 
-            var text = _htmlService.PlainText(content);
+        var text = _htmlService.PlainText(content);
 
-            text = text.RemoveExtended();
+        text = text.RemoveExtended();
 
-            if (Truncate.HasValue)
-                text = text.Truncate(Truncate.Value);
+        if (Truncate.HasValue)
+            text = text.Truncate(Truncate.Value);
 
-            output.Content.SetContent(text ?? "");
-        }
-
-        private async Task<string> GetContent(TagHelperOutput output)
-        {
-            if (Content != null)
-                return Content.Model?.ToString();
+        output.Content.SetContent(text ?? "");
+    }
 
-            var childContent = await output.GetChildContentAsync();
-            return childContent.GetContent();
-        }
+    private async Task<string> GetContent(TagHelperOutput output)
+    {
+        if (Content != null)
+            return Content.Model?.ToString();
 
+        var childContent = await output.GetChildContentAsync();
+        return childContent.GetContent();
     }
+
 }
diff --git a/service/src/InstructorIQ.WebApplication/appsettings.json b/service/src/InstructorIQ.WebApplication/appsettings.json
index 74abed17..9e746749 100644
--- a/service/src/InstructorIQ.WebApplication/appsettings.json
+++ b/service/src/InstructorIQ.WebApplication/appsettings.json
@@ -1,6 +1,7 @@
 {
   "ConnectionStrings": {
-    "InstructorIQ": "Data Source=(local);Initial Catalog=InstructorIQ;Integrated Security=True;TrustServerCertificate=True;"
+    "InstructorIQ": "Data Source=(local);Initial Catalog=InstructorIQ;Integrated Security=True;TrustServerCertificate=True;",
+    "StorageAccount": "DefaultEndpointsProtocol=http;AccountName=devstoreaccount1;AccountKey=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==;BlobEndpoint=http://127.0.0.1:10000/devstoreaccount1;QueueEndpoint=http://127.0.0.1:10001/devstoreaccount1;TableEndpoint=http://127.0.0.1:10002/devstoreaccount1;"
   },
   "SendGrid": {
     "ApiKey": "",
diff --git a/service/test/InstructorIQ.Core.Tests/DependencyInjectionBase.cs b/service/test/InstructorIQ.Core.Tests/DependencyInjectionBase.cs
index e8b27b70..6cc659d4 100644
--- a/service/test/InstructorIQ.Core.Tests/DependencyInjectionBase.cs
+++ b/service/test/InstructorIQ.Core.Tests/DependencyInjectionBase.cs
@@ -3,18 +3,17 @@
 using Xunit;
 using Xunit.Abstractions;
 
-namespace InstructorIQ.Core.Tests
-{
-    [Collection("DependencyInjectionCollection")]
-    public abstract class DependencyInjectionBase : UnitTestBase
-    {
-        public DependencyInjectionFixture DependencyInjection { get; }
+namespace InstructorIQ.Core.Tests;
 
-        protected DependencyInjectionBase(ITestOutputHelper outputHelper, DependencyInjectionFixture dependencyInjection) : base(outputHelper)
-        {
-            DependencyInjection = dependencyInjection;
-        }
+[Collection("DependencyInjectionCollection")]
+public abstract class DependencyInjectionBase : UnitTestBase
+{
+    public DependencyInjectionFixture DependencyInjection { get; }
 
-        public IServiceProvider ServiceProvider => DependencyInjection.ServiceProvider;
+    protected DependencyInjectionBase(ITestOutputHelper outputHelper, DependencyInjectionFixture dependencyInjection) : base(outputHelper)
+    {
+        DependencyInjection = dependencyInjection;
     }
+
+    public IServiceProvider ServiceProvider => DependencyInjection.ServiceProvider;
 }
diff --git a/service/test/InstructorIQ.Core.Tests/DependencyInjectionCollection.cs b/service/test/InstructorIQ.Core.Tests/DependencyInjectionCollection.cs
index 577386f4..f4148802 100644
--- a/service/test/InstructorIQ.Core.Tests/DependencyInjectionCollection.cs
+++ b/service/test/InstructorIQ.Core.Tests/DependencyInjectionCollection.cs
@@ -1,13 +1,13 @@
-using System;
+using System;
+
 using Xunit;
 
-namespace InstructorIQ.Core.Tests
+namespace InstructorIQ.Core.Tests;
+
+[CollectionDefinition("DependencyInjectionCollection")]
+public class DependencyInjectionCollection : ICollectionFixture<DependencyInjectionFixture>
 {
-    [CollectionDefinition("DependencyInjectionCollection")]
-    public class DependencyInjectionCollection : ICollectionFixture<DependencyInjectionFixture>
-    {
-        // This class has no code, and is never created. Its purpose is simply
-        // to be the place to apply [CollectionDefinition] and all the
-        // ICollectionFixture<> interfaces.
-    }
-}
\ No newline at end of file
+    // This class has no code, and is never created. Its purpose is simply
+    // to be the place to apply [CollectionDefinition] and all the
+    // ICollectionFixture<> interfaces.
+}
diff --git a/service/test/InstructorIQ.Core.Tests/DependencyInjectionFixture.cs b/service/test/InstructorIQ.Core.Tests/DependencyInjectionFixture.cs
index b288cd8f..ed91ca8e 100644
--- a/service/test/InstructorIQ.Core.Tests/DependencyInjectionFixture.cs
+++ b/service/test/InstructorIQ.Core.Tests/DependencyInjectionFixture.cs
@@ -6,41 +6,40 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace InstructorIQ.Core.Tests
+namespace InstructorIQ.Core.Tests;
+
+public class DependencyInjectionFixture : IDisposable
 {
-    public class DependencyInjectionFixture : IDisposable
+    public DependencyInjectionFixture()
     {
-        public DependencyInjectionFixture()
-        {
-            var enviromentName = Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT") ?? "Test";
-            var builder = new Microsoft.Extensions.Configuration.ConfigurationBuilder()
-                .AddJsonFile("appsettings.json")
-                .AddJsonFile($"appsettings.{enviromentName}.json", true);
+        var enviromentName = Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT") ?? "Test";
+        var builder = new Microsoft.Extensions.Configuration.ConfigurationBuilder()
+            .AddJsonFile("appsettings.json")
+            .AddJsonFile($"appsettings.{enviromentName}.json", true);
 
-            var configuration = builder.Build();
+        var configuration = builder.Build();
 
-            var services = new ServiceCollection();
-            services.AddSingleton(p => configuration);
-            services.AddLogging();
-            services.AddOptions();
+        var services = new ServiceCollection();
+        services.AddSingleton(p => configuration);
+        services.AddLogging();
+        services.AddOptions();
 
-            services.AddTransient<ITenant<TenantReadModel>>(provider => new TenantValue<TenantReadModel>(new TenantReadModel
-            {
-                Id = Data.Constants.Tenant.Test,
-                Slug = "Test",
-                Name = "Test"
-            }));
+        services.AddTransient<ITenant<TenantReadModel>>(provider => new TenantValue<TenantReadModel>(new TenantReadModel
+        {
+            Id = Data.Constants.Tenant.Test,
+            Slug = "Test",
+            Name = "Test"
+        }));
 
-            services.AddInstructorIQCore();
+        services.AddInstructorIQCore();
 
-            ServiceProvider = services.BuildServiceProvider();
+        ServiceProvider = services.BuildServiceProvider();
 
-        }
+    }
 
-        public IServiceProvider ServiceProvider { get; }
+    public IServiceProvider ServiceProvider { get; }
 
-        public void Dispose()
-        {
-        }
+    public void Dispose()
+    {
     }
 }
diff --git a/service/test/InstructorIQ.Core.Tests/Domain/GroupTest.cs b/service/test/InstructorIQ.Core.Tests/Domain/GroupTest.cs
index 15c5cde3..ecb4509c 100644
--- a/service/test/InstructorIQ.Core.Tests/Domain/GroupTest.cs
+++ b/service/test/InstructorIQ.Core.Tests/Domain/GroupTest.cs
@@ -1,110 +1,114 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
+
 using FluentAssertions;
+
 using InstructorIQ.Core.Data.Entities;
 using InstructorIQ.Core.Domain.Models;
+
 using MediatR;
 using MediatR.CommandQuery.Commands;
 using MediatR.CommandQuery.Queries;
+
 using Microsoft.AspNetCore.JsonPatch;
 using Microsoft.AspNetCore.JsonPatch.Operations;
 using Microsoft.Extensions.DependencyInjection;
+
 using Xunit;
 using Xunit.Abstractions;
 
-namespace InstructorIQ.Core.Tests.Domain
+namespace InstructorIQ.Core.Tests.Domain;
+
+[Collection("DependencyInjectionCollection")]
+public class GroupTest : DependencyInjectionBase
 {
-    [Collection("DependencyInjectionCollection")]
-    public class GroupTest : DependencyInjectionBase
+    public GroupTest(ITestOutputHelper outputHelper, DependencyInjectionFixture dependencyInjection)
+        : base(outputHelper, dependencyInjection)
     {
-        public GroupTest(ITestOutputHelper outputHelper, DependencyInjectionFixture dependencyInjection)
-            : base(outputHelper, dependencyInjection)
+    }
+
+    [Fact]
+    public async Task FullTest()
+    {
+        var mediator = ServiceProvider.GetService<IMediator>();
+        mediator.Should().NotBeNull();
+
+        var createModel = new GroupCreateModel
+        {
+            Name = "Group " + DateTime.Now.Ticks,
+            Description = "Created from Unit Test",
+            TenantId = Data.Constants.Tenant.Test
+        };
+
+        var createCommand = new EntityCreateCommand<GroupCreateModel, GroupReadModel>(MockPrincipal.Default, createModel);
+        var createResult = await mediator.Send(createCommand).ConfigureAwait(false);
+        createResult.Should().NotBeNull();
+
+        var identifierQuery = new EntityIdentifierQuery<Guid, GroupReadModel>(MockPrincipal.Default, createResult.Id);
+        var identifierResult = await mediator.Send(identifierQuery).ConfigureAwait(false);
+        identifierResult.Should().NotBeNull();
+        identifierResult.Name.Should().Be(createModel.Name);
+
+
+        var entityQuery = new EntityQuery
         {
-        }
+            Sort = new List<EntitySort> { new EntitySort { Name = "Updated", Direction = "Descending" } },
+            Filter = new EntityFilter { Name = "Name", Value = "Group", Operator = "StartsWith" }
+        };
+        var listQuery = new EntityPagedQuery<GroupReadModel>(MockPrincipal.Default, entityQuery);
+
+        var listResult = await mediator.Send(listQuery).ConfigureAwait(false);
+        listResult.Should().NotBeNull();
 
-        [Fact]
-        public async Task FullTest()
+        var patchModel = new JsonPatchDocument<Group>();
+        patchModel.Operations.Add(new Operation<Group>
         {
-            var mediator = ServiceProvider.GetService<IMediator>();
-            mediator.Should().NotBeNull();
-
-            var createModel = new GroupCreateModel
-            {
-                Name = "Group " + DateTime.Now.Ticks,
-                Description = "Created from Unit Test",
-                TenantId = Data.Constants.Tenant.Test
-            };
-
-            var createCommand = new EntityCreateCommand<GroupCreateModel, GroupReadModel>(MockPrincipal.Default, createModel);
-            var createResult = await mediator.Send(createCommand).ConfigureAwait(false);
-            createResult.Should().NotBeNull();
-
-            var identifierQuery = new EntityIdentifierQuery<Guid, GroupReadModel>(MockPrincipal.Default, createResult.Id);
-            var identifierResult = await mediator.Send(identifierQuery).ConfigureAwait(false);
-            identifierResult.Should().NotBeNull();
-            identifierResult.Name.Should().Be(createModel.Name);
-
-
-            var entityQuery = new EntityQuery
-            {
-                Sort = new List<EntitySort> { new EntitySort { Name = "Updated", Direction = "Descending" } },
-                Filter = new EntityFilter { Name = "Name", Value = "Group", Operator = "StartsWith" }
-            };
-            var listQuery = new EntityPagedQuery<GroupReadModel>(MockPrincipal.Default, entityQuery);
-
-            var listResult = await mediator.Send(listQuery).ConfigureAwait(false);
-            listResult.Should().NotBeNull();
-
-            var patchModel = new JsonPatchDocument<Group>();
-            patchModel.Operations.Add(new Operation<Group>
-            {
-                op = "replace",
-                path = "/Description",
-                value = "Patch Update"
-            });
-
-            var patchCommand = new EntityPatchCommand<Guid, GroupReadModel>(MockPrincipal.Default, createResult.Id, patchModel);
-            var patchResult = await mediator.Send(patchCommand).ConfigureAwait(false);
-            patchResult.Should().NotBeNull();
-            patchResult.Description.Should().Be("Patch Update");
-
-            var updateModel = new GroupUpdateModel
-            {
-                Name = patchResult.Name,
-                Description = "Update Command",
-                TenantId = patchResult.TenantId,
-                RowVersion = patchResult.RowVersion
-            };
-
-            var updateCommand = new EntityUpdateCommand<Guid, GroupUpdateModel, GroupReadModel>(MockPrincipal.Default, createResult.Id, updateModel);
-            var updateResult = await mediator.Send(updateCommand).ConfigureAwait(false);
-            updateResult.Should().NotBeNull();
-            updateResult.Description.Should().Be("Update Command");
-
-            var deleteCommand = new EntityDeleteCommand<Guid, GroupReadModel>(MockPrincipal.Default, createResult.Id);
-            var deleteResult = await mediator.Send(deleteCommand).ConfigureAwait(false);
-            deleteResult.Should().NotBeNull();
-            deleteResult.Id.Should().Be(createResult.Id);
-        }
-
-        [Fact]
-        public async Task QueryStartsWithList()
+            op = "replace",
+            path = "/Description",
+            value = "Patch Update"
+        });
+
+        var patchCommand = new EntityPatchCommand<Guid, GroupReadModel>(MockPrincipal.Default, createResult.Id, patchModel);
+        var patchResult = await mediator.Send(patchCommand).ConfigureAwait(false);
+        patchResult.Should().NotBeNull();
+        patchResult.Description.Should().Be("Patch Update");
+
+        var updateModel = new GroupUpdateModel
         {
-            var mediator = ServiceProvider.GetService<IMediator>();
-            mediator.Should().NotBeNull();
+            Name = patchResult.Name,
+            Description = "Update Command",
+            TenantId = patchResult.TenantId,
+            RowVersion = patchResult.RowVersion
+        };
+
+        var updateCommand = new EntityUpdateCommand<Guid, GroupUpdateModel, GroupReadModel>(MockPrincipal.Default, createResult.Id, updateModel);
+        var updateResult = await mediator.Send(updateCommand).ConfigureAwait(false);
+        updateResult.Should().NotBeNull();
+        updateResult.Description.Should().Be("Update Command");
+
+        var deleteCommand = new EntityDeleteCommand<Guid, GroupReadModel>(MockPrincipal.Default, createResult.Id);
+        var deleteResult = await mediator.Send(deleteCommand).ConfigureAwait(false);
+        deleteResult.Should().NotBeNull();
+        deleteResult.Id.Should().Be(createResult.Id);
+    }
 
-            var query = new EntityQuery
-            {
-                Sort = new List<EntitySort> { new EntitySort { Name = "Updated", Direction = "Descending" } },
-                Filter = new EntityFilter { Name = "Name", Value = "Group", Operator = "StartsWith" }
-            };
-            var command = new EntityPagedQuery<GroupReadModel>(MockPrincipal.Default, query);
+    [Fact]
+    public async Task QueryStartsWithList()
+    {
+        var mediator = ServiceProvider.GetService<IMediator>();
+        mediator.Should().NotBeNull();
 
-            var result = await mediator.Send(command).ConfigureAwait(false);
-            result.Should().NotBeNull();
+        var query = new EntityQuery
+        {
+            Sort = new List<EntitySort> { new EntitySort { Name = "Updated", Direction = "Descending" } },
+            Filter = new EntityFilter { Name = "Name", Value = "Group", Operator = "StartsWith" }
+        };
+        var command = new EntityPagedQuery<GroupReadModel>(MockPrincipal.Default, query);
 
-        }
+        var result = await mediator.Send(command).ConfigureAwait(false);
+        result.Should().NotBeNull();
 
     }
+
 }
diff --git a/service/test/InstructorIQ.Core.Tests/Domain/LocationTest.cs b/service/test/InstructorIQ.Core.Tests/Domain/LocationTest.cs
index c11ddc97..bdabeefd 100644
--- a/service/test/InstructorIQ.Core.Tests/Domain/LocationTest.cs
+++ b/service/test/InstructorIQ.Core.Tests/Domain/LocationTest.cs
@@ -1,111 +1,114 @@
-using System;
+using System;
+using System.Collections.Generic;
 using System.Threading.Tasks;
-using DataGenerator;
-using MediatR.CommandQuery.Commands;
-using MediatR.CommandQuery.Queries;
+
 using FluentAssertions;
+
 using InstructorIQ.Core.Data.Entities;
 using InstructorIQ.Core.Domain.Models;
+
 using MediatR;
+using MediatR.CommandQuery.Commands;
+using MediatR.CommandQuery.Queries;
+
 using Microsoft.AspNetCore.JsonPatch;
 using Microsoft.AspNetCore.JsonPatch.Operations;
 using Microsoft.Extensions.DependencyInjection;
+
 using Xunit;
 using Xunit.Abstractions;
-using System.Collections.Generic;
 
-namespace InstructorIQ.Core.Tests.Domain
+namespace InstructorIQ.Core.Tests.Domain;
+
+[Collection("DependencyInjectionCollection")]
+public class LocationTest : DependencyInjectionBase
 {
-    [Collection("DependencyInjectionCollection")]
-    public class LocationTest : DependencyInjectionBase
+    public LocationTest(ITestOutputHelper outputHelper, DependencyInjectionFixture dependencyInjection)
+        : base(outputHelper, dependencyInjection)
+    {
+    }
+
+    [Fact]
+    public async Task FullTest()
     {
-        public LocationTest(ITestOutputHelper outputHelper, DependencyInjectionFixture dependencyInjection)
-            : base(outputHelper, dependencyInjection)
+        var mediator = ServiceProvider.GetService<IMediator>();
+        mediator.Should().NotBeNull();
+
+        var createModel = new LocationCreateModel
+        {
+            Name = "Location " + DateTime.Now.Ticks,
+            Description = "Created from Unit Test",
+            TenantId = Data.Constants.Tenant.Test
+        };
+
+        var createCommand = new EntityCreateCommand<LocationCreateModel, LocationReadModel>(MockPrincipal.Default, createModel);
+        var createResult = await mediator.Send(createCommand).ConfigureAwait(false);
+        createResult.Should().NotBeNull();
+
+        var identifierQuery = new EntityIdentifierQuery<Guid, LocationReadModel>(MockPrincipal.Default, createResult.Id);
+        var identifierResult = await mediator.Send(identifierQuery).ConfigureAwait(false);
+        identifierResult.Should().NotBeNull();
+        identifierResult.Name.Should().Be(createModel.Name);
+
+
+        var entityQuery = new EntityQuery
         {
-        }
+            Sort = new List<EntitySort> { new EntitySort { Name = "Updated", Direction = "Descending" } },
+            Filter = new EntityFilter { Name = "Name", Value = "Location", Operator = "StartsWith" }
+        };
+        var listQuery = new EntityPagedQuery<LocationReadModel>(MockPrincipal.Default, entityQuery);
 
-        [Fact]
-        public async Task FullTest()
+        var listResult = await mediator.Send(listQuery).ConfigureAwait(false);
+        listResult.Should().NotBeNull();
+
+        var patchModel = new JsonPatchDocument<Location>();
+        patchModel.Operations.Add(new Operation<Location>
         {
-            var mediator = ServiceProvider.GetService<IMediator>();
-            mediator.Should().NotBeNull();
-
-            var createModel = new LocationCreateModel
-            {
-                Name = "Location " + DateTime.Now.Ticks,
-                Description = "Created from Unit Test",
-                TenantId = Data.Constants.Tenant.Test
-            };
-
-            var createCommand = new EntityCreateCommand<LocationCreateModel, LocationReadModel>(MockPrincipal.Default, createModel);
-            var createResult = await mediator.Send(createCommand).ConfigureAwait(false);
-            createResult.Should().NotBeNull();
-
-            var identifierQuery = new EntityIdentifierQuery<Guid, LocationReadModel>(MockPrincipal.Default, createResult.Id);
-            var identifierResult = await mediator.Send(identifierQuery).ConfigureAwait(false);
-            identifierResult.Should().NotBeNull();
-            identifierResult.Name.Should().Be(createModel.Name);
-
-
-            var entityQuery = new EntityQuery
-            {
-                Sort = new List<EntitySort> { new EntitySort { Name = "Updated", Direction = "Descending" } },
-                Filter = new EntityFilter { Name = "Name", Value = "Location", Operator = "StartsWith" }
-            };
-            var listQuery = new EntityPagedQuery<LocationReadModel>(MockPrincipal.Default, entityQuery);
-
-            var listResult = await mediator.Send(listQuery).ConfigureAwait(false);
-            listResult.Should().NotBeNull();
-
-            var patchModel = new JsonPatchDocument<Location>();
-            patchModel.Operations.Add(new Operation<Location>
-            {
-                op = "replace",
-                path = "/Description",
-                value = "Patch Update"
-            });
-
-            var patchCommand = new EntityPatchCommand<Guid, LocationReadModel>(MockPrincipal.Default, createResult.Id, patchModel);
-            var patchResult = await mediator.Send(patchCommand).ConfigureAwait(false);
-            patchResult.Should().NotBeNull();
-            patchResult.Description.Should().Be("Patch Update");
-
-            var updateModel = new LocationUpdateModel
-            {
-                Name = patchResult.Name,
-                Description = "Update Command",
-                TenantId = patchResult.TenantId,
-                RowVersion = patchResult.RowVersion
-            };
-
-            var updateCommand = new EntityUpdateCommand<Guid, LocationUpdateModel, LocationReadModel>(MockPrincipal.Default, createResult.Id, updateModel);
-            var updateResult = await mediator.Send(updateCommand).ConfigureAwait(false);
-            updateResult.Should().NotBeNull();
-            updateResult.Description.Should().Be("Update Command");
-
-            var deleteCommand = new EntityDeleteCommand<Guid, LocationReadModel>(MockPrincipal.Default, createResult.Id);
-            var deleteResult = await mediator.Send(deleteCommand).ConfigureAwait(false);
-            deleteResult.Should().NotBeNull();
-            deleteResult.Id.Should().Be(createResult.Id);
-        }
-
-        [Fact]
-        public async Task QueryStartsWithList()
+            op = "replace",
+            path = "/Description",
+            value = "Patch Update"
+        });
+
+        var patchCommand = new EntityPatchCommand<Guid, LocationReadModel>(MockPrincipal.Default, createResult.Id, patchModel);
+        var patchResult = await mediator.Send(patchCommand).ConfigureAwait(false);
+        patchResult.Should().NotBeNull();
+        patchResult.Description.Should().Be("Patch Update");
+
+        var updateModel = new LocationUpdateModel
         {
-            var mediator = ServiceProvider.GetService<IMediator>();
-            mediator.Should().NotBeNull();
+            Name = patchResult.Name,
+            Description = "Update Command",
+            TenantId = patchResult.TenantId,
+            RowVersion = patchResult.RowVersion
+        };
+
+        var updateCommand = new EntityUpdateCommand<Guid, LocationUpdateModel, LocationReadModel>(MockPrincipal.Default, createResult.Id, updateModel);
+        var updateResult = await mediator.Send(updateCommand).ConfigureAwait(false);
+        updateResult.Should().NotBeNull();
+        updateResult.Description.Should().Be("Update Command");
+
+        var deleteCommand = new EntityDeleteCommand<Guid, LocationReadModel>(MockPrincipal.Default, createResult.Id);
+        var deleteResult = await mediator.Send(deleteCommand).ConfigureAwait(false);
+        deleteResult.Should().NotBeNull();
+        deleteResult.Id.Should().Be(createResult.Id);
+    }
 
-            var query = new EntityQuery
-            {
-                Sort = new List<EntitySort> { new EntitySort { Name = "Updated", Direction = "Descending" } },
-                Filter = new EntityFilter { Name = "Name", Value = "Location", Operator = "StartsWith" }
-            };
-            var command = new EntityPagedQuery<LocationReadModel>(MockPrincipal.Default, query);
+    [Fact]
+    public async Task QueryStartsWithList()
+    {
+        var mediator = ServiceProvider.GetService<IMediator>();
+        mediator.Should().NotBeNull();
 
-            var result = await mediator.Send(command).ConfigureAwait(false);
-            result.Should().NotBeNull();
+        var query = new EntityQuery
+        {
+            Sort = new List<EntitySort> { new EntitySort { Name = "Updated", Direction = "Descending" } },
+            Filter = new EntityFilter { Name = "Name", Value = "Location", Operator = "StartsWith" }
+        };
+        var command = new EntityPagedQuery<LocationReadModel>(MockPrincipal.Default, query);
 
-        }
+        var result = await mediator.Send(command).ConfigureAwait(false);
+        result.Should().NotBeNull();
 
     }
-}
\ No newline at end of file
+
+}
diff --git a/service/test/InstructorIQ.Core.Tests/Domain/TenantTest.cs b/service/test/InstructorIQ.Core.Tests/Domain/TenantTest.cs
index 7816b0be..3181047a 100644
--- a/service/test/InstructorIQ.Core.Tests/Domain/TenantTest.cs
+++ b/service/test/InstructorIQ.Core.Tests/Domain/TenantTest.cs
@@ -1,133 +1,143 @@
-using System;
+using System;
+using System.Collections.Generic;
 using System.Threading.Tasks;
+
 using AutoMapper;
-using DataGenerator;
-using MediatR.CommandQuery.Commands;
-using MediatR.CommandQuery.Queries;
+
+using Bogus;
+
 using FluentAssertions;
+
 using InstructorIQ.Core.Data.Entities;
 using InstructorIQ.Core.Domain.Models;
+
 using MediatR;
+using MediatR.CommandQuery.Commands;
+using MediatR.CommandQuery.Queries;
+
 using Microsoft.AspNetCore.JsonPatch;
 using Microsoft.AspNetCore.JsonPatch.Operations;
 using Microsoft.Extensions.DependencyInjection;
+
 using Xunit;
 using Xunit.Abstractions;
-using System.Collections.Generic;
 
-namespace InstructorIQ.Core.Tests.Domain
+namespace InstructorIQ.Core.Tests.Domain;
+
+[Collection("DependencyInjectionCollection")]
+public class TenantTest : DependencyInjectionBase
 {
-    [Collection("DependencyInjectionCollection")]
-    public class TenantTest : DependencyInjectionBase
+    public TenantTest(ITestOutputHelper outputHelper, DependencyInjectionFixture dependencyInjection)
+        : base(outputHelper, dependencyInjection)
+    {
+    }
+
+    [Fact]
+    public async Task FullTest()
     {
-        public TenantTest(ITestOutputHelper outputHelper, DependencyInjectionFixture dependencyInjection)
-            : base(outputHelper, dependencyInjection)
+        var mediator = ServiceProvider.GetService<IMediator>();
+        mediator.Should().NotBeNull();
+
+        var mapper = ServiceProvider.GetService<IMapper>();
+        mapper.Should().NotBeNull();
+
+        var generator = new Faker<TenantCreateModel>()
+            .RuleFor(p => p.Name, f => f.Company.CompanyName())
+            .RuleFor(p => p.Description, f => f.Lorem.Sentence());
+
+        // Create Entity
+        var createModel = generator.Generate();
+        createModel.Slug = "Test" + DateTime.Now.Ticks;
+        createModel.TimeZone = "Central Standard Time";
+
+        var createCommand = new EntityCreateCommand<TenantCreateModel, TenantReadModel>(MockPrincipal.Default, createModel);
+        var createResult = await mediator.Send(createCommand).ConfigureAwait(false);
+        createResult.Should().NotBeNull();
+
+        // Get Entity by Key
+        var identifierQuery = new EntityIdentifierQuery<Guid, TenantReadModel>(MockPrincipal.Default, createResult.Id);
+        var identifierResult = await mediator.Send(identifierQuery).ConfigureAwait(false);
+        identifierResult.Should().NotBeNull();
+        identifierResult.Name.Should().Be(createModel.Name);
+
+        // Query Entity
+        var entityQuery = new EntityQuery
         {
-        }
+            Sort = new List<EntitySort> { new EntitySort { Name = "Updated", Direction = "Descending" } },
+            Filter = new EntityFilter { Name = "Slug", Value = "TEST" }
+        };
+        var listQuery = new EntityPagedQuery<TenantReadModel>(MockPrincipal.Default, entityQuery);
+
+        var listResult = await mediator.Send(listQuery).ConfigureAwait(false);
+        listResult.Should().NotBeNull();
 
-        [Fact]
-        public async Task FullTest()
+        // Patch Entity
+        var patchModel = new JsonPatchDocument<Tenant>();
+        patchModel.Operations.Add(new Operation<Tenant>
         {
-            var mediator = ServiceProvider.GetService<IMediator>();
-            mediator.Should().NotBeNull();
-
-            var mapper = ServiceProvider.GetService<IMapper>();
-            mapper.Should().NotBeNull();
-
-            // Create Entity
-            var createModel = Generator.Default.Single<TenantCreateModel>();
-            createModel.Slug = "Test" + DateTime.Now.Ticks;
-            createModel.TimeZone = "Central Standard Time";
-
-            var createCommand = new EntityCreateCommand<TenantCreateModel, TenantReadModel>(MockPrincipal.Default, createModel);
-            var createResult = await mediator.Send(createCommand).ConfigureAwait(false);
-            createResult.Should().NotBeNull();
-
-            // Get Entity by Key
-            var identifierQuery = new EntityIdentifierQuery<Guid, TenantReadModel>(MockPrincipal.Default, createResult.Id);
-            var identifierResult = await mediator.Send(identifierQuery).ConfigureAwait(false);
-            identifierResult.Should().NotBeNull();
-            identifierResult.Name.Should().Be(createModel.Name);
-
-            // Query Entity
-            var entityQuery = new EntityQuery
-            {
-                Sort = new List<EntitySort> { new EntitySort { Name = "Updated", Direction = "Descending" } },
-                Filter = new EntityFilter { Name = "Slug", Value = "TEST" }
-            };
-            var listQuery = new EntityPagedQuery<TenantReadModel>(MockPrincipal.Default, entityQuery);
-
-            var listResult = await mediator.Send(listQuery).ConfigureAwait(false);
-            listResult.Should().NotBeNull();
-
-            // Patch Entity
-            var patchModel = new JsonPatchDocument<Tenant>();
-            patchModel.Operations.Add(new Operation<Tenant>
-            {
-                op = "replace",
-                path = "/Description",
-                value = "Patch Update"
-            });
-
-            var patchCommand = new EntityPatchCommand<Guid, TenantReadModel>(MockPrincipal.Default, createResult.Id, patchModel);
-            var patchResult = await mediator.Send(patchCommand).ConfigureAwait(false);
-            patchResult.Should().NotBeNull();
-            patchResult.Description.Should().Be("Patch Update");
-
-            // Update Entity
-            var updateModel = mapper.Map<TenantUpdateModel>(patchResult);
-            updateModel.Description = "Update Command";
-
-            var updateCommand = new EntityUpdateCommand<Guid, TenantUpdateModel, TenantReadModel>(MockPrincipal.Default, createResult.Id, updateModel);
-            var updateResult = await mediator.Send(updateCommand).ConfigureAwait(false);
-            updateResult.Should().NotBeNull();
-            updateResult.Description.Should().Be("Update Command");
-
-            // Delete Entity
-            var deleteCommand = new EntityDeleteCommand<Guid, TenantReadModel>(MockPrincipal.Default, createResult.Id);
-            var deleteResult = await mediator.Send(deleteCommand).ConfigureAwait(false);
-            deleteResult.Should().NotBeNull();
-            deleteResult.Id.Should().Be(createResult.Id);
-        }
-
-
-        [Fact]
-        public async Task CreateTenant()
+            op = "replace",
+            path = "/Description",
+            value = "Patch Update"
+        });
+
+        var patchCommand = new EntityPatchCommand<Guid, TenantReadModel>(MockPrincipal.Default, createResult.Id, patchModel);
+        var patchResult = await mediator.Send(patchCommand).ConfigureAwait(false);
+        patchResult.Should().NotBeNull();
+        patchResult.Description.Should().Be("Patch Update");
+
+        // Update Entity
+        var updateModel = mapper.Map<TenantUpdateModel>(patchResult);
+        updateModel.Description = "Update Command";
+
+        var updateCommand = new EntityUpdateCommand<Guid, TenantUpdateModel, TenantReadModel>(MockPrincipal.Default, createResult.Id, updateModel);
+        var updateResult = await mediator.Send(updateCommand).ConfigureAwait(false);
+        updateResult.Should().NotBeNull();
+        updateResult.Description.Should().Be("Update Command");
+
+        // Delete Entity
+        var deleteCommand = new EntityDeleteCommand<Guid, TenantReadModel>(MockPrincipal.Default, createResult.Id);
+        var deleteResult = await mediator.Send(deleteCommand).ConfigureAwait(false);
+        deleteResult.Should().NotBeNull();
+        deleteResult.Id.Should().Be(createResult.Id);
+    }
+
+
+    [Fact]
+    public async Task CreateTenant()
+    {
+        var mediator = ServiceProvider.GetService<IMediator>();
+        mediator.Should().NotBeNull();
+
+        var createModel = new TenantCreateModel
         {
-            var mediator = ServiceProvider.GetService<IMediator>();
-            mediator.Should().NotBeNull();
+            Slug = "Test" + DateTime.Now.Ticks,
+            Name = "Test Department " + DateTime.Now.Ticks,
+            Description = "Created from Unit Test",
+            TimeZone = "Central Standard Time"
+        };
 
-            var createModel = new TenantCreateModel
-            {
-                Slug = "Test" + DateTime.Now.Ticks,
-                Name = "Test Department " + DateTime.Now.Ticks,
-                Description = "Created from Unit Test",
-                TimeZone = "Central Standard Time"
-            };
+        var command = new EntityCreateCommand<TenantCreateModel, TenantReadModel>(MockPrincipal.Default, createModel);
 
-            var command = new EntityCreateCommand<TenantCreateModel, TenantReadModel>(MockPrincipal.Default, createModel);
+        var result = await mediator.Send(command).ConfigureAwait(false);
+        result.Should().NotBeNull();
 
-            var result = await mediator.Send(command).ConfigureAwait(false);
-            result.Should().NotBeNull();
+    }
 
-        }
+    [Fact]
+    public async Task QueryList()
+    {
+        var mediator = ServiceProvider.GetService<IMediator>();
+        mediator.Should().NotBeNull();
 
-        [Fact]
-        public async Task QueryList()
+        var query = new EntityQuery
         {
-            var mediator = ServiceProvider.GetService<IMediator>();
-            mediator.Should().NotBeNull();
-
-            var query = new EntityQuery
-            {
-                Sort = new List<EntitySort> { new EntitySort { Name = "Updated", Direction = "Descending" } },
-                Filter = new EntityFilter { Name = "Slug", Value = "TEST" }
-            };
-            var command = new EntityPagedQuery<TenantReadModel>(MockPrincipal.Default, query);
+            Sort = new List<EntitySort> { new EntitySort { Name = "Updated", Direction = "Descending" } },
+            Filter = new EntityFilter { Name = "Slug", Value = "TEST" }
+        };
+        var command = new EntityPagedQuery<TenantReadModel>(MockPrincipal.Default, query);
 
-            var result = await mediator.Send(command).ConfigureAwait(false);
-            result.Should().NotBeNull();
+        var result = await mediator.Send(command).ConfigureAwait(false);
+        result.Should().NotBeNull();
 
-        }
     }
 }
diff --git a/service/test/InstructorIQ.Core.Tests/Domain/TopicTest.cs b/service/test/InstructorIQ.Core.Tests/Domain/TopicTest.cs
index 2eb08853..66eca465 100644
--- a/service/test/InstructorIQ.Core.Tests/Domain/TopicTest.cs
+++ b/service/test/InstructorIQ.Core.Tests/Domain/TopicTest.cs
@@ -1,93 +1,102 @@
-using System;
+using System;
+using System.Collections.Generic;
 using System.Threading.Tasks;
+
 using AutoMapper;
-using DataGenerator;
-using MediatR.CommandQuery.Commands;
-using MediatR.CommandQuery.Queries;
+
+using Bogus;
+
 using FluentAssertions;
+
 using InstructorIQ.Core.Data.Entities;
 using InstructorIQ.Core.Domain.Models;
+
 using MediatR;
+using MediatR.CommandQuery.Commands;
+using MediatR.CommandQuery.Queries;
+
 using Microsoft.AspNetCore.JsonPatch;
 using Microsoft.AspNetCore.JsonPatch.Operations;
 using Microsoft.Extensions.DependencyInjection;
+
 using Xunit;
 using Xunit.Abstractions;
-using System.Collections.Generic;
 
-namespace InstructorIQ.Core.Tests.Domain
+namespace InstructorIQ.Core.Tests.Domain;
+
+[Collection("DependencyInjectionCollection")]
+public class TopicTest : DependencyInjectionBase
 {
-    [Collection("DependencyInjectionCollection")]
-    public class TopicTest : DependencyInjectionBase
+    public TopicTest(ITestOutputHelper outputHelper, DependencyInjectionFixture dependencyInjection)
+        : base(outputHelper, dependencyInjection)
     {
-        public TopicTest(ITestOutputHelper outputHelper, DependencyInjectionFixture dependencyInjection)
-            : base(outputHelper, dependencyInjection)
+    }
+
+    [Fact]
+    public async Task FullTest()
+    {
+        var mediator = ServiceProvider.GetService<IMediator>();
+        mediator.Should().NotBeNull();
+
+        var mapper = ServiceProvider.GetService<IMapper>();
+        mapper.Should().NotBeNull();
+
+        // Create Entity
+        var generator = new Faker<TopicCreateModel>()
+            .RuleFor(p => p.Description, f => f.Lorem.Sentence());
+
+        var createModel = generator.Generate();
+        createModel.TenantId = Data.Constants.Tenant.Test;
+        createModel.Title = "TEST";
+
+        var createCommand = new EntityCreateCommand<TopicCreateModel, TopicReadModel>(MockPrincipal.Default, createModel);
+        var createResult = await mediator.Send(createCommand).ConfigureAwait(false);
+        createResult.Should().NotBeNull();
+
+        // Get Entity by Key
+        var identifierQuery = new EntityIdentifierQuery<Guid, TopicReadModel>(MockPrincipal.Default, createResult.Id);
+        var identifierResult = await mediator.Send(identifierQuery).ConfigureAwait(false);
+        identifierResult.Should().NotBeNull();
+        identifierResult.Title.Should().Be(createModel.Title);
+
+        // Query Entity
+        var entityQuery = new EntityQuery
         {
-        }
+            Sort = new List<EntitySort> { new EntitySort { Name = "Updated", Direction = "Descending" } },
+            Filter = new EntityFilter { Name = "Title", Value = "TEST" }
+        };
+        var listQuery = new EntityPagedQuery<TopicReadModel>(MockPrincipal.Default, entityQuery);
 
-        [Fact]
-        public async Task FullTest()
+        var listResult = await mediator.Send(listQuery).ConfigureAwait(false);
+        listResult.Should().NotBeNull();
+
+        // Patch Entity
+        var patchModel = new JsonPatchDocument<Topic>();
+        patchModel.Operations.Add(new Operation<Topic>
         {
-            var mediator = ServiceProvider.GetService<IMediator>();
-            mediator.Should().NotBeNull();
-
-            var mapper = ServiceProvider.GetService<IMapper>();
-            mapper.Should().NotBeNull();
-
-            // Create Entity
-            var createModel = Generator.Default.Single<TopicCreateModel>();
-            createModel.TenantId = Data.Constants.Tenant.Test;
-            createModel.Title = "TEST";
-
-            var createCommand = new EntityCreateCommand<TopicCreateModel, TopicReadModel>(MockPrincipal.Default, createModel);
-            var createResult = await mediator.Send(createCommand).ConfigureAwait(false);
-            createResult.Should().NotBeNull();
-
-            // Get Entity by Key
-            var identifierQuery = new EntityIdentifierQuery<Guid, TopicReadModel>(MockPrincipal.Default, createResult.Id);
-            var identifierResult = await mediator.Send(identifierQuery).ConfigureAwait(false);
-            identifierResult.Should().NotBeNull();
-            identifierResult.Title.Should().Be(createModel.Title);
-
-            // Query Entity
-            var entityQuery = new EntityQuery
-            {
-                Sort = new List<EntitySort> { new EntitySort { Name = "Updated", Direction = "Descending" } },
-                Filter = new EntityFilter { Name = "Title", Value = "TEST" }
-            };
-            var listQuery = new EntityPagedQuery<TopicReadModel>(MockPrincipal.Default, entityQuery);
-
-            var listResult = await mediator.Send(listQuery).ConfigureAwait(false);
-            listResult.Should().NotBeNull();
-
-            // Patch Entity
-            var patchModel = new JsonPatchDocument<Topic>();
-            patchModel.Operations.Add(new Operation<Topic>
-            {
-                op = "replace",
-                path = "/Description",
-                value = "Patch Update"
-            });
-
-            var patchCommand = new EntityPatchCommand<Guid, TopicReadModel>(MockPrincipal.Default, createResult.Id, patchModel);
-            var patchResult = await mediator.Send(patchCommand).ConfigureAwait(false);
-            patchResult.Should().NotBeNull();
-            patchResult.Description.Should().Be("Patch Update");
-
-            // Update Entity
-            var updateModel = mapper.Map<TopicUpdateModel>(patchResult);
-            updateModel.Description = "Update Command";
-
-            var updateCommand = new EntityUpdateCommand<Guid, TopicUpdateModel, TopicReadModel>(MockPrincipal.Default, createResult.Id, updateModel);
-            var updateResult = await mediator.Send(updateCommand).ConfigureAwait(false);
-            updateResult.Should().NotBeNull();
-            updateResult.Description.Should().Be("Update Command");
-
-            // Delete Entity
-            var deleteCommand = new EntityDeleteCommand<Guid, TopicReadModel>(MockPrincipal.Default, createResult.Id);
-            var deleteResult = await mediator.Send(deleteCommand).ConfigureAwait(false);
-            deleteResult.Should().NotBeNull();
-            deleteResult.Id.Should().Be(createResult.Id);
-        }
+            op = "replace",
+            path = "/Description",
+            value = "Patch Update"
+        });
+
+        var patchCommand = new EntityPatchCommand<Guid, TopicReadModel>(MockPrincipal.Default, createResult.Id, patchModel);
+        var patchResult = await mediator.Send(patchCommand).ConfigureAwait(false);
+        patchResult.Should().NotBeNull();
+        patchResult.Description.Should().Be("Patch Update");
+
+        // Update Entity
+        var updateModel = mapper.Map<TopicUpdateModel>(patchResult);
+        updateModel.Description = "Update Command";
+
+        var updateCommand = new EntityUpdateCommand<Guid, TopicUpdateModel, TopicReadModel>(MockPrincipal.Default, createResult.Id, updateModel);
+        var updateResult = await mediator.Send(updateCommand).ConfigureAwait(false);
+        updateResult.Should().NotBeNull();
+        updateResult.Description.Should().Be("Update Command");
+
+        // Delete Entity
+        var deleteCommand = new EntityDeleteCommand<Guid, TopicReadModel>(MockPrincipal.Default, createResult.Id);
+        var deleteResult = await mediator.Send(deleteCommand).ConfigureAwait(false);
+        deleteResult.Should().NotBeNull();
+        deleteResult.Id.Should().Be(createResult.Id);
     }
-}
\ No newline at end of file
+}
diff --git a/service/test/InstructorIQ.Core.Tests/Extensions/DateTimeExtensionsTests.cs b/service/test/InstructorIQ.Core.Tests/Extensions/DateTimeExtensionsTests.cs
index fda8641b..00210fd0 100644
--- a/service/test/InstructorIQ.Core.Tests/Extensions/DateTimeExtensionsTests.cs
+++ b/service/test/InstructorIQ.Core.Tests/Extensions/DateTimeExtensionsTests.cs
@@ -1,100 +1,102 @@
-using System;
+using System;
 using System.Globalization;
+
 using FluentAssertions;
+
 using InstructorIQ.Core.Extensions;
+
 using Xunit;
 using Xunit.Abstractions;
 
-namespace InstructorIQ.Core.Tests.Extensions
+namespace InstructorIQ.Core.Tests.Extensions;
+
+public class DateTimeExtensionsTests : UnitTestBase
 {
-    public class DateTimeExtensionsTests : UnitTestBase
+    public DateTimeExtensionsTests(ITestOutputHelper outputHelper)
+        : base(outputHelper)
     {
-        public DateTimeExtensionsTests(ITestOutputHelper outputHelper)
-            : base(outputHelper)
-        {
-        }
+    }
 
-        [Fact]
-        public void TimezoneTests()
-        {
-            var localDate = new DateTime(2019, 3, 1, 19, 15, 0, DateTimeKind.Local);
-            var utcDate = localDate.ToUniversalTime();
-            var zoneInfo = TimeZoneInfo.FindSystemTimeZoneById("Eastern Standard Time");
-            var zoneDate = TimeZoneInfo.ConvertTime(localDate, zoneInfo);
-            var zoneFromUtc = TimeZoneInfo.ConvertTimeFromUtc(utcDate, zoneInfo);
-        }
+    [Fact]
+    public void TimezoneTests()
+    {
+        var localDate = new DateTime(2019, 3, 1, 19, 15, 0, DateTimeKind.Local);
+        var utcDate = localDate.ToUniversalTime();
+        var zoneInfo = TimeZoneInfo.FindSystemTimeZoneById("Eastern Standard Time");
+        var zoneDate = TimeZoneInfo.ConvertTime(localDate, zoneInfo);
+        var zoneFromUtc = TimeZoneInfo.ConvertTimeFromUtc(utcDate, zoneInfo);
+    }
 
-        [Fact]
-        public void TimezoneOffsetTests()
-        {
-            var utc = DateTime.UtcNow;
+    [Fact]
+    public void TimezoneOffsetTests()
+    {
+        var utc = DateTime.UtcNow;
 
-            var centralZone = TimeZoneInfo.FindSystemTimeZoneById("Central Standard Time");
-            var centralOffset = centralZone.GetUtcOffset(utc);
+        var centralZone = TimeZoneInfo.FindSystemTimeZoneById("Central Standard Time");
+        var centralOffset = centralZone.GetUtcOffset(utc);
 
-            var localDate = new DateTime(2019, 3, 1, 19, 15, 0, DateTimeKind.Local);
-            var localDateOffset = new DateTimeOffset(2019, 3, 1, 19, 15, 0, centralOffset);
+        var localDate = new DateTime(2019, 3, 1, 19, 15, 0, DateTimeKind.Local);
+        var localDateOffset = new DateTimeOffset(2019, 3, 1, 19, 15, 0, centralOffset);
 
-            var easternZone = TimeZoneInfo.FindSystemTimeZoneById("Eastern Standard Time");
-            var easternOffset = easternZone.GetUtcOffset(utc);
+        var easternZone = TimeZoneInfo.FindSystemTimeZoneById("Eastern Standard Time");
+        var easternOffset = easternZone.GetUtcOffset(utc);
 
-            var easternDateOffset = localDateOffset.ToOffset(easternOffset);
+        var easternDateOffset = localDateOffset.ToOffset(easternOffset);
 
-            var localDateUtc = localDateOffset.ToUniversalTime();
-            var easternDateUtc = easternDateOffset.ToUniversalTime();
+        var localDateUtc = localDateOffset.ToUniversalTime();
+        var easternDateUtc = easternDateOffset.ToUniversalTime();
 
-            //var zoneDate = TimeZoneInfo.ConvertTime(localDate, zoneInfo);
-            //var zoneFromUtc = TimeZoneInfo.ConvertTimeFromUtc(utcDate, zoneInfo);
-        }
+        //var zoneDate = TimeZoneInfo.ConvertTime(localDate, zoneInfo);
+        //var zoneFromUtc = TimeZoneInfo.ConvertTimeFromUtc(utcDate, zoneInfo);
+    }
 
-        [Fact]
-        public void ToUserTime()
-        {
-            // server time is east cost, but time entered in ui is central
-            var easternZone = TimeZoneInfo.FindSystemTimeZoneById("Eastern Standard Time");
-            var easternOffset = easternZone.GetUtcOffset(DateTime.UtcNow);
+    [Fact]
+    public void ToUserTime()
+    {
+        // server time is east cost, but time entered in ui is central
+        var easternZone = TimeZoneInfo.FindSystemTimeZoneById("Eastern Standard Time");
+        var easternOffset = easternZone.GetUtcOffset(DateTime.UtcNow);
 
-            var centralZone = TimeZoneInfo.FindSystemTimeZoneById("Central Standard Time");
-            var centralOffset = centralZone.GetUtcOffset(DateTime.UtcNow);
+        var centralZone = TimeZoneInfo.FindSystemTimeZoneById("Central Standard Time");
+        var centralOffset = centralZone.GetUtcOffset(DateTime.UtcNow);
 
-            var centralTime = new DateTimeOffset(2019, 3, 1, 19, 15, 0, centralOffset);
+        var centralTime = new DateTimeOffset(2019, 3, 1, 19, 15, 0, centralOffset);
 
-            var serverTime = new DateTimeOffset(2019, 3, 1, 19, 15, 0, easternOffset);
+        var serverTime = new DateTimeOffset(2019, 3, 1, 19, 15, 0, easternOffset);
 
-            //var userTime = serverTime.ToUserTimeFromServer(centralZone);
+        //var userTime = serverTime.ToUserTimeFromServer(centralZone);
 
-            //var userUtc = userTime.ToUniversalTime();
-            var centralUtc = centralTime.ToUniversalTime();
+        //var userUtc = userTime.ToUniversalTime();
+        var centralUtc = centralTime.ToUniversalTime();
 
-            var returnOffset = centralZone.GetUtcOffset(DateTime.UtcNow);
+        var returnOffset = centralZone.GetUtcOffset(DateTime.UtcNow);
 
-            //var returnTimeA = userUtc.ToUserTimeFromUtc(centralZone);
-            //var returnTimeB = userUtc.ToOffset(returnOffset);
-            //var returnTimeC = TimeZoneInfo.ConvertTime(userUtc, centralZone);
-        }
+        //var returnTimeA = userUtc.ToUserTimeFromUtc(centralZone);
+        //var returnTimeB = userUtc.ToOffset(returnOffset);
+        //var returnTimeC = TimeZoneInfo.ConvertTime(userUtc, centralZone);
+    }
 
-        [Fact]
-        public void GetFirstDayOfWeek()
-        {
-            var startDate = DateTimeFormatInfo.CurrentInfo.GetFirstDayOfWeek(2019, 1);
-            startDate.Should().Be(new DateTime(2018, 12, 30));
+    [Fact]
+    public void GetFirstDayOfWeek()
+    {
+        var startDate = DateTimeFormatInfo.CurrentInfo.GetFirstDayOfWeek(2019, 1);
+        startDate.Should().Be(new DateTime(2018, 12, 30));
 
-            startDate = DateTimeFormatInfo.CurrentInfo.GetFirstDayOfWeek(2019, 10);
-            startDate.Should().Be(new DateTime(2019, 3, 3));
+        startDate = DateTimeFormatInfo.CurrentInfo.GetFirstDayOfWeek(2019, 10);
+        startDate.Should().Be(new DateTime(2019, 3, 3));
 
-            startDate = DateTimeFormatInfo.CurrentInfo.GetFirstDayOfWeek(2019, 47);
-            startDate.Should().Be(new DateTime(2019, 11, 17));
+        startDate = DateTimeFormatInfo.CurrentInfo.GetFirstDayOfWeek(2019, 47);
+        startDate.Should().Be(new DateTime(2019, 11, 17));
 
-            startDate = DateTimeFormatInfo.CurrentInfo.GetFirstDayOfWeek(2019, 47);
-            startDate.Should().Be(new DateTime(2019, 11, 17));
+        startDate = DateTimeFormatInfo.CurrentInfo.GetFirstDayOfWeek(2019, 47);
+        startDate.Should().Be(new DateTime(2019, 11, 17));
 
-            startDate = DateTimeFormatInfo.CurrentInfo.GetFirstDayOfWeek(2017, 1);
-            startDate.Should().Be(new DateTime(2017, 1, 1));
+        startDate = DateTimeFormatInfo.CurrentInfo.GetFirstDayOfWeek(2017, 1);
+        startDate.Should().Be(new DateTime(2017, 1, 1));
 
-            startDate = DateTimeFormatInfo.CurrentInfo.GetFirstDayOfWeek(2017, 18);
-            startDate.Should().Be(new DateTime(2017, 4, 30));
+        startDate = DateTimeFormatInfo.CurrentInfo.GetFirstDayOfWeek(2017, 18);
+        startDate.Should().Be(new DateTime(2017, 4, 30));
 
-            var endDate = startDate.AddDays(6);
-        }
+        var endDate = startDate.AddDays(6);
     }
 }
diff --git a/service/test/InstructorIQ.Core.Tests/Extensions/UriExtensionsTests.cs b/service/test/InstructorIQ.Core.Tests/Extensions/UriExtensionsTests.cs
index abd8f615..bde8516b 100644
--- a/service/test/InstructorIQ.Core.Tests/Extensions/UriExtensionsTests.cs
+++ b/service/test/InstructorIQ.Core.Tests/Extensions/UriExtensionsTests.cs
@@ -1,28 +1,30 @@
-using System;
+using System;
+
 using FluentAssertions;
+
 using InstructorIQ.Core.Extensions;
+
 using Xunit;
 using Xunit.Abstractions;
 
-namespace InstructorIQ.Core.Tests.Extensions
+namespace InstructorIQ.Core.Tests.Extensions;
+
+public class UriExtensionsTests : UnitTestBase
 {
-    public class UriExtensionsTests : UnitTestBase
+    public UriExtensionsTests(ITestOutputHelper outputHelper) : base(outputHelper)
     {
-        public UriExtensionsTests(ITestOutputHelper outputHelper) : base(outputHelper)
-        {
-        }
-
-        [Fact]
-        public void ToLocalPath()
-        {
-            var uri = new Uri("https://instructoriq.com/path/test?test=v#one");
-
-            var localPath = uri.ToLocalPath();
-            localPath.Should().Be("/path/test?test=v#one");
-
-            uri = new Uri("/blah/test?test=v#one", UriKind.Relative);
-            localPath = uri.ToLocalPath();
-            localPath.Should().Be("/blah/test?test=v#one");
-        }
     }
-}
\ No newline at end of file
+
+    [Fact]
+    public void ToLocalPath()
+    {
+        var uri = new Uri("https://instructoriq.com/path/test?test=v#one");
+
+        var localPath = uri.ToLocalPath();
+        localPath.Should().Be("/path/test?test=v#one");
+
+        uri = new Uri("/blah/test?test=v#one", UriKind.Relative);
+        localPath = uri.ToLocalPath();
+        localPath.Should().Be("/blah/test?test=v#one");
+    }
+}
diff --git a/service/test/InstructorIQ.Core.Tests/InstructorIQ.Core.Tests.csproj b/service/test/InstructorIQ.Core.Tests/InstructorIQ.Core.Tests.csproj
index 3d4e1e9a..d33cd613 100644
--- a/service/test/InstructorIQ.Core.Tests/InstructorIQ.Core.Tests.csproj
+++ b/service/test/InstructorIQ.Core.Tests/InstructorIQ.Core.Tests.csproj
@@ -13,16 +13,16 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="AngleSharp" Version="0.17.1" />
+    <PackageReference Include="AngleSharp" Version="1.0.1" />
+    <PackageReference Include="Bogus" Version="34.0.2" />
     <PackageReference Include="coverlet.msbuild" Version="3.2.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="DataGenerator" Version="5.0.0.178" />
-    <PackageReference Include="FluentAssertions" Version="6.8.0" />
+    <PackageReference Include="FluentAssertions" Version="6.10.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
     <PackageReference Include="xunit" Version="2.4.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
       <PrivateAssets>all</PrivateAssets>
diff --git a/service/test/InstructorIQ.Core.Tests/MemberImportModelTest.cs b/service/test/InstructorIQ.Core.Tests/MemberImportModelTest.cs
index 75bf444d..133520ce 100644
--- a/service/test/InstructorIQ.Core.Tests/MemberImportModelTest.cs
+++ b/service/test/InstructorIQ.Core.Tests/MemberImportModelTest.cs
@@ -1,79 +1,77 @@
-using System;
+using System;
 using System.Globalization;
 using System.IO;
 using System.Text;
+
 using AngleSharp.Dom;
 using AngleSharp.Html.Parser;
+
+using Bogus;
+
 using CsvHelper;
-using DataGenerator;
-using DataGenerator.Sources;
+
 using InstructorIQ.Core.Domain.Models;
+
 using Xunit;
 using Xunit.Abstractions;
 
-namespace InstructorIQ.Core.Tests
+namespace InstructorIQ.Core.Tests;
+
+public class MemberImportModelTest : UnitTestBase
 {
-    public class MemberImportModelTest : UnitTestBase
+    public MemberImportModelTest(ITestOutputHelper outputHelper)
+        : base(outputHelper)
     {
-        public MemberImportModelTest(ITestOutputHelper outputHelper)
-            : base(outputHelper)
-        {
-        }
+    }
 
-        [Fact]
-        public void Generate()
-        {
-            var generator = Generator.Create(c =>
-                {
-                    c.Entity<MemberImportModel>(e =>
-                    {
-                        e.Property(p => p.GivenName).DataSource<FirstNameSource>();
-                        e.Property(p => p.FamilyName).DataSource<LastNameSource>();
-                        e.Property(p => p.Email).Value(m => $"{m.GivenName}.{m.FamilyName}@mailinator.com");
-                        e.Property(p => p.DisplayName).Value(m => $"{m.GivenName} {m.FamilyName}");
-                        e.Property(p => p.SortName).Value(m => $"{m.FamilyName}, {m.GivenName}");
-                    });
-                });
-
-            var users = generator.List<MemberImportModel>(20);
-
-            var configuration = new CsvHelper.Configuration.CsvConfiguration(CultureInfo.CurrentCulture);
-            configuration.HasHeaderRecord = true;
-
-            using (var writer = new StreamWriter($"users-{DateTime.Now.Ticks}.csv"))
-            using (var csv = new CsvWriter(writer, configuration))
-            {
-                csv.WriteRecords(users);
-            }
-        }
+    [Fact]
+    public void Generate()
+    {
+        var generator = new Faker<MemberImportModel>()
+            .RuleFor(p => p.GivenName, faker => faker.Name.FirstName())
+            .RuleFor(p => p.FamilyName, faker => faker.Name.LastName())
+            .RuleFor(p => p.FamilyName, (faker, instance) => $"{instance.GivenName}.{instance.FamilyName}@mailinator.com")
+            .RuleFor(p => p.DisplayName, (faker, instance) => $"{instance.GivenName} {instance.FamilyName}")
+            .RuleFor(p => p.SortName, (faker, instance) => $"{instance.FamilyName}, {instance.GivenName}");
+
+        var users = generator.Generate(20);
+
+        var configuration = new CsvHelper.Configuration.CsvConfiguration(CultureInfo.CurrentCulture);
+        configuration.HasHeaderRecord = true;
 
-        [Fact]
-        public void MyTestMethod()
+        using (var writer = new StreamWriter($"users-{DateTime.Now.Ticks}.csv"))
+        using (var csv = new CsvWriter(writer, configuration))
         {
-            var html = "<p>This is a test.</p>\r\n  <p>Another line test</p>";
-            var document = new HtmlParser().ParseDocument(html);
-            var text = document.Body.Text();
-            text = StripExtended(text);
-
-            html = "This is a test";
-            document = new HtmlParser().ParseDocument(html);
-            text = document.Body.Text();
+            csv.WriteRecords(users);
         }
+    }
+
+    [Fact]
+    public void MyTestMethod()
+    {
+        var html = "<p>This is a test.</p>\r\n  <p>Another line test</p>";
+        var document = new HtmlParser().ParseDocument(html);
+        var text = document.Body.Text();
+        text = StripExtended(text);
+
+        html = "This is a test";
+        document = new HtmlParser().ParseDocument(html);
+        text = document.Body.Text();
+    }
 
 
-        static string StripExtended(string text)
+    static string StripExtended(string text)
+    {
+        StringBuilder buffer = new StringBuilder(text.Length);
+        foreach (char ch in text)
         {
-            StringBuilder buffer = new StringBuilder(text.Length);
-            foreach (char ch in text)
-            {
-                UInt16 num = Convert.ToUInt16(ch);
-
-                if ((num >= 33u) && (num <= 126u))
-                    buffer.Append(ch);
-                else if (buffer.Length == 0 || buffer[^1] != ' ')
-                    buffer.Append(' ');
-            }
-            return buffer.ToString();
+            UInt16 num = Convert.ToUInt16(ch);
+
+            if ((num >= 33u) && (num <= 126u))
+                buffer.Append(ch);
+            else if (buffer.Length == 0 || buffer[^1] != ' ')
+                buffer.Append(' ');
         }
+        return buffer.ToString();
     }
-}
\ No newline at end of file
+}
diff --git a/service/test/InstructorIQ.Core.Tests/MockPrincipal.cs b/service/test/InstructorIQ.Core.Tests/MockPrincipal.cs
index 85be7164..276e4cc2 100644
--- a/service/test/InstructorIQ.Core.Tests/MockPrincipal.cs
+++ b/service/test/InstructorIQ.Core.Tests/MockPrincipal.cs
@@ -1,37 +1,37 @@
-using System;
+using System;
 using System.Security.Claims;
 using System.Security.Principal;
+
 using InstructorIQ.Core.Security;
 
-namespace InstructorIQ.Core.Tests
+namespace InstructorIQ.Core.Tests;
+
+public class MockPrincipal
 {
-    public class MockPrincipal
+    static MockPrincipal()
     {
-        static MockPrincipal()
-        {
-            Default = CreatePrincipal("test@mailinator.com", "Test User", Data.Constants.User.Test, Data.Constants.Tenant.Test, "Test Organization");
-            GlobalAdmin = CreatePrincipal("support@InstructorIQ.com", "InstructorIQ Support", Data.Constants.User.Support, Data.Constants.Tenant.Demo, "Demo Organization", true);
-        }
+        Default = CreatePrincipal("test@mailinator.com", "Test User", Data.Constants.User.Test, Data.Constants.Tenant.Test, "Test Organization");
+        GlobalAdmin = CreatePrincipal("support@InstructorIQ.com", "InstructorIQ Support", Data.Constants.User.Support, Data.Constants.Tenant.Demo, "Demo Organization", true);
+    }
 
 
-        public static IPrincipal Default { get; }
+    public static IPrincipal Default { get; }
 
-        public static IPrincipal GlobalAdmin { get; }
+    public static IPrincipal GlobalAdmin { get; }
 
 
-        public static ClaimsPrincipal CreatePrincipal(string email, string name, Guid userId, Guid organizationId, string organizationName, bool isGlobalAdmin = false)
-        {
-            var claimsIdentity = new ClaimsIdentity("Identity.Application", ClaimTypes.Name, ClaimTypes.Role);
-            claimsIdentity.AddClaim(new Claim(ClaimTypes.NameIdentifier, userId.ToString()));
-            claimsIdentity.AddClaim(new Claim(ClaimTypes.Name, name));
+    public static ClaimsPrincipal CreatePrincipal(string email, string name, Guid userId, Guid organizationId, string organizationName, bool isGlobalAdmin = false)
+    {
+        var claimsIdentity = new ClaimsIdentity("Identity.Application", ClaimTypes.Name, ClaimTypes.Role);
+        claimsIdentity.AddClaim(new Claim(ClaimTypes.NameIdentifier, userId.ToString()));
+        claimsIdentity.AddClaim(new Claim(ClaimTypes.Name, name));
 
 
-            claimsIdentity.AddClaim(new Claim(UserClaims.Email, email));
+        claimsIdentity.AddClaim(new Claim(UserClaims.Email, email));
 
-            claimsIdentity.AddClaim(new Claim(UserClaims.TenantId, organizationId.ToString()));
+        claimsIdentity.AddClaim(new Claim(UserClaims.TenantId, organizationId.ToString()));
 
-            var claimsPrincipal = new ClaimsPrincipal(claimsIdentity);
-            return claimsPrincipal;
-        }
+        var claimsPrincipal = new ClaimsPrincipal(claimsIdentity);
+        return claimsPrincipal;
     }
 }
diff --git a/service/test/InstructorIQ.Core.Tests/Security/SecretGeneratorTest.cs b/service/test/InstructorIQ.Core.Tests/Security/SecretGeneratorTest.cs
index a7f8202a..37db1b66 100644
--- a/service/test/InstructorIQ.Core.Tests/Security/SecretGeneratorTest.cs
+++ b/service/test/InstructorIQ.Core.Tests/Security/SecretGeneratorTest.cs
@@ -1,57 +1,59 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Security.Cryptography;
+
 using FluentAssertions;
+
 using Microsoft.AspNetCore.WebUtilities;
+
 using Xunit;
 using Xunit.Abstractions;
 
-namespace InstructorIQ.Core.Tests.Security
+namespace InstructorIQ.Core.Tests.Security;
+
+public class SecretGeneratorTest : UnitTestBase
 {
-    public class SecretGeneratorTest : UnitTestBase
+    public SecretGeneratorTest(ITestOutputHelper outputHelper) : base(outputHelper)
     {
-        public SecretGeneratorTest(ITestOutputHelper outputHelper) : base(outputHelper)
-        {
-        }
+    }
 
-        [Fact]
-        public void GenerateClientSecret()
-        {
-            int bytes = 32;
+    [Fact]
+    public void GenerateClientSecret()
+    {
+        int bytes = 32;
 
-            byte[] data;
-            using (var rngCsp = RandomNumberGenerator.Create())
-            {
-                data = new byte[bytes];
-                rngCsp.GetNonZeroBytes(data);
-            }
+        byte[] data;
+        using (var rngCsp = RandomNumberGenerator.Create())
+        {
+            data = new byte[bytes];
+            rngCsp.GetNonZeroBytes(data);
+        }
 
-            var audienceSecret = Base64UrlTextEncoder.Encode(data);
-            var audienceId = Guid.NewGuid().ToString("N");
+        var audienceSecret = Base64UrlTextEncoder.Encode(data);
+        var audienceId = Guid.NewGuid().ToString("N");
 
-            OutputHelper.WriteLine($"audienceId: {audienceId}");
-            OutputHelper.WriteLine($"audienceSecret: {audienceSecret}");
-        }
+        OutputHelper.WriteLine($"audienceId: {audienceId}");
+        OutputHelper.WriteLine($"audienceSecret: {audienceSecret}");
+    }
 
-        [Fact]
-        public void UnionTest()
-        {
-            var existing = new List<int> { 1, 2, 3 };
-            var updated = new List<int> { 2, 4 };
+    [Fact]
+    public void UnionTest()
+    {
+        var existing = new List<int> { 1, 2, 3 };
+        var updated = new List<int> { 2, 4 };
 
-            var remove = existing
-                .Except(updated)
-                .ToList();
+        var remove = existing
+            .Except(updated)
+            .ToList();
 
-            remove.Should().Contain(new[] {1, 3});
+        remove.Should().Contain(new[] { 1, 3 });
 
-            var insert = updated
-                .Except(existing)
-                .ToList();
+        var insert = updated
+            .Except(existing)
+            .ToList();
 
-            insert.Should().Contain(new[] { 4 });
+        insert.Should().Contain(new[] { 4 });
 
-        }
     }
 }
diff --git a/service/test/InstructorIQ.Core.Tests/Services/EmailTemplateServiceTests.cs b/service/test/InstructorIQ.Core.Tests/Services/EmailTemplateServiceTests.cs
index ba964d96..e3a95cc6 100644
--- a/service/test/InstructorIQ.Core.Tests/Services/EmailTemplateServiceTests.cs
+++ b/service/test/InstructorIQ.Core.Tests/Services/EmailTemplateServiceTests.cs
@@ -1,38 +1,40 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Text;
+
 using FluentAssertions;
+
 using InstructorIQ.Core.Services;
+
 using Microsoft.Extensions.DependencyInjection;
+
 using Xunit;
 using Xunit.Abstractions;
 
-namespace InstructorIQ.Core.Tests.Services
+namespace InstructorIQ.Core.Tests.Services;
+
+public class EmailTemplateServiceTests : DependencyInjectionBase
 {
-    public class EmailTemplateServiceTests : DependencyInjectionBase
+    public EmailTemplateServiceTests(ITestOutputHelper outputHelper, DependencyInjectionFixture dependencyInjection)
+        : base(outputHelper, dependencyInjection)
+    {
+    }
+
+    [Theory]
+    [InlineData("reset-password")]
+    [InlineData("passwordless-login")]
+    [InlineData("user-invite")]
+    public void GetResourceTemplate(string templateKey)
     {
-        public EmailTemplateServiceTests(ITestOutputHelper outputHelper, DependencyInjectionFixture dependencyInjection)
-            : base(outputHelper, dependencyInjection)
-        {
-        }
-
-        [Theory]
-        [InlineData("reset-password")]
-        [InlineData("passwordless-login")]
-        [InlineData("user-invite")]
-        public void GetResourceTemplate(string templateKey)
-        {
-            var emailService = ServiceProvider.GetService<IEmailTemplateService>();
-            emailService.Should().NotBeNull();
-
-            var template = emailService.GetResourceTemplate(templateKey);
-            template.Should().NotBeNull();
-            template.FromAddress.Should().NotBeNullOrEmpty();
-            template.Subject.Should().NotBeNullOrEmpty();
-            template.TextBody.Should().NotBeNullOrEmpty();
-            template.HtmlBody.Should().NotBeNullOrEmpty();
-        }
+        var emailService = ServiceProvider.GetService<IEmailTemplateService>();
+        emailService.Should().NotBeNull();
 
+        var template = emailService.GetResourceTemplate(templateKey);
+        template.Should().NotBeNull();
+        template.FromAddress.Should().NotBeNullOrEmpty();
+        template.Subject.Should().NotBeNullOrEmpty();
+        template.TextBody.Should().NotBeNullOrEmpty();
+        template.HtmlBody.Should().NotBeNullOrEmpty();
     }
 
 }
diff --git a/service/test/InstructorIQ.Core.Tests/UnitTestBase.cs b/service/test/InstructorIQ.Core.Tests/UnitTestBase.cs
index 4b216d31..14941a7c 100644
--- a/service/test/InstructorIQ.Core.Tests/UnitTestBase.cs
+++ b/service/test/InstructorIQ.Core.Tests/UnitTestBase.cs
@@ -1,16 +1,16 @@
-using System;
+using System;
+
 using Xunit.Abstractions;
 
-namespace InstructorIQ.Core.Tests
+namespace InstructorIQ.Core.Tests;
+
+public abstract class UnitTestBase
 {
-    public abstract class UnitTestBase
+    protected UnitTestBase(ITestOutputHelper outputHelper)
     {
-        protected UnitTestBase(ITestOutputHelper outputHelper)
-        {
-            OutputHelper = outputHelper;
+        OutputHelper = outputHelper;
 
-        }
-
-        public ITestOutputHelper OutputHelper { get; }
     }
-}
\ No newline at end of file
+
+    public ITestOutputHelper OutputHelper { get; }
+}
diff --git a/service/test/InstructorIQ.Core.Tests/Utility/DateTimeFactoryTests.cs b/service/test/InstructorIQ.Core.Tests/Utility/DateTimeFactoryTests.cs
index ed11a079..9249502d 100644
--- a/service/test/InstructorIQ.Core.Tests/Utility/DateTimeFactoryTests.cs
+++ b/service/test/InstructorIQ.Core.Tests/Utility/DateTimeFactoryTests.cs
@@ -1,46 +1,48 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Text;
+
 using FluentAssertions;
+
 using InstructorIQ.Core.Utility;
+
 using Xunit;
 
-namespace InstructorIQ.Core.Tests.Utility
+namespace InstructorIQ.Core.Tests.Utility;
+
+public class DateTimeFactoryTests
 {
-    public class DateTimeFactoryTests
+    //Eastern Standard Time
+    //Central Standard Time
+    //Mountain Standard Time
+    //US Mountain Standard Time // (UTC-07:00) Arizona
+    //Pacific Standard Time
+
+    [Fact]
+    public void EasternStandardTimeTest()
     {
-        //Eastern Standard Time
-        //Central Standard Time
-        //Mountain Standard Time
-        //US Mountain Standard Time // (UTC-07:00) Arizona
-        //Pacific Standard Time
-
-        [Fact]
-        public void EasternStandardTimeTest()
-        {
-
-            var easternZone = TimeZoneInfo.FindSystemTimeZoneById("Eastern Standard Time");
-            var easternDateTime = DateTimeFactory.Create(2019, 4, 1, 14, 15, 30, easternZone);
-
-            easternDateTime.Year.Should().Be(2019);
-            easternDateTime.Month.Should().Be(4);
-            easternDateTime.Day.Should().Be(1);
-            easternDateTime.Hour.Should().Be(14);
-            easternDateTime.Minute.Should().Be(15);
-            easternDateTime.Second.Should().Be(30);
-
-            var centralZone = TimeZoneInfo.FindSystemTimeZoneById("Central Standard Time");
-            var centralDateTime = DateTimeFactory.Create(2019, 4, 1, 14, 15, 30, centralZone);
-
-            centralDateTime.Year.Should().Be(2019);
-            centralDateTime.Month.Should().Be(4);
-            centralDateTime.Day.Should().Be(1);
-            centralDateTime.Hour.Should().Be(14);
-            centralDateTime.Minute.Should().Be(15);
-            centralDateTime.Second.Should().Be(30);
-
-            // local should be different
-            easternDateTime.Should().NotBe(centralDateTime);
-        }
+
+        var easternZone = TimeZoneInfo.FindSystemTimeZoneById("Eastern Standard Time");
+        var easternDateTime = DateTimeFactory.Create(2019, 4, 1, 14, 15, 30, easternZone);
+
+        easternDateTime.Year.Should().Be(2019);
+        easternDateTime.Month.Should().Be(4);
+        easternDateTime.Day.Should().Be(1);
+        easternDateTime.Hour.Should().Be(14);
+        easternDateTime.Minute.Should().Be(15);
+        easternDateTime.Second.Should().Be(30);
+
+        var centralZone = TimeZoneInfo.FindSystemTimeZoneById("Central Standard Time");
+        var centralDateTime = DateTimeFactory.Create(2019, 4, 1, 14, 15, 30, centralZone);
+
+        centralDateTime.Year.Should().Be(2019);
+        centralDateTime.Month.Should().Be(4);
+        centralDateTime.Day.Should().Be(1);
+        centralDateTime.Hour.Should().Be(14);
+        centralDateTime.Minute.Should().Be(15);
+        centralDateTime.Second.Should().Be(30);
+
+        // local should be different
+        easternDateTime.Should().NotBe(centralDateTime);
     }
 }
diff --git a/service/version.props b/service/version.props
deleted file mode 100644
index d3979bbb..00000000
--- a/service/version.props
+++ /dev/null
@@ -1,9 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <Version>1.3.0.0</Version>
-    <PackageVersion>1.3.0.0</PackageVersion>
-    <AssemblyVersion>1.3.0.0</AssemblyVersion>
-    <FileVersion>1.3.0.0</FileVersion>
-    <InformationalVersion>1.3.0.0</InformationalVersion>
-  </PropertyGroup>
-</Project>
\ No newline at end of file