diff --git a/.github/workflows/python-test.yml b/.github/workflows/python-test.yml
index c2d0f41..36e6e0f 100644
--- a/.github/workflows/python-test.yml
+++ b/.github/workflows/python-test.yml
@@ -44,10 +44,6 @@ jobs:
       - name: Test with pytest
         run: |
           python -m hatch --data-dir=.hatch --cache-dir=.hatch_cache run test:testcov
-          python -m hatch --data-dir=.hatch --cache-dir=.hatch_cache run test:pytest tests/test_migrations_engine_hooks_lifetime.py
-          python -m hatch --data-dir=.hatch --cache-dir=.hatch_cache run test:pytest tests/test_migrations_engine_hooks_filters_lifetime.py
-          python -m hatch --data-dir=.hatch --cache-dir=.hatch_cache run test:pytest tests/test_migrations_engine_hooks_mappings_lifetime.py
-          python -m hatch --data-dir=.hatch --cache-dir=.hatch_cache run test:pytest tests/test_migrations_engine_hooks_transformers_lifetime.py
           
       - name: Test TestApplication with pytest
         run: |
diff --git a/.gitignore b/.gitignore
index 3e6a492..c0e14ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -176,8 +176,8 @@ appsettings.Development.json
 clean-server-settings.dev.json
 launchSettings.json
 UpgradeLog.htm
-*.DEV.ini
-*.DEV.json
+*.*.ini
+*.*.json
 /src/Python/Documentation/_build
 /src/Python/Documentation/_static
 /src/Python/Python.pyproj.user
diff --git a/Directory.Build.props b/Directory.Build.props
index 1c24409..d009a18 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -4,9 +4,10 @@
 		<Nullable>enable</Nullable>
 		<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
 		<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
-		<Version>3.0.1</Version>
+		<Version>4.0.0</Version>
 		<Authors>Salesforce, Inc.</Authors>
 		<Company>Salesforce, Inc.</Company>
 		<Copyright>Copyright (c) 2024, Salesforce, Inc. and its licensors</Copyright>
+	    <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
 	</PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/LICENSE.txt b/LICENSE.txt
index b2949c4..ae7332a 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,6 +1,6 @@
 Apache License Version 2.0
 
-Copyright (c) 2023 Salesforce, Inc.
+Copyright (c) 2024 Salesforce, Inc.
 All rights reserved.
 
 Apache License
diff --git a/Migration SDK.sln b/Migration SDK.sln
index 19e5b58..6ad00fc 100644
--- a/Migration SDK.sln	
+++ b/Migration SDK.sln	
@@ -18,6 +18,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		CONTRIBUTING.md = CONTRIBUTING.md
 		Directory.Build.props = Directory.Build.props
 		global.json = global.json
+		LICENSE.txt = LICENSE.txt
 		README.md = README.md
 		SECURITY.md = SECURITY.md
 	EndProjectSection
@@ -82,6 +83,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "setup-dotnet", "setup-dotne
 		.github\actions\setup-dotnet\action.yml = .github\actions\setup-dotnet\action.yml
 	EndProjectSection
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tableau.Migration.PythonGenerator", "src\Tableau.Migration.PythonGenerator\Tableau.Migration.PythonGenerator.csproj", "{F20029C7-4514-4668-8941-B2C3BC245CCB}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -124,6 +127,10 @@ Global
 		{99DA12FB-BB16-4EE1-9C9C-047755210255}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{99DA12FB-BB16-4EE1-9C9C-047755210255}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{99DA12FB-BB16-4EE1-9C9C-047755210255}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F20029C7-4514-4668-8941-B2C3BC245CCB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F20029C7-4514-4668-8941-B2C3BC245CCB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F20029C7-4514-4668-8941-B2C3BC245CCB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F20029C7-4514-4668-8941-B2C3BC245CCB}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/examples/Csharp.ExampleApplication/Hooks/Mappings/ChangeProjectMapping.cs b/examples/Csharp.ExampleApplication/Hooks/Mappings/ChangeProjectMapping.cs
index 8593aa5..6ca4e66 100644
--- a/examples/Csharp.ExampleApplication/Hooks/Mappings/ChangeProjectMapping.cs
+++ b/examples/Csharp.ExampleApplication/Hooks/Mappings/ChangeProjectMapping.cs
@@ -5,23 +5,24 @@
 using Tableau.Migration;
 using Tableau.Migration.Content;
 using Tableau.Migration.Engine.Hooks.Mappings;
+using Tableau.Migration.Resources;
 
 namespace Csharp.ExampleApplication.Hooks.Mappings
 {
     #region class
-    public class ChangeProjectMapping : IContentMapping<IDataSource>, IContentMapping<IWorkbook>
+    public class ChangeProjectMapping<T> : ContentMappingBase<T>
+        where T : IContentReference, IMappableContainerContent
     {
         private static readonly StringComparer StringComparer = StringComparer.OrdinalIgnoreCase;
 
-        private readonly ILogger<ChangeProjectMapping> _logger;
+        private readonly ILogger<IContentMapping<T>>? _logger;
 
-        public ChangeProjectMapping(ILogger<ChangeProjectMapping> logger)
+        public ChangeProjectMapping(ISharedResourcesLocalizer? localizer, ILogger<IContentMapping<T>>? logger) : base(localizer, logger)
         {
             _logger = logger;
         }
 
-        private async Task<ContentMappingContext<T>?> ExecuteAsync<T>(ContentMappingContext<T> ctx)
-            where T : IContentReference, IMappableContainerContent
+        public override Task<ContentMappingContext<T>?> MapAsync(ContentMappingContext<T> ctx, CancellationToken cancel)
         {
             // Get the container (project) location for the content item.
             var containerLocation = ctx.ContentItem.Location.Parent();
@@ -29,7 +30,7 @@ public ChangeProjectMapping(ILogger<ChangeProjectMapping> logger)
             // We only want to map content items whose project name is "Test".
             if (!StringComparer.Equals("Test", containerLocation.Name))
             {
-                return ctx;
+                return ctx.ToTask();
             }
 
             // Build the new project location.
@@ -41,20 +42,20 @@ public ChangeProjectMapping(ILogger<ChangeProjectMapping> logger)
             // Map the new content item location.
             ctx = ctx.MapTo(newLocation);
 
-            _logger.LogInformation(
+            _logger?.LogInformation(
                 "{ContentType} mapped from {OldLocation} to {NewLocation}.",
                 typeof(T).Name,
                 ctx.ContentItem.Location,
                 ctx.MappedLocation);
 
-            return await ctx.ToTask();
+            return ctx.ToTask();
         }
 
-        public async Task<ContentMappingContext<IDataSource>?> ExecuteAsync(ContentMappingContext<IDataSource> ctx, CancellationToken cancel)
-            => await ExecuteAsync(ctx);
+        public async Task<ContentMappingContext<IDataSource>?> MapAsync(ContentMappingContext<IDataSource> ctx, CancellationToken cancel)
+            => await MapAsync(ctx, cancel);
 
-        public async Task<ContentMappingContext<IWorkbook>?> ExecuteAsync(ContentMappingContext<IWorkbook> ctx, CancellationToken cancel)
-            => await ExecuteAsync(ctx);
+        public async Task<ContentMappingContext<IWorkbook>?> MapAsync(ContentMappingContext<IWorkbook> ctx, CancellationToken cancel)
+            => await MapAsync(ctx, cancel);
     }
     #endregion
 }
diff --git a/examples/Csharp.ExampleApplication/Hooks/Mappings/EmailDomainMapping.cs b/examples/Csharp.ExampleApplication/Hooks/Mappings/EmailDomainMapping.cs
index 6c8441a..710be68 100644
--- a/examples/Csharp.ExampleApplication/Hooks/Mappings/EmailDomainMapping.cs
+++ b/examples/Csharp.ExampleApplication/Hooks/Mappings/EmailDomainMapping.cs
@@ -42,11 +42,12 @@ public class EmailDomainMapping :
         public override Task<ContentMappingContext<IUser>?> MapAsync(ContentMappingContext<IUser> userMappingContext, CancellationToken cancel)
         {
             var domain = userMappingContext.MappedLocation.Parent();
+
             // Re-use an existing email if it already exists.
             if (!string.IsNullOrEmpty(userMappingContext.ContentItem.Email))
                 return userMappingContext.MapTo(domain.Append(userMappingContext.ContentItem.Email)).ToTask();
 
-            // Takes the existing username and appends the default domain to build the email
+            // Takes the existing username and appends the domain to build the email
             var testEmail = $"{userMappingContext.ContentItem.Name}@{_domain}";
             return userMappingContext.MapTo(domain.Append(testEmail)).ToTask();
         }
diff --git a/examples/Csharp.ExampleApplication/Hooks/Transformers/EncryptExtractTransformer.cs b/examples/Csharp.ExampleApplication/Hooks/Transformers/EncryptExtractTransformer.cs
new file mode 100644
index 0000000..855df7c
--- /dev/null
+++ b/examples/Csharp.ExampleApplication/Hooks/Transformers/EncryptExtractTransformer.cs
@@ -0,0 +1,42 @@
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
+using Tableau.Migration;
+using Tableau.Migration.Content;
+using Tableau.Migration.Engine.Hooks.Transformers;
+using Tableau.Migration.Resources;
+
+namespace Csharp.ExampleApplication.Hooks.Transformers
+{
+    #region class
+    public class EncryptExtractsTransformer<T> : ContentTransformerBase<T> where T : IContentReference, IFileContent, IExtractContent
+    {
+        private readonly ILogger<IContentTransformer<T>>? _logger;
+
+        public EncryptExtractsTransformer(ISharedResourcesLocalizer? localizer, ILogger<IContentTransformer<T>>? logger) : base(localizer, logger)
+        {
+            _logger = logger;
+        }
+
+        public override async Task<T?> TransformAsync(T itemToTransform, CancellationToken cancel)
+        {
+            itemToTransform.EncryptExtracts = true;
+
+            _logger?.LogInformation(
+                @"Setting encrypt extract to true for {ContentType} {ContentLocation}",
+                typeof(T).Name,
+                itemToTransform.Location);
+
+            return await Task.FromResult(itemToTransform);
+        }
+
+        public async Task<IPublishableWorkbook?> TransformAsync(IPublishableWorkbook ctx, CancellationToken cancel)
+            => await TransformAsync(ctx, cancel);
+
+        public async Task<IPublishableDataSource?> TransformAsync(IPublishableDataSource ctx, CancellationToken cancel)
+            => await TransformAsync(ctx, cancel);
+    }
+    #endregion
+}
diff --git a/examples/Csharp.ExampleApplication/Hooks/Transformers/MigratedTagTransformer.cs b/examples/Csharp.ExampleApplication/Hooks/Transformers/MigratedTagTransformer.cs
index 701ee92..f48beff 100644
--- a/examples/Csharp.ExampleApplication/Hooks/Transformers/MigratedTagTransformer.cs
+++ b/examples/Csharp.ExampleApplication/Hooks/Transformers/MigratedTagTransformer.cs
@@ -6,41 +6,41 @@
 using Tableau.Migration;
 using Tableau.Migration.Content;
 using Tableau.Migration.Engine.Hooks.Transformers;
+using Tableau.Migration.Resources;
 
 namespace Csharp.ExampleApplication.Hooks.Transformers
 {
     #region class
-    public class MigratedTagTransformer : IContentTransformer<IPublishableWorkbook>, IContentTransformer<IPublishableDataSource>
+    public class MigratedTagTransformer<T> : ContentTransformerBase<T> where T : IContentReference, IWithTags
     {
-        private readonly ILogger<MigratedTagTransformer> _logger;
+        private readonly ILogger<IContentTransformer<T>>? _logger;
 
-        public MigratedTagTransformer(ILogger<MigratedTagTransformer> logger)
+        public MigratedTagTransformer(ISharedResourcesLocalizer? localizer, ILogger<IContentTransformer<T>>? logger) : base(localizer, logger)
         {
             _logger = logger;
         }
 
-        protected async Task<T?> ExecuteAsync<T>(T ctx)
-            where T : IContentReference, IWithTags
+        public override async Task<T?> TransformAsync(T itemToTransform, CancellationToken cancel)
         {
             var tag = "Migrated";
 
             // Add the tag to the content item.
-            ctx.Tags.Add(new Tag(tag));
+            itemToTransform.Tags.Add(new Tag(tag));
 
-            _logger.LogInformation(
+            _logger?.LogInformation(
                 @"Added ""{Tag}"" tag to {ContentType} {ContentLocation}.",
                 tag,
                 typeof(T).Name,
-                ctx.Location);
+                itemToTransform.Location);
 
-            return await Task.FromResult(ctx);
+            return await Task.FromResult(itemToTransform);
         }
 
-        public async Task<IPublishableWorkbook?> ExecuteAsync(IPublishableWorkbook ctx, CancellationToken cancel)
-            => await ExecuteAsync(ctx);
+        public async Task<IPublishableWorkbook?> TransformAsync(IPublishableWorkbook ctx, CancellationToken cancel)
+            => await TransformAsync(ctx, cancel);
 
-        public async Task<IPublishableDataSource?> ExecuteAsync(IPublishableDataSource ctx, CancellationToken cancel)
-            => await ExecuteAsync(ctx);
+        public async Task<IPublishableDataSource?> TransformAsync(IPublishableDataSource ctx, CancellationToken cancel)
+            => await TransformAsync(ctx, cancel);
     }
     #endregion
 }
diff --git a/examples/Csharp.ExampleApplication/MyMigrationApplication.cs b/examples/Csharp.ExampleApplication/MyMigrationApplication.cs
index f337e0d..1746c79 100644
--- a/examples/Csharp.ExampleApplication/MyMigrationApplication.cs
+++ b/examples/Csharp.ExampleApplication/MyMigrationApplication.cs
@@ -86,8 +86,8 @@ public async Task StartAsync(CancellationToken cancel)
             #endregion
 
             #region ChangeProjectMapping-Registration
-            _planBuilder.Mappings.Add<ChangeProjectMapping, IDataSource>();
-            _planBuilder.Mappings.Add<ChangeProjectMapping, IWorkbook>();
+            _planBuilder.Mappings.Add<ChangeProjectMapping<IDataSource>, IDataSource>();
+            _planBuilder.Mappings.Add<ChangeProjectMapping<IWorkbook>, IWorkbook>();
             #endregion
 
             // Add filters
@@ -111,8 +111,13 @@ public async Task StartAsync(CancellationToken cancel)
 
             // Add transformers
             #region MigratedTagTransformer-Registration
-            _planBuilder.Transformers.Add<MigratedTagTransformer, IPublishableDataSource>();
-            _planBuilder.Transformers.Add<MigratedTagTransformer, IPublishableWorkbook>();
+            _planBuilder.Transformers.Add<MigratedTagTransformer<IPublishableDataSource>, IPublishableDataSource>();
+            _planBuilder.Transformers.Add<MigratedTagTransformer<IPublishableWorkbook>, IPublishableWorkbook>();
+            #endregion
+
+            #region EncryptExtractTransformer-Registration
+            _planBuilder.Transformers.Add<EncryptExtractsTransformer<IPublishableDataSource>, IPublishableDataSource>();
+            _planBuilder.Transformers.Add<EncryptExtractsTransformer<IPublishableWorkbook>, IPublishableWorkbook>();
             #endregion
 
             // Add migration action completed hooks
diff --git a/examples/Csharp.ExampleApplication/Program.cs b/examples/Csharp.ExampleApplication/Program.cs
index 8803e19..e524e05 100644
--- a/examples/Csharp.ExampleApplication/Program.cs
+++ b/examples/Csharp.ExampleApplication/Program.cs
@@ -9,6 +9,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Tableau.Migration;
+using Tableau.Migration.Content;
 
 #region namespace
 namespace Csharp.ExampleApplication
@@ -56,7 +57,8 @@ public static IServiceCollection AddCustomizations(this IServiceCollection servi
             #endregion
 
             #region ChangeProjectMapping-DI
-            services.AddScoped<ChangeProjectMapping>();
+            services.AddScoped<ChangeProjectMapping<IWorkbook>>();
+            services.AddScoped<ChangeProjectMapping<IDataSource>>();
             #endregion
 
             #region DefaultProjectsFilter-DI
@@ -76,7 +78,13 @@ public static IServiceCollection AddCustomizations(this IServiceCollection servi
             #endregion
 
             #region MigratedTagTransformer-DI
-            services.AddScoped<MigratedTagTransformer>();
+            services.AddScoped<MigratedTagTransformer<IPublishableDataSource>>();
+            services.AddScoped<MigratedTagTransformer<IPublishableWorkbook>>();
+            #endregion
+
+            #region EncryptExtractTransformer-DI
+            services.AddScoped<EncryptExtractsTransformer<IPublishableDataSource>>();
+            services.AddScoped<EncryptExtractsTransformer<IPublishableWorkbook>>();
             #endregion
 
             #region LogMigrationActionsHook-DI
diff --git a/examples/Python.ExampleApplication/Hooks/Filters/default_project_filter.py b/examples/Python.ExampleApplication/Hooks/Filters/default_project_filter.py
new file mode 100644
index 0000000..803d863
--- /dev/null
+++ b/examples/Python.ExampleApplication/Hooks/Filters/default_project_filter.py
@@ -0,0 +1,11 @@
+from tableau_migration import (
+    IProject,
+    ContentMigrationItem,
+    ContentFilterBase)
+    
+
+class DefaultProjectFilter(ContentFilterBase[IProject]):
+    def should_migrate(self, item: ContentMigrationItem[IProject]) -> bool:
+        if item.source_item.name.casefold() == 'Default'.casefold():
+            return False
+        return True
\ No newline at end of file
diff --git a/examples/Python.ExampleApplication/Hooks/Filters/unlicensed_user_filter.py b/examples/Python.ExampleApplication/Hooks/Filters/unlicensed_user_filter.py
new file mode 100644
index 0000000..2a02ab3
--- /dev/null
+++ b/examples/Python.ExampleApplication/Hooks/Filters/unlicensed_user_filter.py
@@ -0,0 +1,12 @@
+from tableau_migration import (
+    IUser,
+    ContentMigrationItem,
+    ContentFilterBase,
+    SiteRoles)
+    
+
+class UnlicensedUserFilter(ContentFilterBase[IUser]):
+    def should_migrate(self, item: ContentMigrationItem[IUser]) -> bool:
+        if item.source_item.license_level.casefold() == SiteRoles.UNLICENSED.casefold():
+            return False
+        return True
\ No newline at end of file
diff --git a/examples/Python.ExampleApplication/Hooks/batch_migration_completed/log_migration_batches_hook.py b/examples/Python.ExampleApplication/Hooks/batch_migration_completed/log_migration_batches_hook.py
new file mode 100644
index 0000000..3a5bf53
--- /dev/null
+++ b/examples/Python.ExampleApplication/Hooks/batch_migration_completed/log_migration_batches_hook.py
@@ -0,0 +1,34 @@
+import logging
+from typing import TypeVar
+from tableau_migration import(
+    ContentBatchMigrationCompletedHookBase,
+    IContentBatchMigrationResult,
+    IUser
+    )
+
+T = TypeVar("T")
+
+class LogMigrationBatchesHook(ContentBatchMigrationCompletedHookBase[T]):
+    def __init__(self) -> None:
+        super().__init__()
+        self._logger = logging.getLogger(__name__)
+        
+    def execute(self, ctx: IContentBatchMigrationResult[T]) -> IContentBatchMigrationResult[T]:
+        
+        item_status = ""
+        for item in ctx.item_results:
+            item_status += "%s: %s".format(item.manifest_entry.source.location, item.manifest_entry.status)
+                
+        self._logger.info("%s batch of %d item(s) completed:\n%s", ctx._content_type, ctx.item_results.count, item_status)
+        
+        pass
+    
+class LogMigrationBatchesHookForUsers(ContentBatchMigrationCompletedHookBase[IUser]):
+    def __init__(self) -> None:
+        super().__init__()
+        self._content_type = "User";
+
+class LogMigrationBatchesHookForGoups(ContentBatchMigrationCompletedHookBase[IUser]):
+    def __init__(self) -> None:
+        super().__init__()
+        self._content_type = "Group";
\ No newline at end of file
diff --git a/examples/Python.ExampleApplication/Hooks/mappings/change_project_mapping.py b/examples/Python.ExampleApplication/Hooks/mappings/change_project_mapping.py
new file mode 100644
index 0000000..fe8f18f
--- /dev/null
+++ b/examples/Python.ExampleApplication/Hooks/mappings/change_project_mapping.py
@@ -0,0 +1,38 @@
+from typing import TypeVar
+from tableau_migration import(
+    IWorkbook,
+    IDataSource,
+    ContentMappingContext,
+    ContentMappingBase)
+
+T = TypeVar("T")
+
+class ChangeProjectMapping(ContentMappingBase[T]):
+        
+    def map(self, ctx: ContentMappingContext[T]) -> ContentMappingContext[T]:
+        # Get the container (project) location for the content item.
+        container_location = ctx.content_item.location.parent()
+
+        # We only want to map content items whose project name is "Test".
+        if not container_location.name.casefold() == "Test".casefold():
+            return ctx
+        
+        # Build the new project location.
+        new_container_location = container_location.rename("Production")
+        
+        # Build the new content item location.
+        new_location = new_container_location.append(ctx.content_item.name)
+
+        # Map the new content item location.
+        ctx = ctx.map_to(new_location)
+        
+        return ctx
+
+
+# Create the workbook version of the templated ChangeProjectMapping class
+class ChangeProjectMappingForWorkbooks(ChangeProjectMapping[IWorkbook]):
+    pass  
+
+# Create the datasource version of the templated ChangeProjectMapping class
+class ChangeProjectMappingForDataSources(ChangeProjectMapping[IDataSource]):
+    pass
\ No newline at end of file
diff --git a/examples/Python.ExampleApplication/Hooks/mappings/email_domain_mapping.py b/examples/Python.ExampleApplication/Hooks/mappings/email_domain_mapping.py
new file mode 100644
index 0000000..24c3a82
--- /dev/null
+++ b/examples/Python.ExampleApplication/Hooks/mappings/email_domain_mapping.py
@@ -0,0 +1,19 @@
+from tableau_migration import(
+    IUser,
+    TableauCloudUsernameMappingBase,
+    ContentMappingContext)
+
+
+class EmailDomainMapping(TableauCloudUsernameMappingBase):
+    def map(self, ctx: ContentMappingContext[IUser]) -> ContentMappingContext[IUser]:
+        _email_domain: str = "@mycompany.com"
+        
+        _tableau_user_domain = ctx.mapped_location.parent()
+
+        # Re-use an existing email if it already exists. 
+        if not ctx.content_item.email:
+            return ctx.map_to(_tableau_user_domain.append(ctx.content_item.email))
+        
+        # Takes the existing username and appends the domain to build the email
+        new_email = ctx.content_item.name + _email_domain
+        return ctx.map_to(_tableau_user_domain.append(new_email))
\ No newline at end of file
diff --git a/examples/Python.ExampleApplication/Hooks/mappings/project_rename_mapping.py b/examples/Python.ExampleApplication/Hooks/mappings/project_rename_mapping.py
new file mode 100644
index 0000000..5607abb
--- /dev/null
+++ b/examples/Python.ExampleApplication/Hooks/mappings/project_rename_mapping.py
@@ -0,0 +1,16 @@
+from tableau_migration import(
+    IProject,
+    ContentMappingBase,
+    ContentMappingContext)
+
+
+class ProjectRenameMapping(ContentMappingBase[IProject]):
+    def map(self, ctx: ContentMappingContext[IProject]) -> ContentMappingContext[IProject]:
+        if not ctx.content_item.name.casefold() == "Test".casefold():
+            return ctx
+        
+        new_location = ctx.content_item.location.rename("Production")
+        
+        ctx.map_to(new_location)
+        
+        return ctx
\ No newline at end of file
diff --git a/examples/Python.ExampleApplication/Hooks/migration_action_completed/log_migration_actions_hook.py b/examples/Python.ExampleApplication/Hooks/migration_action_completed/log_migration_actions_hook.py
new file mode 100644
index 0000000..968852c
--- /dev/null
+++ b/examples/Python.ExampleApplication/Hooks/migration_action_completed/log_migration_actions_hook.py
@@ -0,0 +1,22 @@
+import logging
+from tableau_migration import(
+    MigrationActionCompletedHookBase,
+    IMigrationActionResult
+    )
+
+
+class LogMigrationActionsHook(MigrationActionCompletedHookBase):
+    def __init__(self) -> None:
+        super().__init__()
+        
+        # Create a logger for this class
+        self._logger = logging.getLogger(__name__)
+        
+    def execute(self, ctx: IMigrationActionResult) -> IMigrationActionResult:
+        if(ctx.success):
+            self._logger.info("Migration action completed successfully.")
+        else:
+            all_errors = "\n".join(ctx.errors)
+            self._logger.warning("Migration action completed with errors:\n%s", all_errors)
+            
+        return None
diff --git a/examples/Python.ExampleApplication/Hooks/post_publish/bulk_logging_hook.py b/examples/Python.ExampleApplication/Hooks/post_publish/bulk_logging_hook.py
new file mode 100644
index 0000000..d228114
--- /dev/null
+++ b/examples/Python.ExampleApplication/Hooks/post_publish/bulk_logging_hook.py
@@ -0,0 +1,19 @@
+import logging
+from tableau_migration import (
+    BulkPostPublishHookBase,
+    BulkPostPublishContext,
+    IDataSource)
+
+
+class BulkLoggingHookForDataSources(BulkPostPublishHookBase[IDataSource]):
+    def __init__(self) -> None:
+        super().__init__()
+        
+        # Create a logger for this class
+        self._logger = logging.getLogger(__name__)
+        
+    def execute(self, ctx: BulkPostPublishContext[IDataSource]) -> BulkPostPublishContext[IDataSource]:
+        # Log the number of items published in the batch.
+        self._logger.info("Published %d IDataSource item(s).", ctx.published_items.count)
+        return None
+    
\ No newline at end of file
diff --git a/examples/Python.ExampleApplication/Hooks/transformers/encrypt_extracts_transformer.py b/examples/Python.ExampleApplication/Hooks/transformers/encrypt_extracts_transformer.py
new file mode 100644
index 0000000..c0d1339
--- /dev/null
+++ b/examples/Python.ExampleApplication/Hooks/transformers/encrypt_extracts_transformer.py
@@ -0,0 +1,19 @@
+from typing import TypeVar
+from tableau_migration import (
+    ContentTransformerBase,
+    IPublishableWorkbook,
+    IPublishableDataSource)
+
+T = TypeVar("T")
+
+class EncryptExtractTransformer(ContentTransformerBase[T]):
+    def transform(self, itemToTransform: T) -> T:
+        itemToTransform.encrypt_extracts = True
+        
+        return itemToTransform
+    
+class EncryptExtractTransformerForDataSources(EncryptExtractTransformer[IPublishableDataSource]):
+    pass
+
+class EncryptExtractTransformerForWorkbooks(EncryptExtractTransformer[IPublishableWorkbook]):
+    pass
\ No newline at end of file
diff --git a/examples/Python.ExampleApplication/Hooks/transformers/migrated_tag_transformer.py b/examples/Python.ExampleApplication/Hooks/transformers/migrated_tag_transformer.py
new file mode 100644
index 0000000..f51418a
--- /dev/null
+++ b/examples/Python.ExampleApplication/Hooks/transformers/migrated_tag_transformer.py
@@ -0,0 +1,23 @@
+from typing import TypeVar
+from tableau_migration import (
+    ContentTransformerBase,
+    IDataSource,
+    ITag,
+    IWorkbook)
+
+T = TypeVar("T")
+
+
+class MigratedTagTransformer(ContentTransformerBase[T]):
+    def transform(self, itemToTransform: T) -> T:
+        tag: str = "Migrated"
+        
+        itemToTransform.tags.append(ITag(tag))
+        
+        return itemToTransform
+    
+class MigratedTagTransformerForDataSources(MigratedTagTransformer[IDataSource]):
+    pass
+
+class MigratedTagTransformerForWorkbooks(MigratedTagTransformer[IWorkbook]):
+    pass
\ No newline at end of file
diff --git a/examples/Python.ExampleApplication/Python.ExampleApplication.py b/examples/Python.ExampleApplication/Python.ExampleApplication.py
index 4850fe8..a98fcd4 100644
--- a/examples/Python.ExampleApplication/Python.ExampleApplication.py
+++ b/examples/Python.ExampleApplication/Python.ExampleApplication.py
@@ -6,6 +6,7 @@
 import os                    # environment variables
 import sys                   # system utility
 import tableau_migration     # Tableau Migration SDK
+import print_result
 
 from threading import Thread # threading
 
@@ -32,7 +33,7 @@ def migrate():
                         access_token = os.environ.get('TABLEAU_MIGRATION_DESTINATION_TOKEN', config['DESTINATION']['ACCESS_TOKEN'])) \
                     .for_server_to_cloud() \
                     .with_tableau_id_authentication_type() \
-                    .with_tableau_cloud_usernames(config['USERS']['EMAIL_DOMAIN'])
+                    .with_tableau_cloud_usernames(config['USERS']['EMAIL_DOMAIN'])                    
 
     # TODO: add filters, mappings, transformers, etc. here.
 
@@ -47,6 +48,7 @@ def migrate():
     results = migration.execute(plan)
     
     # TODO: Handle results here.
+    print_result(results)
 
     print("All done.")
 
diff --git a/examples/Python.ExampleApplication/Python.ExampleApplication.pyproj b/examples/Python.ExampleApplication/Python.ExampleApplication.pyproj
index 3f9cb7f..0af8ded 100644
--- a/examples/Python.ExampleApplication/Python.ExampleApplication.pyproj
+++ b/examples/Python.ExampleApplication/Python.ExampleApplication.pyproj
@@ -5,8 +5,7 @@
     <ProjectGuid>9c94fbc9-ae67-4a26-bdda-eb2ce9fe5c25</ProjectGuid>
     <ProjectHome>.</ProjectHome>
     <StartupFile>Python.ExampleApplication.py</StartupFile>
-    <SearchPath>
-    </SearchPath>
+    <SearchPath>..\..\src\Python\dist</SearchPath>
     <WorkingDirectory>.</WorkingDirectory>
     <OutputPath>.</OutputPath>
     <Name>Python.ExampleApplication</Name>
@@ -23,8 +22,17 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="hooks.py" />
-    <Compile Include="hooks_factory.py" />
-    <Compile Include="hooks_callback.py" />
+    <Compile Include="hooks\batch_migration_completed\log_migration_batches_hook.py" />
+    <Compile Include="hooks\filters\default_project_filter.py" />
+    <Compile Include="hooks\filters\unlicensed_user_filter.py" />
+    <Compile Include="hooks\mappings\change_project_mapping.py" />
+    <Compile Include="hooks\mappings\email_domain_mapping.py" />
+    <Compile Include="hooks\mappings\project_rename_mapping.py" />
+    <Compile Include="hooks\migration_action_completed\log_migration_actions_hook.py" />
+    <Compile Include="hooks\post_publish\bulk_logging_hook.py" />
+    <Compile Include="hooks\transformers\encrypt_extracts_transformer.py" />
+    <Compile Include="hooks\transformers\migrated_tag_transformer.py" />
+    <Compile Include="print_result.py" />
     <Compile Include="Python.ExampleApplication.py" />
   </ItemGroup>
   <ItemGroup>
@@ -43,6 +51,15 @@
       <Architecture>X64</Architecture>
     </Interpreter>
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="hooks\" />
+    <Folder Include="hooks\filters\" />
+    <Folder Include="hooks\mappings\" />
+    <Folder Include="hooks\migration_action_completed\" />
+    <Folder Include="hooks\batch_migration_completed\" />
+    <Folder Include="hooks\post_publish\" />
+    <Folder Include="hooks\transformers\" />
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\Python Tools\Microsoft.PythonTools.targets" />
   <!-- Uncomment the CoreCompile target to enable the Build command in
        Visual Studio and specify your pre- and post-build commands in
diff --git a/examples/Python.ExampleApplication/hooks.py b/examples/Python.ExampleApplication/hooks.py
index 0de1a7d..414f141 100644
--- a/examples/Python.ExampleApplication/hooks.py
+++ b/examples/Python.ExampleApplication/hooks.py
@@ -1,40 +1,56 @@
-from System.Collections.Generic import List
-from Tableau.Migration.Engine import ContentMigrationItem
-from Tableau.Migration.Engine.Actions import IMigrationActionResult
-from Tableau.Migration.Engine.Hooks import IMigrationActionCompletedHook
-from Tableau.Migration.Interop.Hooks import ISyncMigrationHook
-from Tableau.Migration.Interop.Hooks.Filters import ISyncContentFilter
-from Tableau.Migration.Interop.Hooks.Mappings import ISyncContentMapping
-from Tableau.Migration.Interop.Hooks.Transformers import ISyncContentTransformer
-from Tableau.Migration.Content import IGroup, IProject, IUser
-
-class PyLogActionHook(ISyncMigrationHook[IMigrationActionResult], IMigrationActionCompletedHook):
-    __namespace__ = "MyNamespace"
-    
-    def Execute(self, ctx):
+# This file contains example hooks of different categories.
+
+from tableau_migration import (
+    ContentFilterBase,
+    ContentMappingBase,
+    ContentMappingContext,
+    ContentMigrationItem,
+    ContentTransformerBase,
+    IGroup,
+    IProject,
+    IUser,
+    MigrationActionCompletedHookBase,
+    MigrationActionResult
+)
+
+# Hooks using classes.
+
+class LogActionHook(MigrationActionCompletedHookBase):
+
+    def execute(self, ctx: MigrationActionResult) -> MigrationActionResult:
         print("ACTION COMPLETED")
         return ctx
 
-class PyTestGroupFilter(ISyncContentFilter[IGroup]):
-    __namespace__ = "MyNamespace"
+class TestGroupFilter(ContentFilterBase[IGroup]):
     
-    def Execute(self, ctx):
-        filtered = List[ContentMigrationItem[IGroup]]()
-        for item in ctx:
-            if "Test" not in item.SourceItem.Name:
-                filtered.add(item)
-        return filtered
-
-class PyTestUsernameMapping(ISyncContentMapping[IUser]):
-    __namespace__ = "MyNamespace"
-
-    def Execute(self, ctx):
-        domain = ctx.MappedLocation.Parent()
-        return ctx.MapTo(domain.Append(ctx.ContentItem.Name + "@salesforce.com"))
-
-class PyTestProjectTransformer(ISyncContentTransformer[IProject]):
-    __namespace__ = "MyNamespace"
+    def should_migrate(self, item: ContentMigrationItem[IGroup]) -> bool:
+        return "Test" not in item.source_item.name
+
+class UsernameMapping(ContentMappingBase[IUser]):
     
-    def Execute(self, ctx):
-        ctx.Description = "[From Server]\n" + ctx.Description
-        return ctx
+    def map(self, ctx: ContentMappingContext[IUser]) -> ContentMappingContext[IUser]:
+        domain = ctx.mapped_location.parent()
+        return ctx.map_to(domain.append(ctx.content_item.name + "@salesforce.com"))
+
+class ProjectTransformer(ContentTransformerBase[IProject]):
+    
+    def transform(self, item_to_transform: IProject) -> IProject:
+        item_to_transform.description = "[From Server]\n" + item_to_transform.description
+        return item_to_transform
+    
+# Hooks using functions.
+    
+def log_action(self, ctx: MigrationActionResult) -> MigrationActionResult:
+    print("ACTION COMPLETED")
+    return ctx
+
+def filter_groups(self, item: ContentMigrationItem[IGroup]) -> bool:
+    return "Test" not in item.source_item.name
+
+def map_username(self, ctx: ContentMappingContext[IUser]) -> ContentMappingContext[IUser]:
+    domain = ctx.mapped_location.parent()
+    return ctx.map_to(domain.append(ctx.content_item.name + "@salesforce.com"))
+
+def add_project_origin_desccription(self, item_to_transform: IProject) -> IProject:
+    item_to_transform.description = "[From Server]\n" + item_to_transform.description
+    return item_to_transform
\ No newline at end of file
diff --git a/examples/Python.ExampleApplication/hooks_callback.py b/examples/Python.ExampleApplication/hooks_callback.py
deleted file mode 100644
index 11e9043..0000000
--- a/examples/Python.ExampleApplication/hooks_callback.py
+++ /dev/null
@@ -1,22 +0,0 @@
-from Tableau.Migration.Content import IGroup
-from Tableau.Migration.Engine import ContentMigrationItem
-from System.Collections.Generic import List
-
-def log_callback(ctx):
-    print("ACTION COMPLETED")
-    return ctx
-
-def filter_group(ctx):
-    filtered = List[ContentMigrationItem[IGroup]]()
-    for item in ctx:
-        if "Test" not in item.SourceItem.Name:
-            filtered.add(item)
-    return filtered
-
-def map_test_user(ctx):
-    domain = ctx.MappedLocation.Parent()
-    return ctx.MapTo(domain.Append(ctx.ContentItem.Name + "@salesforce.com"))
-
-def add_project_origin_desc(ctx):
-    ctx.Description = "[From Server]\n" + ctx.Description
-    return ctx
\ No newline at end of file
diff --git a/examples/Python.ExampleApplication/hooks_factory.py b/examples/Python.ExampleApplication/hooks_factory.py
deleted file mode 100644
index 5731307..0000000
--- a/examples/Python.ExampleApplication/hooks_factory.py
+++ /dev/null
@@ -1,40 +0,0 @@
-from System.Collections.Generic import List
-from Tableau.Migration.Content import IGroup, IProject, IUser
-from Tableau.Migration.Engine import ContentMigrationItem
-from Tableau.Migration.Engine.Actions import IMigrationActionResult
-from Tableau.Migration.Engine.Hooks import IMigrationActionCompletedHook
-from Tableau.Migration.Interop.Hooks import ISyncMigrationHook
-from Tableau.Migration.Interop.Hooks.Filters import ISyncContentFilter
-from Tableau.Migration.Interop.Hooks.Mappings import ISyncContentMapping
-from Tableau.Migration.Interop.Hooks.Transformers import ISyncContentTransformer
-
-class PyLogActionHook(ISyncMigrationHook[IMigrationActionResult], IMigrationActionCompletedHook):
-    __namespace__ = "MyNamespace"
-    
-    def Execute(self, ctx):
-        print("ACTION COMPLETED")
-        return ctx
-
-class PyTestGroupFilter(ISyncContentFilter[IGroup]):
-    __namespace__ = "MyNamespace"
-    
-    def Execute(self, ctx):
-        filtered = List[ContentMigrationItem[IGroup]]()
-        for item in ctx:
-            if "Test" not in item.SourceItem.Name:
-                filtered.add(item)
-        return filtered
-
-class PyTestUsernameMapping(ISyncContentMapping[IUser]):
-    __namespace__ = "MyNamespace"
-
-    def Execute(self, ctx):
-        domain = ctx.MappedLocation.Parent()
-        return ctx.MapTo(domain.Append(ctx.ContentItem.Name + "@salesforce.com"))
-
-class PyTestProjectTransformer(ISyncContentTransformer[IProject]):
-    __namespace__ = "MyNamespace"
-    
-    def Execute(self, ctx):
-        ctx.Description = "[From Server]\n" + ctx.Description
-        return ctx
\ No newline at end of file
diff --git a/examples/Python.ExampleApplication/print_result.py b/examples/Python.ExampleApplication/print_result.py
new file mode 100644
index 0000000..aced451
--- /dev/null
+++ b/examples/Python.ExampleApplication/print_result.py
@@ -0,0 +1,44 @@
+import tableau_migration
+from tableau_migration.migration import PyMigrationResult
+from tableau_migration import IMigrationManifestEntry, MigrationManifestEntryStatus
+from Tableau.Migration.Engine.Pipelines import ServerToCloudMigrationPipeline
+
+def print_result(self, result: PyMigrationResult):
+        """Prints the result of a migration."""
+        self.logger.info(f'Result: {result.status}')
+    
+        for pipeline_content_type in ServerToCloudMigrationPipeline.ContentTypes:
+            content_type = pipeline_content_type.ContentType
+            
+            type_entries = [IMigrationManifestEntry(x) for x in result.manifest.entries.ForContentType(content_type)]
+        
+            count_total = len(type_entries)
+
+            count_migrated = 0
+            count_skipped = 0
+            count_errored = 0
+            count_cancelled = 0
+            count_pending = 0
+
+            for entry in type_entries:
+                if entry.status == MigrationManifestEntryStatus.MIGRATED:
+                    count_migrated += 1
+                elif entry.status == MigrationManifestEntryStatus.SKIPPED:
+                    count_skipped += 1
+                elif entry.status == MigrationManifestEntryStatus.ERROR:
+                    count_errored += 1
+                elif entry.status == MigrationManifestEntryStatus.CANCELED:
+                    count_cancelled += 1
+                elif entry.status == MigrationManifestEntryStatus.PENDING:
+                    count_pending += 1
+            
+            output = f'''
+            {content_type.Name}
+            \t{count_migrated}/{count_total} succeeded
+            \t{count_skipped}/{count_total} skipped
+            \t{count_errored}/{count_total} errored
+            \t{count_cancelled}/{count_total} cancelled
+            \t{count_pending}/{count_total} pending
+            '''
+               
+            self.logger.info(output)
\ No newline at end of file
diff --git a/examples/Python.ExampleApplication/requirements.txt b/examples/Python.ExampleApplication/requirements.txt
index 451a49b..ae90bd2 100644
--- a/examples/Python.ExampleApplication/requirements.txt
+++ b/examples/Python.ExampleApplication/requirements.txt
@@ -5,7 +5,6 @@ setuptools==69.1.0
 configparser==6.0.0
 tableau_migration
 cffi==1.16.0
-clr-loader==0.2.6
 pycparser==2.21
 pythonnet==3.0.3
 typing_extensions==4.9.0
diff --git a/scripts/generate-docs.ps1 b/scripts/generate-docs.ps1
index 81bfa82..94d9676 100644
--- a/scripts/generate-docs.ps1
+++ b/scripts/generate-docs.ps1
@@ -20,13 +20,18 @@ limitations under the License.
 	Generate Python and C# documentation.
 .PARAMETER Serve
     Hosts a local documentation site.
+
 .PARAMETER $SkipPreClean
     Skips cleaning the working directories. Useful when this script is being run on CI/CD such as Github since the directories 
 	do not exist yet.
+
+.PARAMETER $SkipPythonDocGeneration
+	Skips generating new python API docs. This is useful if the python API has not changed.
 #>
 param (
 	[switch]$Serve,
-	[switch]$SkipPreClean
+	[switch]$SkipPreClean,
+	[switch]$SkipPythonDocGeneration
 );
 
 # Solution folders
@@ -44,7 +49,7 @@ $main_docs_dir = Join-Path $root_dir "src/Documentation"
 $sphinx_output_dir = Join-Path $python_dir "Documentation/generated"
 
 # Directory for Python wrapper files. Includes an index file and a directory for autogenerated files.
-$python_wrapper_dir = Join-Path $main_docs_dir "python_wrapper";
+$python_wrapper_dir = Join-Path $main_docs_dir "api-python";
 
 $python_reference_dir_name = "reference";
 
@@ -88,12 +93,18 @@ function Clear-Directory {
 .PARAMETER Path
     Path to the directory.	
 #>
+	
+	if (-Not (Test-Path $path -PathType Container)) {
+		Write-Host-With-Timestamp "Creating directory since the it does not exist: " + $path;
+		New-Item -ItemType Directory -Force -Path $Path
+		if ($LASTEXITCODE -ne 0) {
+				Throw "Failed: Creating directory $path";
+		}
+	}
+	else {
 	if ($SkipPreClean) {
 		Write-Host-With-Timestamp "Skipping directory clean since SkipPreClean flag is on: " + $path;
 	}
-	elseif (-Not (Test-Path $path)) {
-		Write-Host-With-Timestamp "Skipping directory clean since the folder does not exist: " + $path;
-	}
 	else {
 		Get-ChildItem -Path ($path + "/") * -Exclude ".gitignore" -Directory -Recurse | ForEach-Object { Remove-Item $_ -Recurse };
 		Get-ChildItem -Path ($path + "/") * -Exclude ".gitignore" -File -Recurse | ForEach-Object { Remove-Item $_ };
@@ -103,6 +114,7 @@ function Clear-Directory {
 		}
 	}
 }
+}
 
 function Write-Sdk-Version {
 	<#
@@ -324,7 +336,11 @@ function Write-Host-With-Timestamp {
 }
 
 Restore-Tools;
-Write-Python-docs;
+
+if(!$SkipPythonDocGeneration) {
+	Write-Python-docs;
+}
+
 Copy-Python-Docs;
 Write-Python-Docs-Toc;
 Write-Sdk-Version;
diff --git a/src/Documentation/Documentation.csproj b/src/Documentation/Documentation.csproj
index eb460bc..37b9c9d 100644
--- a/src/Documentation/Documentation.csproj
+++ b/src/Documentation/Documentation.csproj
@@ -6,22 +6,27 @@
     <IsPublishable>False</IsPublishable>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Remove="api\**" />
+    <Compile Remove="api-csharp\**" />
     <Compile Remove="python\doctrees\**" />
-    <Compile Remove="python_wrapper\**" />
+    <Compile Remove="api-python\**" />
     <Compile Remove="_python\**" />
-    <EmbeddedResource Remove="api\**" />
+    <EmbeddedResource Remove="api-csharp\**" />
     <EmbeddedResource Remove="python\doctrees\**" />
-    <EmbeddedResource Remove="python_wrapper\**" />
+    <EmbeddedResource Remove="api-python\**" />
     <EmbeddedResource Remove="_python\**" />
-    <None Remove="api\**" />
+    <None Remove="api-csharp\**" />
     <None Remove="python\doctrees\**" />
-    <None Remove="python_wrapper\**" />
+    <None Remove="api-python\**" />
     <None Remove="_python\**" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="api\.gitignore" />
-    <None Include="api\index.md" />
-    <None Include="api\toc.yml" />
+    <None Include="api-csharp\.gitignore" />
+    <None Include="api-csharp\index.md" />
+    <None Include="api-csharp\toc.yml" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="api-python\.gitignore" />
+    <None Include="api-python\index.md" />
+    <None Include="api-python\toc.yml" />
   </ItemGroup>
 </Project>
diff --git a/src/Documentation/README.md b/src/Documentation/README.md
index d11fa59..1519c0e 100644
--- a/src/Documentation/README.md
+++ b/src/Documentation/README.md
@@ -4,10 +4,10 @@ This is the main documentation generation project. It utilizes `DocFX` to genera
 
 ## ℹ️ Sources
 
-1. API Reference: XML doc comments on public classes, interfaces and methods from the namespace `Tableau.Migration`.
-2. Python Wrapper: `~\src\Documentation\python_wrapper` folder.
+1. C# API Reference: XML doc comments on public classes, interfaces and methods from the namespace `Tableau.Migration`.
+2. Python API Reference: `~\src\Documentation\api-python` folder.
    - These files are generated our doc generation script using `Sphinx`.
-   - `DocFX` renders them into the `Python Wrapper` section on the docs site.
+   - `DocFX` renders them into the `Python API Reference` section on the docs site.
 3. Code Samples: Markdown files under `~\src\Documentation\samples`.
 4. Articles: Markdown files under `~\src\Documentation\articles`.
 
@@ -81,7 +81,14 @@ items:
 
 ##### Other `md` files
 
-The easiest way is like this `[API Reference](~/api/index.md)`. The preferred method is to use a relative URL. However, most doc do not use it because levels of  `../` are less intuitive. `DocFX` will show warnings for invalid links during doc generation.
+The easiest way is like this `[API Reference](~/api-csharp/index.md)`. The preferred method is to use a relative URL. However, most doc do not use it because levels of  `../` are less intuitive. `DocFX` will show warnings for invalid links during doc generation.
+
+#### Comments
+
+Comments are not natively supported in Markdown. The workaround is to us an empty link. Credit: https://stackoverflow.com/a/20885980
+
+Best way to add links is like this:
+`[//]: <> (This is a comment.)`
 
 #### Alerts
 
diff --git a/src/Documentation/api/.gitignore b/src/Documentation/api-csharp/.gitignore
similarity index 100%
rename from src/Documentation/api/.gitignore
rename to src/Documentation/api-csharp/.gitignore
diff --git a/src/Documentation/api/index.md b/src/Documentation/api-csharp/index.md
similarity index 100%
rename from src/Documentation/api/index.md
rename to src/Documentation/api-csharp/index.md
diff --git a/src/Documentation/python_wrapper/.gitignore b/src/Documentation/api-python/.gitignore
similarity index 100%
rename from src/Documentation/python_wrapper/.gitignore
rename to src/Documentation/api-python/.gitignore
diff --git a/src/Documentation/python_wrapper/index.md b/src/Documentation/api-python/index.md
similarity index 85%
rename from src/Documentation/python_wrapper/index.md
rename to src/Documentation/api-python/index.md
index 82e1122..5fd176f 100644
--- a/src/Documentation/python_wrapper/index.md
+++ b/src/Documentation/api-python/index.md
@@ -1,16 +1,18 @@
-# Python Wrapper
+# Introduction
+
+Welcome to the Python API Reference for the Migration SDK.
 
 The Migration SDK is written in .NET. It has a Python wrapper package that provides access to most of this functionality.
 
 ## Capabilities
 
-With the Python Wrapper, you can:
+With the Python API, you can:
 
 - Provide basic [configuration](~/articles/configuration.md) values to the Migration SDK via the PlanBuilder.
 - Set configuration options as described in [Configuration](~/articles/configuration.md) with environment variables.
 - Configure Python [logging](~/articles/logging.md#python-support).
-- Run a migration using the wrapper.
-- Write [Python hooks](~/samples/python_hooks.md) (See [Hooks](~/articles/hooks/index.md) for an overview).
+- Run a migration using python.
+- Write Python hooks. See [Custom Hooks](~/articles/hooks/index.md) for an overview.
 
 ## Current limitations
 
diff --git a/src/Documentation/articles/configuration.md b/src/Documentation/articles/configuration.md
index 2e5315f..6ae668f 100644
--- a/src/Documentation/articles/configuration.md
+++ b/src/Documentation/articles/configuration.md
@@ -65,7 +65,7 @@ The [`IMigrationPlan`](xref:Tableau.Migration.IMigrationPlan) interface defines
 
 [`MigrationSdkOptions`](xref:Tableau.Migration.Config.MigrationSdkOptions) is the configuration class the Migration SDK uses internally to process a migration. It contains adjustable properties that change some engine behaviors. These properties are useful tools to troubleshoot and tune a migration process. Start with this class and others in the [Config](xref:Tableau.Migration.Config) section for more details.
 
-When writing a C# application, we recommend using a [.NET Generic Host](https://learn.microsoft.com/en-us/dotnet/core/extensions/generic-host?tabs=appbuilder) to initialize the application. This will enable setting configuration values via `appsettings.json` which can be passed into `userOptions` in [`.AddTableauMigrationSdk`](xref:Tableau.Migration.IServiceCollectionExtensions#Tableau_Migration_IServiceCollectionExtensions_AddTableauMigrationSdk_Microsoft_Extensions_DependencyInjection_IServiceCollection_Microsoft_Extensions_Configuration_IConfiguration_). See  [.NET getting started examples](~/api/index.md) for more info.
+When writing a C# application, we recommend using a [.NET Generic Host](https://learn.microsoft.com/en-us/dotnet/core/extensions/generic-host?tabs=appbuilder) to initialize the application. This will enable setting configuration values via `appsettings.json` which can be passed into `userOptions` in [`.AddTableauMigrationSdk`](xref:Tableau.Migration.IServiceCollectionExtensions#Tableau_Migration_IServiceCollectionExtensions_AddTableauMigrationSdk_Microsoft_Extensions_DependencyInjection_IServiceCollection_Microsoft_Extensions_Configuration_IConfiguration_). See  [.NET getting started examples](~/api-csharp/index.md) for more info.
 
 When writing a python application, configuration values are set via environment variables. The `:` delimiter doesn't work with environment variable hierarchical keys on all platforms. For example, the `:` delimiter is not supported by Bash. The double underscore (`__`), which is supported on all platforms, automatically replaces any `:` delimiters in environment variables. All configuration environment variables start with `MigrationSDK__`.
 
diff --git a/src/Documentation/articles/hooks/custom_hooks.md b/src/Documentation/articles/hooks/custom_hooks.md
index c40d687..e79e829 100644
--- a/src/Documentation/articles/hooks/custom_hooks.md
+++ b/src/Documentation/articles/hooks/custom_hooks.md
@@ -1,34 +1,64 @@
 # Custom Hooks
 
-## Important classes
+## Important Classes
 
-Here are some important things you should be aware of when writing custom hooks.
+Here are some important things to know when writing custom hooks:
 
-- Interfaces: These are interfaces that expose supported methods. You can implement these directly or inherit available base classes.
-- Base classes: These are the classes you can inherit and write in your implementation in the overridden methods. You do not need to implement the interface explicitly if you use them.
-- Code Samples: We have provided some simple code samples. You can use these as a starting point for your hooks.
+- **Interfaces:** These interfaces expose supported methods. You can implement these directly or inherit available base classes. This applies to C# only.
+- **Base Classes:** These classes can be inherited, allowing you to write your implementation in the overridden methods. You do not need to implement the interface explicitly if you use these.
+- **Code Samples:** We have provided some simple code samples. You can use these as a starting point for your hooks.
 
-### Pre-migration
+## [Python](#tab/Python)
 
-| Type | Base Class | Interface| Code Samples|
-| --- | --- |--- |--|
-|[Filters](xref:Tableau.Migration.Engine.Hooks.Filters) | [`ContentFilterBase<TContent>`](xref:Tableau.Migration.Engine.Hooks.Filters.ContentFilterBase`1) |[`IContentFilter<TContent>`](xref:Tableau.Migration.Engine.Hooks.Filters.IContentFilter`1) |[Samples/Hooks/Filters](~/samples/hooks/filters/intro.md) |
-|[Mappings](xref:Tableau.Migration.Engine.Hooks.Mappings)| [`ContentMappingBase<TContent>`](xref:Tableau.Migration.Engine.Hooks.Mappings.ContentMappingBase`1) |[`IContentMapping<TContent>`](xref:Tableau.Migration.Engine.Hooks.Mappings.IContentMapping`1)|[Samples/Hooks/Mappings](~/samples/hooks/mappings/intro.md) |
-|[Transformers](xref:Tableau.Migration.Engine.Hooks.Transformers) | [`ContentTransformerBase<TPublish>`](xref:Tableau.Migration.Engine.Hooks.Transformers.ContentTransformerBase`1) |[`IContentTransformer<TPublish>`](xref:Tableau.Migration.Engine.Hooks.Transformers.IContentTransformer`1)|[Samples/Hooks/Transformers](~/samples/hooks/transformers/intro.md)|
+The base classes can be used as they are linked in the API reference. However, for ease of use, all base classes have been imported into the `tableau_migration` namespace without the `Py` prefix.
+For example: [`PyContentFilterBase`](~/api-python/reference/tableau_migration.migration_engine_hooks_filters_interop.PyContentFilterBase.md) has been imported as `tableau_migration.PyContentFilterBase`.
 
-### Post-migration
+#### Pre-Migration
 
-| Type | Base Class | Interface| Code Samples|
-| --- | --- |--- |--|
-|[Post-Publish](xref:Tableau.Migration.Engine.Hooks.PostPublish)|[`ContentItemPostPublishHookBase<TPublish, TResult>`](xref:Tableau.Migration.Engine.Hooks.PostPublish.ContentItemPostPublishHookBase`1) |[`IContentItemPostPublishHook<TContent>`](xref:Tableau.Migration.Engine.Hooks.PostPublish.IContentItemPostPublishHook`2) | [Samples/Hooks/Post-Publish Hooks](~/samples/hooks/post-publish/intro.md)|
-|[Bulk Post-Publish](xref:Tableau.Migration.Engine.Hooks.PostPublish)|[`BulkPostPublishHookBase<TSource>`](xref:Tableau.Migration.Engine.Hooks.PostPublish.BulkPostPublishHookBase`1)| [`IBulkPostPublishHook<TSource>`](xref:Tableau.Migration.Engine.Hooks.PostPublish.IBulkPostPublishHook`1)|[Samples/Hooks/Bulk Post-Publish](~/samples/hooks/bulk-post-publish/intro.md)|
-|[Batch Migration Completed](xref:Tableau.Migration.Engine.Hooks)| none| [`IContentBatchMigrationCompletedHook<TContent>`](xref:Tableau.Migration.Engine.Hooks.IContentBatchMigrationCompletedHook`1)|[Samples/Hooks/Batch Completed](~/samples/hooks/batch-migration-completed/intro.md)|
-|[Migration Action Completed](xref:Tableau.Migration.Engine.Hooks)| none| [`IMigrationActionCompletedHook`](xref:Tableau.Migration.Engine.Hooks.IMigrationActionCompletedHook)|[Samples/Hooks/Action Completed](~/samples/hooks/migration-action-completed/intro.md)|
+| Type                                                                                                    | Base Class                                                                                                                                             | Code Samples                                                 |
+|---------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------|
+| [Filters](~/api-python/reference/tableau_migration.migration_engine_hooks_filters_interop.md)           | [`ContentFilterBase<TContent>`](~/api-python/reference/tableau_migration.migration_engine_hooks_filters_interop.PyContentFilterBase.md)                | [Code Samples/Filters](~/samples/filters/intro.md)           |
+| [Mappings](~/api-python/reference/tableau_migration.migration_engine_hooks_mappings_interop.md)         | [`ContentMappingBase<TContent>`](~/api-python/reference/tableau_migration.migration_engine_hooks_mappings_interop.PyContentMappingBase.md)             | [Code Samples/Mappings](~/samples/mappings/intro.md)         |
+| [Transformers](~/api-python/reference/tableau_migration.migration_engine_hooks_transformers_interop.md) | [`ContentTransformerBase<TPublish>`](~/api-python/reference/tableau_migration.migration_engine_hooks_transformers_interop.PyContentTransformerBase.md) | [Code Samples/Transformers](~/samples/transformers/intro.md) |
 
-## Registration
+#### Post-Migration
 
-You can implement, register and call hooks in the following ways:
+| Type                                                                                                        | Base Class                                                                                                                                                                | Code Samples                                                                   |
+|-------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------|
+| [Post-Publish](~/api-python/reference/tableau_migration.migration_engine_hooks_postpublish_interop.md)      | [`ContentItemPostPublishHookBase<TPublish, TResult>`](~/api-python/reference/tableau_migration.migration_engine_hooks_postpublish_interop.PyBulkPostPublishHookBase.md)   | [Code Samples/Post-Publish Hooks](~/samples/post-publish/intro.md)             |
+| [Bulk Post-Publish](~/api-python/reference/tableau_migration.migration_engine_hooks_postpublish_interop.md) | [`BulkPostPublishHookBase<TSource>`](~/api-python/reference/tableau_migration.migration_engine_hooks_postpublish_interop.PyBulkPostPublishHookBase.md)                    | [Code Samples/Bulk Post-Publish](~/samples/bulk-post-publish/intro.md)         |
+| [Batch Migration Completed](~/api-python/reference/tableau_migration.migration_engine_hooks_interop.md)     | [`ContentBatchMigrationCompletedHookBase<TContent>`](~/api-python/reference/tableau_migration.migration_engine_hooks_interop.PyContentBatchMigrationCompletedHookBase.md) | [Code Samples/Batch Completed](~/samples/batch-migration-completed/intro.md)   |
+| [Migration Action Completed](~/api-python/reference/tableau_migration.migration_engine_hooks_interop.md)    | [`MigrationActionCompletedHookBase`](~/api-python/reference/tableau_migration.migration_engine_hooks_interop.PyMigrationActionCompletedHookBase.md)                       | [Code Samples/Action Completed](~/samples/migration-action-completed/intro.md) |
 
-1. Object: The caller supplies an object that implements a suitable interface. This is the most straightforward way to register. However, the caller must manage the object’s lifecycle and dependencies.
-2. Factory: The caller supplies a type, with or without a factory function to create an object, that implements a suitable interface. Importantly this allows for injection of SDK dependencies such as the manifest, content finders, etc. The lifecycle is managed by the DI container in the SDK (more details on DotNet Service lifetimes are [here](https://learn.microsoft.com/en-us/dotnet/core/extensions/dependency-injection#service-lifetimes)). So, before you add the type you must register the type on the DI container with the corresponding lifecycle.
-3. Callback: The caller supplies a callback function that conforms to the ExecuteAsync method of the hook interface. Essentially a functional version of #1 - internally the SDK wraps the callback in a transient object to execute the function.
+#### Registration
+
+To register Python hooks, register the object with the appropriate hook type list in the plan builder.
+
+## [C#](#tab/CSharp)
+
+#### Pre-Migration
+
+| Type											                                                          | Base Class		                                                                                                                                   | Interface 		                                                                                           | Code Samples		                                          |
+|---------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------|--------------------------------------------------------------|
+| [Filters](xref:Tableau.Migration.Engine.Hooks.Filters)                                                  | [`ContentFilterBase<TContent>`](xref:Tableau.Migration.Engine.Hooks.Filters.ContentFilterBase`1)                                                   | [`IContentFilter<TContent>`](xref:Tableau.Migration.Engine.Hooks.Filters.IContentFilter`1)                | [Code Samples/Filters](~/samples/filters/intro.md)           |
+| [Mappings](xref:Tableau.Migration.Engine.Hooks.Mappings)                                                | [`ContentMappingBase<TContent>`](xref:Tableau.Migration.Engine.Hooks.Mappings.ContentMappingBase`1)                                                | [`IContentMapping<TContent>`](xref:Tableau.Migration.Engine.Hooks.Mappings.IContentMapping`1)             | [Code Samples/Mappings](~/samples/mappings/intro.md)         |
+| [Transformers](xref:Tableau.Migration.Engine.Hooks.Transformers)                                        | [`ContentTransformerBase<TPublish>`](xref:Tableau.Migration.Engine.Hooks.Transformers.ContentTransformerBase`1)                                    | [`IContentTransformer<TPublish>`](xref:Tableau.Migration.Engine.Hooks.Transformers.IContentTransformer`1) | [Code Samples/Transformers](~/samples/transformers/intro.md) |
+
+#### Post-Migration
+
+| Type 		                                                                                               | Base Class 		                                                                                                                     | Interface 		                                                                                                            | Code Samples		                                                             |
+|----------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------|
+| [Post-Publish](xref:Tableau.Migration.Engine.Hooks.PostPublish)                                          | [`ContentItemPostPublishHookBase<TPublish, TResult>`](xref:Tableau.Migration.Engine.Hooks.PostPublish.ContentItemPostPublishHookBase`1) | [`IContentItemPostPublishHook<TContent>`](xref:Tableau.Migration.Engine.Hooks.PostPublish.IContentItemPostPublishHook`2)     | [Code Samples/Post-Publish Hooks](~/samples/post-publish/intro.md)             |
+| [Bulk Post-Publish](xref:Tableau.Migration.Engine.Hooks.PostPublish)                                     | [`BulkPostPublishHookBase<TSource>`](xref:Tableau.Migration.Engine.Hooks.PostPublish.BulkPostPublishHookBase`1)                         | [`IBulkPostPublishHook<TSource>`](xref:Tableau.Migration.Engine.Hooks.PostPublish.IBulkPostPublishHook`1)                    | [Code Samples/Bulk Post-Publish](~/samples/bulk-post-publish/intro.md)         |
+| [Batch Migration Completed](xref:Tableau.Migration.Engine.Hooks)                                         | None 		                                                                                                                             | [`IContentBatchMigrationCompletedHook<TContent>`](xref:Tableau.Migration.Engine.Hooks.IContentBatchMigrationCompletedHook`1) | [Code Samples/Batch Completed](~/samples/batch-migration-completed/intro.md)   |
+| [Migration Action Completed](xref:Tableau.Migration.Engine.Hooks)                                        | None 		                                                                                                                             | [`IMigrationActionCompletedHook`](xref:Tableau.Migration.Engine.Hooks.IMigrationActionCompletedHook)                         | [Code Samples/Action Completed](~/samples/migration-action-completed/intro.md) |
+
+#### Registration
+
+You can implement, register, and call hooks in the following ways:
+
+1. **Object:** The caller supplies an object that implements a suitable interface. This is the most straightforward way to register. However, the caller must manage the object’s lifecycle and dependencies.
+2. **Factory:** The caller supplies a type, with or without a factory function to create an object, that implements a suitable interface. This allows for the injection of SDK dependencies such as the manifest, content finders, etc. The lifecycle is managed by the DI container in the SDK (more details on .NET service lifetimes are [here](https://learn.microsoft.com/en-us/dotnet/core/extensions/dependency-injection#service-lifetimes)). Before adding the type, you must register the type on the DI container with the corresponding lifecycle.
+3. **Callback:** The caller supplies a callback function that conforms to the `ExecuteAsync` method of the hook interface. This is essentially a functional version of #1. Internally, the SDK wraps the callback in a transient object to execute the function.
+
+---
\ No newline at end of file
diff --git a/src/Documentation/articles/hooks/example_hook_use_cases.md b/src/Documentation/articles/hooks/example_hook_use_cases.md
index dbf4b7a..e1c8cd7 100644
--- a/src/Documentation/articles/hooks/example_hook_use_cases.md
+++ b/src/Documentation/articles/hooks/example_hook_use_cases.md
@@ -1,19 +1,19 @@
 # Example Hook Use Cases
 
 ## Remove Unlicensed Users During Migration
-First, create a [filter](~/samples/hooks/filters/intro.md) for [IUser](xref:Tableau.Migration.Content.IUser) items.
+First, create a [filter](~/samples/filters/intro.md) for [IUser](xref:Tableau.Migration.Content.IUser) items.
 The filter should check the [LicenseLevel](xref:Tableau.Migration.Content.IUser.LicenseLevel) property for the `Unlicensed` value, either as a string constant or with the [LicenseLevels.Unlicensed](xref:Tableau.Migration.Api.Rest.Models.LicenseLevels.Unlicensed) constant.
 This filter will prevent users matching the license level from being created on the destination site.
 
 Additional logic is needed to handle references to these users since they will not exist on the destination site, for example if an unlicensed user owns a workbook.
-One method would be to create a [mapping](~/samples/hooks/mappings/intro.md) that maps unlicensed users to one or more alternate users that will exist on the destination site.
+One method would be to create a [mapping](~/samples/mappings/intro.md) that maps unlicensed users to one or more alternate users that will exist on the destination site.
 This will allow default hooks to update user references to the alternate users.
 
 The filter and mapping are then [registered as custom hooks](custom_hooks.md#registration) with the migration plan.
 
 ## Filter Out Content Under Certain Projects
 To increase flexibility, filters do not cascade, so filtering projects does not automatically filter content within a project.
-To filter this content, create a [filter](~/samples/hooks/filters/intro.md) for data sources, workbooks, and other content types as desired.
+To filter this content, create a [filter](~/samples/filters/intro.md) for data sources, workbooks, and other content types as desired.
 The filters should check the [Location](xref:Tableau.Migration.IContentReference.Location) property to determine if the content is in a project that has been filtered.
 This can be done by comparing the path of the location's [Parent](xref:Tableau.Migration.ContentLocation.Parent) method result to either a known set of project paths, or by looking up the project in the the [migration manifest](xref:Tableau.Migration.IMigrationManifest) to see if the project was migrated.
 
@@ -21,7 +21,7 @@ The filters are then [registered as a custom hook](custom_hooks.md#registration)
 
 ## Rename a Project
 Content items are renamed through mappings so that references to content items can also be mapped during migration.
-To rename a project, create a [mapping](~/samples/hooks/mappings/intro.md) for [IProject](xref:Tableau.Migration.Content.IProject) items.
+To rename a project, create a [mapping](~/samples/mappings/intro.md) for [IProject](xref:Tableau.Migration.Content.IProject) items.
 The mapping should change the final path segment of the project's [ContentLocation](xref:Tableau.Migration.ContentLocation) as desired.
 Manipulating the path's last segment can be easily done through the location's [Rename](xref:Tableau.Migration.ContentLocation.Rename(System.String)) method.
 
@@ -29,29 +29,29 @@ The mapping is then [registered as a custom hook](custom_hooks.md#registration)
 
 ## Combine Projects
 To combine multiple source projects to a single destination project, a single destination project must be determined.
-The destination project can either be created before the migration, or a [filter](~/samples/hooks/filters/intro.md) for [IProject](xref:Tableau.Migration.Content.IProject) items can be created to filter all but one of the source projects.
-In the case of using a filter, a [transformer](~/samples/hooks/transformers/intro.md) can be created to merge permissions or other properties of the combined project when it is migrated.
+The destination project can either be created before the migration, or a [filter](~/samples/filters/intro.md) for [IProject](xref:Tableau.Migration.Content.IProject) items can be created to filter all but one of the source projects.
+In the case of using a filter, a [transformer](~/samples/transformers/intro.md) can be created to merge permissions or other properties of the combined project when it is migrated.
 
-With a single destination project determined a [mapping](~/samples/hooks/mappings/intro.md) for [IProject](xref:Tableau.Migration.Content.IProject) items should be created.
+With a single destination project determined a [mapping](~/samples/mappings/intro.md) for [IProject](xref:Tableau.Migration.Content.IProject) items should be created.
 The mapping should map the source projects to the destination combined project's location.
 
 The filters and mapping are then [registered as custom hooks](custom_hooks.md#registration) with the migration plan.
 
 ## Change a Published Data Source to Use Tableau Bridge
-First, create a [transformer](~/samples/hooks/transformers/intro.md) for [IPublishableDataSource](xref:Tableau.Migration.Content.IPublishableDataSource) items.
+First, create a [transformer](~/samples/transformers/intro.md) for [IPublishableDataSource](xref:Tableau.Migration.Content.IPublishableDataSource) items.
 The transformer should determine if the data source needs to use Tableau Bridge, and set the [UseRemoteQueryAgent](xref:Tableau.Migration.Content.IDataSource.UseRemoteQueryAgent) property to `true` for those data sources.
 
 The transformer is then [registered as a custom hook](custom_hooks.md#registration) with the migration plan.
 
 ## Tagging Content During Migration
-First, create a [transformer](~/samples/hooks/transformers/intro.md) for the desired content types that [support tags](xref:Tableau.Migration.Content.IWithTags).
+First, create a [transformer](~/samples/transformers/intro.md) for the desired content types that [support tags](xref:Tableau.Migration.Content.IWithTags).
 The transformer can then add a new [Tag](xref:Tableau.Migration.Content.Tag) object to the [Tags](xref:Tableau.Migration.Content.IWithTags.Tags) collection of the content item.
 A default post-publish hook will then ensure that the tag is added after the content item is published.
 
 The transformer is then [registered as a custom hook](custom_hooks.md#registration) with the migration plan.
 
 ## Embed Connection Credentials
-To embed credentials in connections, create a [post-publish hook](~/samples/hooks/post-publish/intro.md) for the appropriate publish and result types.
+To embed credentials in connections, create a [post-publish hook](~/samples/post-publish/intro.md) for the appropriate publish and result types.
 The hook should use dependeny injection to obtain the migration's [destination endpoint](xref:Tableau.Migration.Engine.Endpoints.IDestinationEndpoint).
 The APIs of the destination can be accessed through the [SiteApi](xref:Tableau.Migration.Engine.Endpoints.IMigrationApiEndpoint.SiteApi) property of the endpoint after casting to the [IMigrationApiEndpoint](xref:Tableau.Migration.Engine.Endpoints.IMigrationApiEndpoint) interface.
 The APIs of the desired content type should then be used to [get the connection ID](xref:Tableau.Migration.Api.IConnectionsApiClient#Tableau_Migration_Api_IConnectionsApiClient_GetConnectionsAsync_System_Guid_System_Threading_CancellationToken_) of the connection in question, and [update the connection](xref:Tableau.Migration.Api.IConnectionsApiClient#Tableau_Migration_Api_IConnectionsApiClient_UpdateConnectionAsync_System_Guid_System_Guid_Tableau_Migration_Api_Models_IUpdateConnectionOptions_System_Threading_CancellationToken_) to embed the credentials.
@@ -63,7 +63,7 @@ By default the migration SDK continues migration if a single content items fail
 This allows for partial migration, but if fundamental items such a user fails to migrate, downstream items that reference this item may fail to migrate as well.
 Canceling the migration after failures are seen when a batch completes allows for faster intervention, while ensuring that items of the batch have completed and are not partially migrated.
 
-First, create a [batch completed](~/samples/hooks/batch-migration-completed/intro.md) hook for one or more content types.
+First, create a [batch completed](~/samples/batch-migration-completed/intro.md) hook for one or more content types.
 To inspect whether the batch migration has succeeded, check the [ItemResults](xref:Tableau.Migration.Engine.Migrators.Batch.IContentBatchMigrationResult`1.ItemResults) property of the context object.
 The [status](xref:Tableau.Migration.Engine.Manifest.MigrationManifestEntryStatus) should not be the [Error](xref:Tableau.Migration.Engine.Manifest.MigrationManifestEntryStatus.Error) enumeration value.
 If an error is detected, the hook should return the value of the context object's [ForNextBatch](xref:Tableau.Migration.Engine.Migrators.Batch.IContentBatchMigrationResult`1.ForNextBatch(System.Boolean)) method with a `false` value for the `performNextBatch` argument.
@@ -71,8 +71,8 @@ If an error is detected, the hook should return the value of the context object'
 The hook is then [registered as a custom hook](custom_hooks.md#registration) with the migration plan.
 
 ## Cancel Migration After Users and Groups
-To prevent content types from migrating entirely a [filter](~/samples/hooks/filters/intro.md) that filters out all items may be used, but this still lists the items on the source site.
-To end the migration early, an [action completed](~/samples/hooks/migration-action-completed/intro.md) hook can be created.
+To prevent content types from migrating entirely a [filter](~/samples/filters/intro.md) that filters out all items may be used, but this still lists the items on the source site.
+To end the migration early, an [action completed](~/samples/migration-action-completed/intro.md) hook can be created.
 The hook can use dependency injection to obtain the migration's [manifest](xref:Tableau.Migration.IMigrationManifest), and can inspect if the expected content types are returned by the [GetPartitionTypes](xref:Tableau.Migration.Engine.Manifest.IMigrationManifestEntryCollection.GetPartitionTypes) method of the manifest's [Entries](xref:Tableau.Migration.IMigrationManifest.Entries) property.
 To cancel the migration, return the value of the context object's [ForNextAction](xref:Tableau.Migration.Engine.Actions.IMigrationActionResult.ForNextAction(System.Boolean)) method with a `false` value for the `performNextAction` argument.
 
diff --git a/src/Documentation/articles/hooks/python_hook_update.md b/src/Documentation/articles/hooks/python_hook_update.md
new file mode 100644
index 0000000..bb6fcbe
--- /dev/null
+++ b/src/Documentation/articles/hooks/python_hook_update.md
@@ -0,0 +1,159 @@
+# Updating Python Hooks from v3 to v4+
+
+Python hooks received a major update in version 4 of the Tableau Migration SDK. In version 3, all Python hooks were thin wrappers around C# code, and the actual object manipulated by the hook was a C# object. In version 4 and beyond, everything is still a wrapper around C#, but the class itself and the context object passed to be manipulated are now fully in Python with no more C# required. This change brings full autocomplete support in your favorite Python IDE.
+
+This is a breaking change and will require an update to existing v3 hooks. On this page, we'll go over how to update your v3 hooks to v4+.
+
+See [Custom Hooks](~/articles/hooks/custom_hooks.md) to learn how to build v4 hooks.
+
+## Filters
+
+There are a few changes that must be made to existing filters for them to work in version 4+.
+
+The imports have changed. All imports are now from the Python `tableau_migration` namespaces instead of the C# `Tableau.Migration` namespaces.
+
+The `__namespace__` and `_dotnet_base` variables are no longer required.
+
+The `ShouldMigration` function is now `should_migrate`.
+
+For registration, the type is no longer required. Simply add the object to the filter list.
+
+### Version 3 -> Version 4+ Filter Class Diff
+```diff
+-from Tableau.Migration.Content import IUser
+-from Tableau.Migration.Engine.Hooks.Filters import ContentFilterBase
++from tableau_migration import (
++    ContentFilterBase,
++    ContentMigrationItem,
++    IUser
++)
+
+
+class FilterBob(ContentFilterBase[IUser]):
+    """A class to filter out all users named Bob."""
+
+-    __namespace__ = "MyNamespace"
+-    _dotnet_base = ContentFilterBase[IUser]
+    
+    def __init__(self):
+        """Default init to set up logging."""
+        self._logger = logging.getLogger(self.__class__.__name__)
+        self._logger.setLevel(logging.DEBUG)
+
+-    def ShouldMigrate(self,item):
++    def should_migrate(self, item: ContentMigrationItem[IUser]) -> bool:
+        """Implements ShouldMigrate from base."""
+-        if item.SourceItem.Name.casefold() == "Bob".casefold():
++        if item.source_item.name.casefold() == "Bob".casefold():
+            self._logger.debug('%s filtered Bob', self.__class__.__name__)
+            return False
+        
+        return True
+```
+
+### Version 3 -> Version 4+ Registration Diff
+
+```diff
+-   plan_builder.filters.add(IUser, FilterBob())
++   plan_builder.filters.add(FilterBob())
+```
+
+## Mappings
+
+There are a few changes that must be made to existing mappings for them to work in version 4+.
+
+The imports have changed. All imports are now from the Python `tableau_migration` namespaces instead of the C# `Tableau.Migration` namespaces.
+
+The `__namespace__` and `_dotnet_base` variables are no longer required.
+
+The `Execute` function is now `map` with the parameter being of type `ContentMappingContext[T]`.
+
+For registration, the type is no longer required. Simply add the object to the mapping list.
+
+### Version 3 -> Version 4+ Mapping Class Diff
+```diff
+-from Tableau.Migration.Interop.Hooks.Mappings import ISyncContentMapping
+-from Tableau.Migration.Content import IUser
+-from Tableau.Migration import ContentLocation
++from tableau_migration import (
++    ContentLocation,
++    ContentMappingBase,
++    ContentMappingContext,
++    IUser
++)
+
+
+-class SpecialUserMapping(ISyncContentMapping[IUser]):
++class SpecialUserMapping(ContentMappingBase[IUser]):
+    """A class to map users to server admin."""
+
+-    __namespace__ = "MyNamespace"
+-    _dotnet_base = ISyncContentMapping[IUser]
+-    _admin_username = ContentLocation.ForUsername("domain", "admin")
++    _admin_username = ContentLocation.for_username("domain", "admin")
+        
+    def __init__(self):
+        """Default init to set up logging."""
+        self._logger = logging.getLogger(self.__class__.__name__)
+        self._logger.setLevel(logging.DEBUG)
+    
+-    def Execute(self,ctx):  # noqa: N802
++    def map(self, ctx: ContentMappingContext[IUser]) -> ContentMappingContext[IUser]:
+-       if ctx.ContentItem.Email.casefold() == "bob@company.com".casefold():
++       if ctx.content_item.email.casefold() == "bob@company.com".casefold():
+-            ctx=ctx.MapTo(self._admin_username)
++            ctx = ctx.map_to(self._admin_username)
+-            self._logger.debug('Mapped %s to %s', ctx.ContentItem.Email, ctx.MappedLocation.ToString())
++            self._logger.debug('Mapped %s to %s', ctx.content_item.email, str(ctx.mapped_location))
+        return ctx
+```
+
+### Version 3 -> Version 4+ Registration Diff
+
+```diff
+-   plan_builder.mappings.add(IUser, SpecialUserMapping())
++   plan_builder.mappings.add(SpecialUserMapping())
+```
+
+## Transformers
+
+There are a few changes that must be made to existing transformers for them to work in version 4+.
+
+The imports have changed. All imports are now from the Python `tableau_migration` namespaces instead of the C# `Tableau.Migration` namespaces.
+
+The `__namespace__` and `_dotnet_base` variables are no longer required.
+
+The `Execute` function is now `transform` with the parameter being of the publishable type to transform.
+
+For registration, the type is no longer required. Simply add the object to the transformer list.
+
+### Version 3 -> Version 4+ Transformer Class Diff
+
+```diff
+-from Tableau.Migration.Interop.Hooks.Transformers import ISyncContentTransformer
+-from Tableau.Migration.Content import IPublishableDataSource
++from typing import TypeVar
++from tableau_migration import (
++    ContentTransformerBase,
++    IPublishableWorkbook,
++    IPublishableDataSource)
+
+-class EncryptExtractsDataSourceTransformer(ISyncContentTransformer[IPublishableDataSource]):
++class EncryptExtractsDataSourceTransformer(ContentTransformerBase[IPublishableDataSource]):
+-    __namespace__ = "MyNamespace"
+    
+-    def Execute(self, ctx):
++    def transform(self, itemToTransform: IPublishableDataSource) -> IPublishableDataSource:
+-       ctx.EncryptExtracts = True
++       itemToTransform.encrypt_extracts = True
+-       return ctx
++       return itemToTransform
+   
+```
+
+### Version 3 -> Version 4+ Registration Diff
+
+```diff
+-   plan_builder.transformers.add(IPublishableDataSource, EncryptExtractsDataSourceTransformer())
++   plan_builder.transformers.add(EncryptExtractsDataSourceTransformer())
+```
\ No newline at end of file
diff --git a/src/Documentation/articles/intro.md b/src/Documentation/articles/intro.md
index 2235bf0..296686d 100644
--- a/src/Documentation/articles/intro.md
+++ b/src/Documentation/articles/intro.md
@@ -1,5 +1,5 @@
 # Introduction
 
-The Migration SDK is primarily written in C# using the [.NET](https://dotnet.microsoft.com/en-us/learn/dotnet/what-is-dotnet-framework) Framework. To enable interoperability with Python, it also includes a [Python Wrapper](~/python_wrapper/index.md). The articles in this section delve into useful information to help you design and write your migration application.
+The Migration SDK is primarily written in C# using the [.NET](https://dotnet.microsoft.com/en-us/learn/dotnet/what-is-dotnet-framework) Framework. To enable interoperability with Python, it also includes a [Python Wrapper](~/api-python/index.md). The articles in this section delve into useful information to help you design and write your migration application.
 
 This documentation also contains [Code Samples](~/samples/intro.md) to give you a head start.
diff --git a/src/Documentation/articles/toc.yml b/src/Documentation/articles/toc.yml
index 6d901f0..409b147 100644
--- a/src/Documentation/articles/toc.yml
+++ b/src/Documentation/articles/toc.yml
@@ -13,6 +13,8 @@
     href: hooks/custom_hooks.md  
   - name: Example Hook Use Cases
     href: hooks/example_hook_use_cases.md
+  - name: Python Hook Update from v3 to v4+
+    href: hooks/python_hook_update.md
 - name: User Authentication
   href: user_authentication.md
 - name: Dependency Injection
diff --git a/src/Documentation/articles/user_authentication.md b/src/Documentation/articles/user_authentication.md
index 1608bdf..9a4b951 100644
--- a/src/Documentation/articles/user_authentication.md
+++ b/src/Documentation/articles/user_authentication.md
@@ -25,4 +25,4 @@ The `WithAuthenticationType()` and its overloads allow you to supply your chosen
 
 ## Custom Mapping
 
-You can also build your own mapping to supply to the appropriate `WithAuthenticationType()` overload. See [Sample EmailDomainMapping](~/samples/hooks/mappings/username_email_mapping.md) for example code.
+You can also build your own mapping to supply to the appropriate `WithAuthenticationType()` overload. See [Sample EmailDomainMapping](~/samples/mappings/username_email_mapping.md) for example code.
diff --git a/src/Documentation/docfx.json b/src/Documentation/docfx.json
index 71ef959..718976d 100644
--- a/src/Documentation/docfx.json
+++ b/src/Documentation/docfx.json
@@ -9,13 +9,14 @@
           "exclude": [
             "**/bin/**",
             "**/obj/**",
-            "README.md"
+            "README.md",
+            "**/Tableau.Migration.PythonGenerator/**"
           ],
           "src": "../"
         }
       ],
       "filter": "filterConfig.yml",
-      "dest": "api",
+      "dest": "api-csharp",
       "force": true,
       "disableGitFeatures": false,
       "disableDefaultFilter": false,
@@ -31,11 +32,11 @@
     "content": [
       {
         "files": [
-          "api/**.yml",
-          "api/index.md",
+          "api-csharp/**.yml",
+          "api-csharp/index.md",
           "samples/**.md",
-          "python_wrapper/**.md",
-          "python_wrapper/**.yml",
+          "api-python/**.md",
+          "api-python/**.yml",
           "samples/**.yml",
           "toc.yml",
           "*.md",
diff --git a/src/Documentation/index.md b/src/Documentation/index.md
index 1cae2c3..c2d9522 100644
--- a/src/Documentation/index.md
+++ b/src/Documentation/index.md
@@ -1,17 +1,17 @@
 # Contents
 
-## [API Reference](~/api/index.md)
+## [Python API Reference](~/api-python/index.md)
 
-The full C# API Reference.
+Access the complete Python API Reference for comprehensive documentation.
 
-## [Python Wrapper](~/python_wrapper/index.md)
+## [C# API Reference](~/api-csharp/index.md)
 
-The Python Wrapper Reference.
+Access the complete C# API Reference for detailed documentation.
 
 ## [Code Samples](~/samples/intro.md)
 
-Code samples to get you started.
+Explore code samples to kickstart your development process.
 
 ## [Articles](~/articles/intro.md)
 
-Articles describing various concepts including how to customize the Migration SDK.
+Browse articles covering a range of topics, including customization of the Migration SDK.
diff --git a/src/Documentation/samples/hooks/batch-migration-completed/intro.md b/src/Documentation/samples/batch-migration-completed/intro.md
similarity index 62%
rename from src/Documentation/samples/hooks/batch-migration-completed/intro.md
rename to src/Documentation/samples/batch-migration-completed/intro.md
index 9d2c3a2..f22e29c 100644
--- a/src/Documentation/samples/hooks/batch-migration-completed/intro.md
+++ b/src/Documentation/samples/batch-migration-completed/intro.md
@@ -4,4 +4,4 @@ Batch Migration Completed Hooks allow custom logic to run when a migration batch
 
 The following samples cover some common scenarios:
 
-- [Sample: Migration batch logging](~/samples/hooks/batch-migration-completed/log_migration_batches.md)
+- [Sample: Migration batch logging](~/samples/batch-migration-completed/log_migration_batches.md)
diff --git a/src/Documentation/samples/batch-migration-completed/log_migration_batches.md b/src/Documentation/samples/batch-migration-completed/log_migration_batches.md
new file mode 100644
index 0000000..fbd17eb
--- /dev/null
+++ b/src/Documentation/samples/batch-migration-completed/log_migration_batches.md
@@ -0,0 +1,39 @@
+# Sample: Batch Migration Logging
+
+This example demonstrates how to log migration batch item statuses using a batch migration completed hook.
+
+# [Python](#tab/Python)
+
+#### Batch Migration Completed Hook Class
+
+[!code-python[](../../../../examples/Python.ExampleApplication/hooks/batch_migration_completed/log_migration_batches_hook.py)]
+
+#### Registration
+
+[Learn more.](~/samples/intro.md?tabs=Python#hook-registration)
+
+[//]: <> (Adding this as code as regions are not supported in Python snippets)
+```Python
+plan_builder.hooks.add(LogMigrationBatchesHookForUsers)
+plan_builder.hooks.add(LogMigrationBatchesHookForGroups)
+```
+
+# [C#](#tab/CSharp)
+
+#### Batch Migration Completed Hook Class
+
+[!code-csharp[](../../../../examples/Csharp.ExampleApplication/Hooks/BatchMigrationCompleted/LogMigrationBatchesHook.cs#class)]
+
+#### Registration
+
+[Learn more.](~/samples/intro.md?tabs=CSharp#hook-registration)
+
+[!code-csharp[](../../../../examples/Csharp.ExampleApplication/MyMigrationApplication.cs#LogMigrationBatchesHook-Registration)]
+
+#### Dependency Injection
+
+[Learn more.](~/articles/dependency_injection.md)
+
+[!code-csharp[](../../../../examples/Csharp.ExampleApplication/Program.cs#LogMigrationBatchesHook-DI)]
+
+---
diff --git a/src/Documentation/samples/batch-migration-completed/toc.yml b/src/Documentation/samples/batch-migration-completed/toc.yml
new file mode 100644
index 0000000..3dd90fe
--- /dev/null
+++ b/src/Documentation/samples/batch-migration-completed/toc.yml
@@ -0,0 +1,2 @@
+- name: Batch migration logging
+  href: log_migration_batches.md
\ No newline at end of file
diff --git a/src/Documentation/samples/bulk-post-publish/bulk_logging.md b/src/Documentation/samples/bulk-post-publish/bulk_logging.md
new file mode 100644
index 0000000..ff069dc
--- /dev/null
+++ b/src/Documentation/samples/bulk-post-publish/bulk_logging.md
@@ -0,0 +1,38 @@
+# Sample: Bulk logging
+
+In the following example, a bulk post-publish hook logs published items.
+
+# [Python](#tab/Python)
+
+#### Bulk Post-Publish Hook Class
+
+[!code-python[](../../../../examples/Python.ExampleApplication/hooks/post_publish/bulk_logging_hook.py)]
+
+#### Registration
+
+[Learn more.](~/samples/intro.md?tabs=Python#hook-registration)
+
+[//]: <> (Adding this as code as regions are not supported in python snippets)
+```Python
+plan_builder.hooks.add(BulkLoggingHookForDataSources)
+```
+
+# [C#](#tab/CSharp)
+
+#### Bulk Post-Publish Hook Class
+
+[!code-csharp[](../../../../examples/Csharp.ExampleApplication/Hooks/PostPublish/BulkLoggingHook.cs#class)]
+
+#### Registration
+
+[Learn more.](~/samples/intro.md?tabs=CSharp#hook-registration)
+
+[!code-csharp[](../../../../examples/Csharp.ExampleApplication/MyMigrationApplication.cs#BulkLoggingHook-Registration)]
+
+#### Dependency Injection
+
+[Learn more.](~/articles/dependency_injection.md)
+
+[!code-csharp[](../../../../examples/Csharp.ExampleApplication/Program.cs#BulkLoggingHook-DI)]
+
+---
diff --git a/src/Documentation/samples/hooks/bulk-post-publish/intro.md b/src/Documentation/samples/bulk-post-publish/intro.md
similarity index 71%
rename from src/Documentation/samples/hooks/bulk-post-publish/intro.md
rename to src/Documentation/samples/bulk-post-publish/intro.md
index 7e76497..1ba0bd3 100644
--- a/src/Documentation/samples/hooks/bulk-post-publish/intro.md
+++ b/src/Documentation/samples/bulk-post-publish/intro.md
@@ -4,4 +4,4 @@ Bulk post-publish hooks allow you to update content item batches after they are
 
 The following samples cover some common scenarios:
 
-- [Sample: Bulk logging](~/samples/hooks/bulk-post-publish/bulk_logging.md)
+- [Sample: Bulk logging](~/samples/bulk-post-publish/bulk_logging.md)
diff --git a/src/Documentation/samples/bulk-post-publish/toc.yml b/src/Documentation/samples/bulk-post-publish/toc.yml
new file mode 100644
index 0000000..c3a0f30
--- /dev/null
+++ b/src/Documentation/samples/bulk-post-publish/toc.yml
@@ -0,0 +1,2 @@
+- name: Bulk logging
+  href: bulk_logging.md
\ No newline at end of file
diff --git a/src/Documentation/samples/filters/filter_projects_by_name.md b/src/Documentation/samples/filters/filter_projects_by_name.md
new file mode 100644
index 0000000..df82dd0
--- /dev/null
+++ b/src/Documentation/samples/filters/filter_projects_by_name.md
@@ -0,0 +1,36 @@
+# Sample: Filter Projects by Name
+
+In this example, the project named `Default` is filtered out.
+
+# [Python](#tab/Python)
+
+#### Filter Class
+
+[!code-python[](../../../../examples/Python.ExampleApplication/hooks/filters/default_project_filter.py)]
+
+#### Registration
+
+[Learn more.](~/samples/intro.md?tabs=Python#hook-registration)
+
+[//]: <> (Adding this as code as regions are not supported in Python snippets)
+```Python
+plan_builder.filters.add(DefaultProjectFilter)
+```
+
+# [C#](#tab/CSharp)
+
+#### Filter Class
+
+[!code-csharp[](../../../../examples/Csharp.ExampleApplication/Hooks/Filters/DefaultProjectsFilter.cs#class)]
+
+#### Registration
+
+[Learn more.](~/samples/intro.md?tabs=CSharp#hook-registration)
+
+[!code-csharp[](../../../../examples/Csharp.ExampleApplication/MyMigrationApplication.cs#DefaultProjectsFilter-Registration)]
+
+#### Dependency Injection
+
+[Learn more.](~/articles/dependency_injection.md)
+
+[!code-csharp[](../../../../examples/Csharp.ExampleApplication/Program.cs#DefaultProjectsFilter-DI)]
diff --git a/src/Documentation/samples/filters/filter_users_by_site_role.md b/src/Documentation/samples/filters/filter_users_by_site_role.md
new file mode 100644
index 0000000..227b9f0
--- /dev/null
+++ b/src/Documentation/samples/filters/filter_users_by_site_role.md
@@ -0,0 +1,36 @@
+# Sample: Filter Users by SiteRole
+
+In this example, all unlicensed users are excluded from migration.
+
+# [Python](#tab/Python)
+
+#### Filter Class
+
+[!code-python[](../../../../examples/Python.ExampleApplication/hooks/filters/unlicensed_user_filter.py)]
+
+#### Registration
+
+[Learn more.](~/samples/intro.md?tabs=Python#hook-registration)
+
+[//]: <> (Adding this as code as regions are not supported in Python snippets)
+```Python
+plan_builder.filters.add(UnlicensedUserFilter)
+```
+
+# [C#](#tab/CSharp)
+
+#### Filter Class
+
+[!code-csharp[](../../../../examples/Csharp.ExampleApplication/Hooks/Filters/UnlicensedUsersFilter.cs#class)]
+
+#### Registration
+
+[Learn more.](~/samples/intro.md?tabs=Python#hook-registration)
+
+[!code-csharp[](../../../../examples/Csharp.ExampleApplication/MyMigrationApplication.cs#UnlicensedUsersFilter-Registration)]
+
+#### Dependency Injection
+
+[Learn more.](~/articles/dependency_injection.md)
+
+[!code-csharp[](../../../../examples/Csharp.ExampleApplication/Program.cs#UnlicensedUsersFilter-DI)]
diff --git a/src/Documentation/samples/hooks/filters/intro.md b/src/Documentation/samples/filters/intro.md
similarity index 58%
rename from src/Documentation/samples/hooks/filters/intro.md
rename to src/Documentation/samples/filters/intro.md
index e581bd0..d8e7b6d 100644
--- a/src/Documentation/samples/hooks/filters/intro.md
+++ b/src/Documentation/samples/filters/intro.md
@@ -7,6 +7,6 @@ Filters allow you to skip migrating certain content items.
 
 The following samples cover some common scenarios:
 
-- [Sample: Filter projects by name](~/samples/hooks/filters/filter_projects_by_name.md)
+- [Sample: Filter projects by name](~/samples/filters/filter_projects_by_name.md)
 
-- [Sample: Filter users by site role](~/samples/hooks/filters/filter_users_by_site_role.md)
+- [Sample: Filter users by site role](~/samples/filters/filter_users_by_site_role.md)
diff --git a/src/Documentation/samples/hooks/filters/toc.yml b/src/Documentation/samples/filters/toc.yml
similarity index 57%
rename from src/Documentation/samples/hooks/filters/toc.yml
rename to src/Documentation/samples/filters/toc.yml
index 50aec91..47de512 100644
--- a/src/Documentation/samples/hooks/filters/toc.yml
+++ b/src/Documentation/samples/filters/toc.yml
@@ -1,5 +1,3 @@
-- name: Introduction
-  href: intro.md
 - name: Filter projects by name
   href: filter_projects_by_name.md
 - name: Filter users by SiteRole
diff --git a/src/Documentation/samples/hooks/batch-migration-completed/log_migration_batches.md b/src/Documentation/samples/hooks/batch-migration-completed/log_migration_batches.md
deleted file mode 100644
index d661da5..0000000
--- a/src/Documentation/samples/hooks/batch-migration-completed/log_migration_batches.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Sample: Batch Migration logging
-
-In the following example, a batch migration completed hook logs migration batch item statuses.
-
-## [Batch Migration Completed Hook Class](#tab/class)
-
-[!code-csharp[](../../../../../examples/Csharp.ExampleApplication/Hooks/BatchMigrationCompleted/LogMigrationBatchesHook.cs#class)]
-
-## [Registration](#tab/registration)
-
-[!code-csharp[](../../../../../examples/Csharp.ExampleApplication/MyMigrationApplication.cs#LogMigrationBatchesHook-Registration)]
-
-## [Dependency Injection](#tab/di)
-
-[!code-csharp[](../../../../../examples/Csharp.ExampleApplication/Program.cs#LogMigrationBatchesHook-DI)]
-
----
diff --git a/src/Documentation/samples/hooks/batch-migration-completed/toc.yml b/src/Documentation/samples/hooks/batch-migration-completed/toc.yml
deleted file mode 100644
index 4bef2f3..0000000
--- a/src/Documentation/samples/hooks/batch-migration-completed/toc.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-- name: Introduction
-  href: intro.md
-- name: Batch migration logging
-  href: log_migration_batches.md
\ No newline at end of file
diff --git a/src/Documentation/samples/hooks/bulk-post-publish/bulk_logging.md b/src/Documentation/samples/hooks/bulk-post-publish/bulk_logging.md
deleted file mode 100644
index 26b60aa..0000000
--- a/src/Documentation/samples/hooks/bulk-post-publish/bulk_logging.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Sample: Bulk logging
-
-In the following example, a bulk post-publish hook logs published items.
-
-## [Bulk Post-Publish Hook Class](#tab/class)
-
-[!code-csharp[](../../../../../examples/Csharp.ExampleApplication/Hooks/PostPublish/BulkLoggingHook.cs#class)]
-
-## [Registration](#tab/registration)
-
-[!code-csharp[](../../../../../examples/Csharp.ExampleApplication/MyMigrationApplication.cs#BulkLoggingHook-Registration)]
-
-## [Dependency Injection](#tab/di)
-
-[!code-csharp[](../../../../../examples/Csharp.ExampleApplication/Program.cs#BulkLoggingHook-DI)]
-
----
diff --git a/src/Documentation/samples/hooks/bulk-post-publish/toc.yml b/src/Documentation/samples/hooks/bulk-post-publish/toc.yml
deleted file mode 100644
index 9bb8c7b..0000000
--- a/src/Documentation/samples/hooks/bulk-post-publish/toc.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-- name: Introduction
-  href: intro.md
-- name: Bulk logging
-  href: bulk_logging.md
\ No newline at end of file
diff --git a/src/Documentation/samples/hooks/filters/filter_projects_by_name.md b/src/Documentation/samples/hooks/filters/filter_projects_by_name.md
deleted file mode 100644
index 0aaa435..0000000
--- a/src/Documentation/samples/hooks/filters/filter_projects_by_name.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Sample: Filter projects by name
-
-In the following example, the project named `Default` is filtered out.
-
-## [Filter class](#tab/class)
-
-[!code-csharp[](../../../../../examples/Csharp.ExampleApplication/Hooks/Filters/DefaultProjectsFilter.cs#class)]
-
-## [Registration](#tab/registration)
-
-[!code-csharp[](../../../../../examples/Csharp.ExampleApplication/MyMigrationApplication.cs#DefaultProjectsFilter-Registration)]
-
-## [Dependency Injection](#tab/di)
-
-[!code-csharp[](../../../../../examples/Csharp.ExampleApplication/Program.cs#DefaultProjectsFilter-DI)]
-
----
diff --git a/src/Documentation/samples/hooks/filters/filter_users_by_site_role.md b/src/Documentation/samples/hooks/filters/filter_users_by_site_role.md
deleted file mode 100644
index 7ec8a66..0000000
--- a/src/Documentation/samples/hooks/filters/filter_users_by_site_role.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Sample: Filter users by [SiteRole](xref:Tableau.Migration.Api.Rest.Models.SiteRoles)
-
-In the following example, all unlicensed users are excluded from migration.
-
-## [Filter class](#tab/class)
-
-[!code-csharp[](../../../../../examples/Csharp.ExampleApplication/Hooks/Filters/UnlicensedUsersFilter.cs#class)]
-
-## [Registration](#tab/registration)
-
-[!code-csharp[](../../../../../examples/Csharp.ExampleApplication/MyMigrationApplication.cs#UnlicensedUsersFilter-Registration)]
-
-## [Dependency Injection](#tab/di)
-
-[!code-csharp[](../../../../../examples/Csharp.ExampleApplication/Program.cs#UnlicensedUsersFilter-DI)]
-
----
diff --git a/src/Documentation/samples/hooks/mappings/change_projects.md b/src/Documentation/samples/hooks/mappings/change_projects.md
deleted file mode 100644
index 49a56e1..0000000
--- a/src/Documentation/samples/hooks/mappings/change_projects.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Sample: Change projects
-
-In the following example, source data sources and workbooks in a project named `Test` are migrated to the destination's `Production` project.
-
-## [Mapping class](#tab/class)
-
-[!code-csharp[](../../../../../examples/Csharp.ExampleApplication/Hooks/Mappings/ChangeProjectMapping.cs#class)]
-
-## [Registration](#tab/registration)
-
-[!code-csharp[](../../../../../examples/Csharp.ExampleApplication/MyMigrationApplication.cs#ChangeProjectMapping-Registration)]
-
-## [Dependency Injection](#tab/di)
-
-[!code-csharp[](../../../../../examples/Csharp.ExampleApplication/Program.cs#ChangeProjectMapping-DI)]
-
----
diff --git a/src/Documentation/samples/hooks/mappings/rename_projects.md b/src/Documentation/samples/hooks/mappings/rename_projects.md
deleted file mode 100644
index 43b21b8..0000000
--- a/src/Documentation/samples/hooks/mappings/rename_projects.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Sample: Rename projects
-
-In the following example, the source project named `Test` is named `Production` on the destination.
-
-## [Mapping class](#tab/class)
-
-[!code-csharp[](../../../../../examples/Csharp.ExampleApplication/Hooks/Mappings/ProjectRenameMapping.cs#class)]
-
-## [Registration](#tab/registration)
-
-[!code-csharp[](../../../../../examples/Csharp.ExampleApplication/MyMigrationApplication.cs#ProjectRenameMapping-Registration)]
-
-## [Dependency Injection](#tab/di)
-
-[!code-csharp[](../../../../../examples/Csharp.ExampleApplication/Program.cs#ProjectRenameMapping-DI)]
-
----
diff --git a/src/Documentation/samples/hooks/mappings/username_email_mapping.md b/src/Documentation/samples/hooks/mappings/username_email_mapping.md
deleted file mode 100644
index 5550605..0000000
--- a/src/Documentation/samples/hooks/mappings/username_email_mapping.md
+++ /dev/null
@@ -1,25 +0,0 @@
-# Sample EmailDomainMapping
-
-This example is for a hypothetical scenario where the Tableau Server usernames are the same as the user part of the email. It uses a configuration class to supply the email domain.
-
-## `C#`
-
-### [Mapping class](#tab/class)
-
-[!code-csharp[CS](../../../../../examples/Csharp.ExampleApplication/Hooks/Mappings/EmailDomainMapping.cs#namespace)]
-
-### [Configuration class](#tab/config)
-
-[!code-csharp[CS](../../../../../examples/Csharp.ExampleApplication/Hooks/Mappings/EmailDomainMappingOptions.cs)]
-
-### [Registration](#tab/registration)
-
-See the line with `WithTableauCloudUsernames`
-
-[!code-csharp[CS](../../../../../examples/Csharp.ExampleApplication/MyMigrationApplication.cs#EmailDomainMapping-Registration)]
-
-### [Dependency Injection](#tab/di)
-
-[!code-csharp[CS](../../../../../examples/Csharp.ExampleApplication/Program.cs#EmailDomainMapping-DI)]
-
----
diff --git a/src/Documentation/samples/hooks/migration-action-completed/log_migration_actions.md b/src/Documentation/samples/hooks/migration-action-completed/log_migration_actions.md
deleted file mode 100644
index a2fa871..0000000
--- a/src/Documentation/samples/hooks/migration-action-completed/log_migration_actions.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Sample: Migration action logging
-
-In the following example, a migration action completed hook logs migration action statuses.
-
-## [Migration Action Completed Hook Class](#tab/class)
-
-[!code-csharp[](../../../../../examples/Csharp.ExampleApplication/Hooks/MigrationActionCompleted/LogMigrationActionsHook.cs#class)]
-
-## [Registration](#tab/registration)
-
-[!code-csharp[](../../../../../examples/Csharp.ExampleApplication/MyMigrationApplication.cs#LogMigrationActionsHook-Registration)]
-
-## [Dependency Injection](#tab/di)
-
-[!code-csharp[](../../../../../examples/Csharp.ExampleApplication/Program.cs#LogMigrationActionsHook-DI)]
-
----
diff --git a/src/Documentation/samples/hooks/migration-action-completed/toc.yml b/src/Documentation/samples/hooks/migration-action-completed/toc.yml
deleted file mode 100644
index 165741a..0000000
--- a/src/Documentation/samples/hooks/migration-action-completed/toc.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-- name: Introduction
-  href: intro.md
-- name: Migration action logging
-  href: log_migration_actions.md
\ No newline at end of file
diff --git a/src/Documentation/samples/hooks/post-publish/update_permissions.md b/src/Documentation/samples/hooks/post-publish/update_permissions.md
deleted file mode 100644
index 9f584e1..0000000
--- a/src/Documentation/samples/hooks/post-publish/update_permissions.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Sample: Update permissions
-
-In the following example, write permissions for content with a `Production` tag will be set to `Deny`.
-
-## [Post-Publish Hook Class](#tab/class)
-
-[!code-csharp[](../../../../../examples/Csharp.ExampleApplication/Hooks/PostPublish/UpdatePermissionsHook.cs#class)]
-
-## [Registration](#tab/registration)
-
-[!code-csharp[](../../../../../examples/Csharp.ExampleApplication/MyMigrationApplication.cs#UpdatePermissionsHook-Registration)]
-
-## [Dependency Injection](#tab/di)
-
-[!code-csharp[](../../../../../examples/Csharp.ExampleApplication/Program.cs#UpdatePermissionsHook-DI)]
-
----
diff --git a/src/Documentation/samples/hooks/toc.yml b/src/Documentation/samples/hooks/toc.yml
deleted file mode 100644
index adb99e9..0000000
--- a/src/Documentation/samples/hooks/toc.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-- name: Filters
-  href: filters/toc.yml
-- name: Mappings
-  href: mappings/toc.yml
-- name: Post-Publish Hooks
-  href: post-publish/toc.yml
-- name: Bulk Post-Publish Hooks
-  href: bulk-post-publish/toc.yml
-- name: Transformers
-  href: transformers/toc.yml
-- name: Migration Action Completed
-  href: migration-action-completed/toc.yml
-- name: Batch Migration Completed
-  href: batch-migration-completed/toc.yml
diff --git a/src/Documentation/samples/hooks/transformers/intro.md b/src/Documentation/samples/hooks/transformers/intro.md
deleted file mode 100644
index 373e226..0000000
--- a/src/Documentation/samples/hooks/transformers/intro.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Transformers
-
-Transformers allow you to update content items before they are migrated to the destination.
-
-The following samples cover some common scenarios:
-
-- [Sample: Add tags to content](~/samples/hooks/transformers/migrated_tag_transformer.md)
diff --git a/src/Documentation/samples/hooks/transformers/migrated_tag_transformer.md b/src/Documentation/samples/hooks/transformers/migrated_tag_transformer.md
deleted file mode 100644
index fba7857..0000000
--- a/src/Documentation/samples/hooks/transformers/migrated_tag_transformer.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Sample: Add tags to content
-
-In the following example, a `Migrated` tag is added to data sources and workbooks.
-
-## [Transformer Class](#tab/class)
-
-[!code-csharp[](../../../../../examples/Csharp.ExampleApplication/Hooks/Transformers/MigratedTagTransformer.cs#class)]
-
-## [Registration](#tab/registration)
-
-[!code-csharp[](../../../../../examples/Csharp.ExampleApplication/MyMigrationApplication.cs#MigratedTagTransformer-Registration)]
-
-## [Dependency Injection](#tab/di)
-
-[!code-csharp[](../../../../../examples/Csharp.ExampleApplication/Program.cs#MigratedTagTransformer-DI)]
-
----
diff --git a/src/Documentation/samples/hooks/transformers/toc.yml b/src/Documentation/samples/hooks/transformers/toc.yml
deleted file mode 100644
index 83eda10..0000000
--- a/src/Documentation/samples/hooks/transformers/toc.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-- name: Introduction
-  href: intro.md
-- name: Add tags to content
-  href: migrated_tag_transformer.md
-  
diff --git a/src/Documentation/samples/intro.md b/src/Documentation/samples/intro.md
index 75af3c9..5de560f 100644
--- a/src/Documentation/samples/intro.md
+++ b/src/Documentation/samples/intro.md
@@ -1,3 +1,48 @@
 # Code Samples
 
-After you have started building your migration using the example code in [C#](~/api/index.md) or [Python](~/python_wrapper/index.md), you may want to further customize your migration using hooks. This section contains some code samples to help.
+Once you have started building your migration using the example code in [C#](~/api-csharp/index.md) or [Python](~/api-python/index.md), you may want to further customize your migration using hooks. This section provides code samples to assist you.
+
+[Learn more about hooks here.](~/articles/hooks/index.md)
+
+## Hook Registration
+
+To use hooks, you need to register them with the [plan builder](~/articles/configuration.md#migration-plan).
+
+The process of registering hooks differs slightly between C# and Python, as described below.
+
+# [Python](#tab/Python)
+
+In Python, injecting an object into the class constructor is not supported, and in most cases, it is unnecessary.
+
+To register a Python hook object, simply create the object and add it to the appropriate hook type collection.
+
+**Generic Form:** `plan_builder.[hook type collection].add([hook object])`
+
+**Example:** 
+```
+plan_builder.filters.add(UnlicensedUsersFilter)
+```
+
+# [C#](#tab/CSharp)
+
+In C#, the hook object should be registered with Dependency Injection (DI). This allows hooks to have any object injected into the constructor without concern for the source of the object.
+
+Learn more about [dependency injection](~/articles/dependency_injection.md).
+
+To register your hook object with the dependency injection service provider, simply add it.
+
+**Generic Form:** `services.AddScoped<[Object type]>();`
+
+**Example:**
+```
+services.AddScoped<UnlicensedUsersFilter>();
+```
+
+Once the hook is registered with DI, it must be added to the appropriate [hook collection](~/articles/hooks/custom_hooks.md).
+
+**Generic Form:** `_planBuilder.[hook type collection].Add<[object name], [hook type]>();`
+
+**Example:**
+```
+_planBuilder.Filters.Add<UnlicensedUsersFilter, IUser>();
+```
diff --git a/src/Documentation/samples/mappings/change_projects.md b/src/Documentation/samples/mappings/change_projects.md
new file mode 100644
index 0000000..de61d74
--- /dev/null
+++ b/src/Documentation/samples/mappings/change_projects.md
@@ -0,0 +1,39 @@
+# Sample: Change Projects
+
+In this example, source data sources and workbooks in a project named `Test` are migrated to the destination's `Production` project.
+
+Both the C# and Python mapping classes inherit from a base class that handles most of the work, and then create an `IWorkbook` and `IDataSource` version.
+
+# [Python](#tab/Python)
+
+#### Mapping Class
+
+[!code-python[](../../../../examples/Python.ExampleApplication/hooks/mappings/change_project_mapping.py)]
+
+#### Registration
+
+[Learn more.](~/samples/intro.md?tabs=Python#hook-registration)
+
+[//]: <> (Adding this as code as regions are not supported in Python snippets)
+```Python
+plan_builder.mappings.add(ChangeProjectMappingForWorkbooks)
+plan_builder.mappings.add(ChangeProjectMappingForDataSources)
+```
+
+# [C#](#tab/CSharp)
+
+#### Mapping Class
+
+[!code-csharp[](../../../../examples/Csharp.ExampleApplication/Hooks/Mappings/ChangeProjectMapping.cs#class)]
+
+#### Registration
+
+[Learn more.](~/samples/intro.md?tabs=CSharp#hook-registration)
+
+[!code-csharp[](../../../../examples/Csharp.ExampleApplication/MyMigrationApplication.cs#ChangeProjectMapping-Registration)]
+
+#### Dependency Injection
+
+[Learn more.](~/articles/dependency_injection.md)
+
+[!code-csharp[](../../../../examples/Csharp.ExampleApplication/Program.cs#ChangeProjectMapping-DI)]
diff --git a/src/Documentation/samples/hooks/mappings/intro.md b/src/Documentation/samples/mappings/intro.md
similarity index 57%
rename from src/Documentation/samples/hooks/mappings/intro.md
rename to src/Documentation/samples/mappings/intro.md
index 8ae9492..4a1d869 100644
--- a/src/Documentation/samples/hooks/mappings/intro.md
+++ b/src/Documentation/samples/mappings/intro.md
@@ -7,6 +7,6 @@ Mappings allow you to change the locations of content items before they are migr
 
 The following samples cover some common scenarios:
 
-- [Sample: Username email](~/samples/hooks/mappings/username_email_mapping.md)
-- [Sample: Rename projects](~/samples/hooks/mappings/rename_projects.md)
-- [Sample: Change projects](~/samples/hooks/mappings/change_projects.md)
+- [Sample: Username email](~/samples/mappings/username_email_mapping.md)
+- [Sample: Rename projects](~/samples/mappings/rename_projects.md)
+- [Sample: Change projects](~/samples/mappings/change_projects.md)
diff --git a/src/Documentation/samples/mappings/rename_projects.md b/src/Documentation/samples/mappings/rename_projects.md
new file mode 100644
index 0000000..666c335
--- /dev/null
+++ b/src/Documentation/samples/mappings/rename_projects.md
@@ -0,0 +1,36 @@
+# Sample: Rename Projects
+
+In this example, the source project named `Test` is renamed to `Production` on the destination.
+
+# [Python](#tab/Python)
+
+#### Mapping Class
+
+[!code-python[](../../../../examples/Python.ExampleApplication/hooks/mappings/project_rename_mapping.py)]
+
+#### Registration
+
+[Learn more.](~/samples/intro.md?tabs=Python#hook-registration)
+
+[//]: <> (Adding this as code as regions are not supported in Python snippets)
+```Python
+plan_builder.mappings.add(EmailDomainMapping)
+```
+
+# [C#](#tab/CSharp)
+
+#### Mapping Class
+
+[!code-csharp[](../../../../examples/Csharp.ExampleApplication/Hooks/Mappings/ProjectRenameMapping.cs#class)]
+
+#### Registration
+
+[Learn more.](~/samples/intro.md?tabs=CSharp#hook-registration)
+
+[!code-csharp[](../../../../examples/Csharp.ExampleApplication/MyMigrationApplication.cs#ProjectRenameMapping-Registration)]
+
+#### Dependency Injection
+
+[Learn more.](~/articles/dependency_injection.md)
+
+[!code-csharp[](../../../../examples/Csharp.ExampleApplication/Program.cs#ProjectRenameMapping-DI)]
diff --git a/src/Documentation/samples/hooks/mappings/toc.yml b/src/Documentation/samples/mappings/toc.yml
similarity index 67%
rename from src/Documentation/samples/hooks/mappings/toc.yml
rename to src/Documentation/samples/mappings/toc.yml
index cf20e94..5874330 100644
--- a/src/Documentation/samples/hooks/mappings/toc.yml
+++ b/src/Documentation/samples/mappings/toc.yml
@@ -1,5 +1,3 @@
-- name: Introduction
-  href: intro.md
 - name: Username email
   href: username_email_mapping.md
 - name: Rename projects
diff --git a/src/Documentation/samples/mappings/username_email_mapping.md b/src/Documentation/samples/mappings/username_email_mapping.md
new file mode 100644
index 0000000..7801148
--- /dev/null
+++ b/src/Documentation/samples/mappings/username_email_mapping.md
@@ -0,0 +1,60 @@
+# Sample EmailDomainMapping
+
+This example is for a hypothetical scenario where the Tableau Server usernames are the same as the user part of the email. It uses a configuration class to supply the email domain.
+
+# [Python](#tab/Python)
+
+#### Mapping Class
+
+[!code-python[](../../../../examples/Python.ExampleApplication/hooks/mappings/email_domain_mapping.py)]
+
+#### Registration
+
+[Learn more.](~/samples/intro.md?tabs=Python#hook-registration)
+
+See the line with `with_tableau_cloud_usernames`.
+
+[//]: <> (Adding this as code as regions are not supported in Python snippets)
+```Python
+plan_builder = plan_builder \
+                .from_source_tableau_server(
+                    server_url=config['SOURCE']['URL'], 
+                    site_content_url=config['SOURCE']['SITE_CONTENT_URL'], 
+                    access_token_name=config['SOURCE']['ACCESS_TOKEN_NAME'], 
+                    access_token=os.environ.get('TABLEAU_MIGRATION_SOURCE_TOKEN', config['SOURCE']['ACCESS_TOKEN'])) \
+                .to_destination_tableau_cloud(
+                    pod_url=config['DESTINATION']['URL'], 
+                    site_content_url=config['DESTINATION']['SITE_CONTENT_URL'], 
+                    access_token_name=config['DESTINATION']['ACCESS_TOKEN_NAME'], 
+                    access_token=os.environ.get('TABLEAU_MIGRATION_DESTINATION_TOKEN', config['DESTINATION']['ACCESS_TOKEN'])) \
+                .for_server_to_cloud() \
+                .with_tableau_id_authentication_type() \
+                # You can add authentication type mappings here      
+                .with_tableau_cloud_usernames(EmailDomainMapping)
+```
+
+# [C#](#tab/CSharp)
+
+This uses a configuration class to supply the email domain.
+
+#### Mapping Class
+
+[!code-csharp[CS](../../../../examples/Csharp.ExampleApplication/Hooks/Mappings/EmailDomainMapping.cs#namespace)]
+
+#### Configuration Class
+
+[!code-csharp[CS](../../../../examples/Csharp.ExampleApplication/Hooks/Mappings/EmailDomainMappingOptions.cs)]
+
+#### Registration
+
+[Learn more.](~/samples/intro.md?tabs=CSharp#hook-registration)
+
+See the line with `WithTableauCloudUsernames`.
+
+[!code-csharp[CS](../../../../examples/Csharp.ExampleApplication/MyMigrationApplication.cs#EmailDomainMapping-Registration)]
+
+#### Dependency Injection
+
+[Learn more.](~/articles/dependency_injection.md)
+
+[!code-csharp[CS](../../../../examples/Csharp.ExampleApplication/Program.cs#EmailDomainMapping-DI)]
diff --git a/src/Documentation/samples/hooks/migration-action-completed/intro.md b/src/Documentation/samples/migration-action-completed/intro.md
similarity index 62%
rename from src/Documentation/samples/hooks/migration-action-completed/intro.md
rename to src/Documentation/samples/migration-action-completed/intro.md
index dd693e5..0934c33 100644
--- a/src/Documentation/samples/hooks/migration-action-completed/intro.md
+++ b/src/Documentation/samples/migration-action-completed/intro.md
@@ -4,4 +4,4 @@ Migration Action Completed Hooks allow custom logic to run when a migration acti
 
 The following samples cover some common scenarios:
 
-- [Sample: Migration action logging](~/samples/hooks/migration-action-completed/log_migration_actions.md)
+- [Sample: Migration action logging](~/samples/migration-action-completed/log_migration_actions.md)
diff --git a/src/Documentation/samples/migration-action-completed/log_migration_actions.md b/src/Documentation/samples/migration-action-completed/log_migration_actions.md
new file mode 100644
index 0000000..475f9ba
--- /dev/null
+++ b/src/Documentation/samples/migration-action-completed/log_migration_actions.md
@@ -0,0 +1,41 @@
+# Sample: Migration Action Logging
+
+This sample illustrates how to implement migration action logging, capturing the statuses of migration actions upon completion.
+
+# [Python](#tab/Python)
+
+### Migration Action Completed Hook Class
+
+To log migration action statuses in Python, you can utilize the following hook class:
+
+[!code-python[](../../../../examples/Python.ExampleApplication/hooks/migration_action_completed/log_migration_actions_hook.py)]
+
+### Registration
+
+For guidance on registering the hook, refer to the [documentation](~/samples/intro.md?tabs=Python#hook-registration).
+
+[//]: <> (Adding this as code as regions are not supported in python snippets)
+```Python
+plan_builder.hooks.add(LogMigrationActionsHookForUsers)
+plan_builder.hooks.add(LogMigrationActionsHookForGroups)
+```
+
+# [C#](#tab/CSharp)
+
+### Migration Action Completed Hook Class
+
+In C#, you can implement the migration action completed hook as demonstrated below:
+
+[!code-csharp[](../../../../examples/Csharp.ExampleApplication/Hooks/MigrationActionCompleted/LogMigrationActionsHook.cs#class)]
+
+### Registration
+
+To register the hook in C#, follow the instructions provided in the [documentation](~/samples/intro.md?tabs=CSharp#hook-registration).
+
+[!code-csharp[](../../../../examples/Csharp.ExampleApplication/MyMigrationApplication.cs#LogMigrationActionsHook-Registration)]
+
+### Dependency Injection
+
+Learn more about dependency injection [here](~/articles/dependency_injection.md).
+
+[!code-csharp[](../../../../examples/Csharp.ExampleApplication/Program.cs#LogMigrationActionsHook-DI)]
diff --git a/src/Documentation/samples/migration-action-completed/toc.yml b/src/Documentation/samples/migration-action-completed/toc.yml
new file mode 100644
index 0000000..45e6c51
--- /dev/null
+++ b/src/Documentation/samples/migration-action-completed/toc.yml
@@ -0,0 +1,2 @@
+- name: Migration action logging
+  href: log_migration_actions.md
\ No newline at end of file
diff --git a/src/Documentation/samples/hooks/post-publish/intro.md b/src/Documentation/samples/post-publish/intro.md
similarity index 67%
rename from src/Documentation/samples/hooks/post-publish/intro.md
rename to src/Documentation/samples/post-publish/intro.md
index 8806451..7da70bc 100644
--- a/src/Documentation/samples/hooks/post-publish/intro.md
+++ b/src/Documentation/samples/post-publish/intro.md
@@ -4,4 +4,4 @@ Post-publish hooks allow you to update content items after they are migrated to
 
 The following samples cover some common scenarios:
 
-- [Sample: Update permissions](~/samples/hooks/post-publish/update_permissions.md)
+- [Sample: Update permissions](~/samples/post-publish/update_permissions.md)
diff --git a/src/Documentation/samples/hooks/post-publish/toc.yml b/src/Documentation/samples/post-publish/toc.yml
similarity index 60%
rename from src/Documentation/samples/hooks/post-publish/toc.yml
rename to src/Documentation/samples/post-publish/toc.yml
index a5eb1aa..04efc42 100644
--- a/src/Documentation/samples/hooks/post-publish/toc.yml
+++ b/src/Documentation/samples/post-publish/toc.yml
@@ -1,4 +1,2 @@
-- name: Introduction
-  href: intro.md
 - name: Update permissions
   href: update_permissions.md
diff --git a/src/Documentation/samples/post-publish/update_permissions.md b/src/Documentation/samples/post-publish/update_permissions.md
new file mode 100644
index 0000000..aa63089
--- /dev/null
+++ b/src/Documentation/samples/post-publish/update_permissions.md
@@ -0,0 +1,17 @@
+# Sample: Update permissions
+
+In the following example, write permissions for content with a `Production` tag will be set to `Deny`.
+
+## [Post-Publish Hook Class](#tab/class)
+
+[!code-csharp[](../../../../examples/Csharp.ExampleApplication/Hooks/PostPublish/UpdatePermissionsHook.cs#class)]
+
+## [Registration](#tab/registration)
+
+[!code-csharp[](../../../../examples/Csharp.ExampleApplication/MyMigrationApplication.cs#UpdatePermissionsHook-Registration)]
+
+## [Dependency Injection](#tab/di)
+
+[!code-csharp[](../../../../examples/Csharp.ExampleApplication/Program.cs#UpdatePermissionsHook-DI)]
+
+---
diff --git a/src/Documentation/samples/python_hooks.md b/src/Documentation/samples/python_hooks.md
deleted file mode 100644
index 9ab6498..0000000
--- a/src/Documentation/samples/python_hooks.md
+++ /dev/null
@@ -1,216 +0,0 @@
-# Hooks Implemented in Python
-
-Because the Migration SDK is primarily written in C#, it uses [Python.NET](https://pythonnet.github.io/) to enable the implementation of [hooks](~/samples/python_hooks.md) in Python. The Python hooks interoperate with the C# binaries to achieve the same results as writing hooks in C#.
-
-The SDK's C# hook classes and interfaces are [asynchronous](https://learn.microsoft.com/en-us/dotnet/csharp/asynchronous-programming/). Due to the limitations of [Python.NET](https://pythonnet.github.io/), the SDK provides synchronous wrappers to these interfaces. The names of these wrappers start with the keyword `ISync`. You will find references to those in the following examples.
-
-Various C# interfaces and classes are used in hooks. You will need to import them just like you do Python classes. You can search for them in the [API Reference](~/api/index.md) section of the documentation.
-
-Example:
-
-Here is one of the import statements you will need for filters
-
-```python
-from Tableau.Migration.Interop.Hooks.Filters import ISyncContentFilter
-```
-
-The namespace for `ISyncContentFilter` is `Tableau.Migration.Interop.Hooks.Filters`.
-
-## Object Registration
-
-Python.NET allows Python objects to be registered as hooks, with some limitations. Python objects must declare a C# namespace field and must inherit from a class or an interface. The Python hook builders’ “add” method simply passes the Python object as normal.
-
-Examples of Python object implementation:
-
-```python
-
-from Tableau.Migration.Interop.Hooks import ISyncMigrationHook
-from Tableau.Migration.Engine.Hooks import IMigrationActionCompletedHook
-from Tableau.Migration.Engine.Actions import IMigrationActionResult
-from Tableau.Migration.Interop.Hooks.Filters import ISyncContentFilter
-from Tableau.Migration.Interop.Hooks.Mappings import ISyncContentMapping
-from Tableau.Migration.Interop.Hooks.Transformers import ISyncContentTransformer
-from Tableau.Migration.Content import(
-    IGroup,
-    IUser,
-    IProject)
-from Tableau.Migration.Engine import ContentMigrationItem
-
-class PyLogActionHook(ISyncMigrationHook[IMigrationActionResult], IMigrationActionCompletedHook):
-    __namespace__ = "MyNamespace"
-    
-    def Execute(self, ctx):
-        print("ACTION COMPLETED")
-        return ctx
-
-class PyTestGroupFilter(ISyncContentFilter[IGroup]):
-    __namespace__ = "MyNamespace"
-    
-    def Execute(self, ctx):
-        filtered = List[ContentMigrationItem[IGroup]]()
-        for item in ctx:
-            if "Test" not in item.SourceItem.Name:
-                filtered.add(item)
-        return filtered
-
-class PyTestUsernameMapping(ISyncContentMapping[IUser]):
-    __namespace__ = "MyNamespace"
-
-    def Execute(self, ctx):
-        domain = ctx.MappedLocation.Parent()
-        return ctx.MapTo(domain.Append(ctx.ContentItem.Name + "@salesforce.com"))
-
-class PyTestProjectTransformer(ISyncContentTransformer[IProject]):
-    __namespace__ = "MyNamespace"
-    
-    def Execute(self, ctx):
-        ctx.Description = "[From Server]\n" + ctx.Description
-        return ctx
-
-```
-
-An example of Python plan builder hook binding for the above examples of object implementation:
-
-```python
-log_hook = PyLogActionHook()
-filter_hook = PyTestGroupFilter()
-mapping_hook = PyTestUsernameMapping()
-transformer_hook = PyTestProjectTransformer()
-planBuilder = PyMigrationPlanBuilder()
-# For hooks
-planBuilder._hooks.add(log_hook)
-# For filters
-planBuilder._filters.add(IGroup, filter_hook)
-# For mappings
-planBuilder._mappings.add(IUser, mapping_hook)
-# For transformers
-planBuilder._transformers.add(IProject, transformer_hook)
-```
-
-## Callback Registration
-
-Due to Python.NET’s ability to cast Python functions to the C# Func type, Python callbacks can be used as hooks directly. A light “syntax sugar” layer is exposed for all hook types for Python caller convenience:
-
-* The “add” method exposed by hook builder Python wrapper classes inspects if a Python function is passed as an argument. If so it casts the function to the proper Func C# type and invokes the C# hook builder “Add” method.
-* Python callbacks are expected to take a single context object and may return a context object or None (Null). The Python function is expected to be synchronous.
-
-Examples of Python Callback implementation:
-
-```python
-from Tableau.Migration.Content import IGroup
-from Tableau.Migration.Engine import ContentMigrationItem
-from System.Collections.Generic import List
-
-def log_callback(ctx):
-    print("ACTION COMPLETED")
-    return ctx
-
-def filter_group(ctx):
-    filtered = List[ContentMigrationItem[IGroup]]()
-    for item in ctx:
-        if "Test" not in item.SourceItem.Name:
-            filtered.add(item)
-    return filtered
-
-def map_test_user(ctx):
-    domain = ctx.MappedLocation.Parent()
-    return ctx.MapTo(domain.Append(ctx.ContentItem.Name + "@salesforce.com"))
-
-def add_project_origin_desc(ctx):
-    ctx.Description = "[From Server]\n" + ctx.Description
-    return ctx
-```
-
-An example of Python plan builder hook binding for the above examples of callback implementation:
-
-```python
-planBuilder = PyMigrationPlanBuilder()
-# For hooks
-planBuilder._hooks.add(ISyncMigrationActionCompletedHook, IMigrationActionResult, Func[IMigrationActionResult, IMigrationActionResult](log_callback))
-# For filters
-planBuilder._filters.add(IGroup, Func[IEnumerable[ContentMigrationItem[IGroup]], IEnumerable[ContentMigrationItem[IGroup]]](filter_group))
-# For mappings
-planBuilder._mappings.add(IUser, Func[ContentMappingContext[IUser], ContentMappingContext[IUser]](map_test_user))
-# For transformers
-planBuilder._transformers.add(IProject, Func[IProject, IProject](add_project_origin_desc))
-```
-
-## Factory Registration
-
-Python.NET does not provide out-of-the-box interoperability for Microsoft dependency injection, so a [DI](https://learn.microsoft.com/en-us/dotnet/core/extensions/dependency-injection)-type factory cannot work with Python types. Because Python constructors are functions, a Python hook builder can register a non-[DI](https://learn.microsoft.com/en-us/dotnet/core/extensions/dependency-injection) factory. This allows Python implementations to access the [scoped](https://learn.microsoft.com/en-us/dotnet/core/extensions/dependency-injection#scoped) [DI](https://learn.microsoft.com/en-us/dotnet/core/extensions/dependency-injection) service provider for manual dependency injection.
-
-For a Factory Registration, we can keep the same examples from Python object implementation:
-
-```python
-from Tableau.Migration.Interop.Hooks import ISyncMigrationHook
-from Tableau.Migration.Engine.Actions import IMigrationActionResult
-from Tableau.Migration.Engine.Hooks import IMigrationActionCompletedHook
-from Tableau.Migration.Interop.Hooks.Filters import ISyncContentFilter
-from Tableau.Migration.Interop.Hooks.Mappings import ISyncContentMapping
-from Tableau.Migration.Interop.Hooks.Transformers import ISyncContentTransformer
-from Tableau.Migration.Content import (
-    IGroup,
-    IUser,
-    IProject)
-from Tableau.Migration.Engine import ContentMigrationItem
-from System.Collections.Generic import List
-
-class PyLogActionHook(ISyncMigrationHook[IMigrationActionResult], IMigrationActionCompletedHook):
-    __namespace__ = "MyNamespace"
-    
-    def Execute(self, ctx):
-        print("ACTION COMPLETED")
-        return ctx
-
-class PyTestGroupFilter(ISyncContentFilter[IGroup]):
-    __namespace__ = "MyNamespace"
-    
-    def Execute(self, ctx):
-        filtered = List[ContentMigrationItem[IGroup]]()
-        for item in ctx:
-            if "Test" not in item.SourceItem.Name:
-                filtered.add(item)
-        return filtered
-
-class PyTestUsernameMapping(ISyncContentMapping[IUser]):
-    __namespace__ = "MyNamespace"
-
-    def Execute(self, ctx):
-        domain = ctx.MappedLocation.Parent()
-        return ctx.MapTo(domain.Append(ctx.ContentItem.Name + "@salesforce.com"))
-
-class PyTestProjectTransformer(ISyncContentTransformer[IProject]):
-    __namespace__ = "MyNamespace"
-    
-    def Execute(self, ctx):
-        ctx.Description = "[From Server]\n" + ctx.Description
-        return ctx
-```
-
-An example of Python plan builder hook binding for the above examples of object implementation:
-
-```python
-from System import Func, IServiceProvider
-from Microsoft.Extensions.DependencyInjection import ServiceCollectionServiceExtensions
-
-# For registering the service, you can use any of these options:
-# - AddSingleton: The container will create a single instance of this class during all the application execution.
-# - AddScoped: The container will create a new instance of this class for each Scope of the running application. Inside each scope, the instance will be like a Singleton.
-# - AddTransient: The container will create a new instance of this class every time the application tries to use a given class.
-ServiceCollectionServiceExtensions.AddSingleton[PyLogActionHook](tableau_migration._service_collection)
-ServiceCollectionServiceExtensions.AddSingleton[PyTestGroupFilter](tableau_migration._service_collection)
-# This case uses a lambda function to resolve a new instance of this class. This pattern could be used to resolve specific services from the DI container.
-ServiceCollectionServiceExtensions.AddSingleton[PyTestUsernameMapping](tableau_migration._service_collection,Func[IServiceProvider, TestUserMapping](lambda service_provider: TestUserMapping()))
-ServiceCollectionServiceExtensions.AddSingleton[PyTestProjectTransformer](tableau_migration._service_collection)
-
-planBuilder = PyMigrationPlanBuilder()
-# For hooks
-planBuilder._hooks.add(PyLogActionHook)
-# For filters
-planBuilder._filters.add(PyTestGroupFilter, IGroup)
-# For mappings
-planBuilder._mappings.add(PyTestUsernameMapping, IUser)
-# For transformers
-planBuilder._transformers.add(PyTestProjectTransformer, IProject)
-
-```
diff --git a/src/Documentation/samples/toc.yml b/src/Documentation/samples/toc.yml
index 45b8313..16a0b3d 100644
--- a/src/Documentation/samples/toc.yml
+++ b/src/Documentation/samples/toc.yml
@@ -1,6 +1,23 @@
 - name: Introduction
   href: intro.md
-- name: Hooks
-  href: hooks/toc.yml
-- name: Hooks in Python
-  href: python_hooks.md
+- name: Filters
+  href: filters/toc.yml
+  homepage: filters/intro.md
+- name: Mappings
+  href: mappings/toc.yml
+  homepage: mappings/intro.md
+- name: Transformers
+  href: transformers/toc.yml
+  homepage: transformers/intro.md
+- name: Post-Publish Hooks
+  href: post-publish/toc.yml
+  homepage: post-publish/intro.md
+- name: Bulk Post-Publish Hooks
+  href: bulk-post-publish/toc.yml
+  homepage: bulk-post-publish/intro.md
+- name: Batch Migration Completed Hooks
+  href: batch-migration-completed/toc.yml
+  homepage: batch-migration-completed/intro.md
+- name: Migration Action Completed Hooks
+  href: migration-action-completed/toc.yml
+  homepage: migration-action-completed/intro.md
diff --git a/src/Documentation/samples/transformers/encrypt_extracts_transformer.md b/src/Documentation/samples/transformers/encrypt_extracts_transformer.md
new file mode 100644
index 0000000..4e35d80
--- /dev/null
+++ b/src/Documentation/samples/transformers/encrypt_extracts_transformer.md
@@ -0,0 +1,43 @@
+# Sample: Encrypt Extracts
+
+This sample demonstrates how to encrypt workbook and data source extracts, irrespective of their original state.
+
+Both the Python and C# transformer classes inherit from a base class responsible for the core functionality, then generate versions for `IPublishableWorkbook` and `IPublishableDataSource`.
+
+## [Python](#tab/Python)
+
+### Transformer Class
+
+To encrypt extracts in Python, you can use the following transformer class:
+
+[!code-python[](../../../../examples/Python.ExampleApplication/hooks/transformers/encrypt_extracts_transformer.py)]
+
+### Registration
+
+Refer to the [documentation](~/samples/intro.md?tabs=Python#hook-registration) for instructions on registering the transformer.
+
+[//]: <> (Adding this as code as regions are not supported in python snippets)
+```Python
+plan_builder.transformers.add(EncryptExtractTransformerForDataSources)
+plan_builder.transformers.add(EncryptExtractTransformerForWorkbooks)
+```
+
+## [C#](#tab/CSharp)
+
+### Transformer Class
+
+In C#, the transformer class for encrypting extracts is implemented as follows:
+
+[!code-csharp[](../../../../examples/Csharp.ExampleApplication/Hooks/Transformers/EncryptExtractTransformer.cs#class)]
+
+### Registration
+
+To register the transformer in C#, follow the guidance provided in the [documentation](~/samples/intro.md?tabs=CSharp#hook-registration).
+
+[!code-csharp[](../../../../examples/Csharp.ExampleApplication/MyMigrationApplication.cs#EncryptExtractTransformer-Registration)]
+
+### Dependency Injection
+
+Learn more about dependency injection [here](~/articles/dependency_injection.md).
+
+[!code-csharp[](../../../../examples/Csharp.ExampleApplication/Program.cs#EncryptExtractTransformer-DI)]
diff --git a/src/Documentation/samples/transformers/intro.md b/src/Documentation/samples/transformers/intro.md
new file mode 100644
index 0000000..3712c7e
--- /dev/null
+++ b/src/Documentation/samples/transformers/intro.md
@@ -0,0 +1,8 @@
+# Transformers
+
+Transformers allow you to update content items before they are migrated to the destination.
+
+The following samples cover some common scenarios:
+
+- [Sample: Add tags to content](~/samples/transformers/migrated_tag_transformer.md)
+- [Sample: Encrypt Extracts](~/samples/transformers/encrypt_extracts_transformer.md)
\ No newline at end of file
diff --git a/src/Documentation/samples/transformers/migrated_tag_transformer.md b/src/Documentation/samples/transformers/migrated_tag_transformer.md
new file mode 100644
index 0000000..54af8cf
--- /dev/null
+++ b/src/Documentation/samples/transformers/migrated_tag_transformer.md
@@ -0,0 +1,44 @@
+# Sample: Adding Tags to Content
+
+This sample illustrates how to add a `Migrated` tag to both data sources and workbooks.
+
+Both the Python and C# transformer classes inherit from a base class that handles the core functionality, then create versions for `IPublishableWorkbook` and `IPublishableDataSource`.
+
+## [Python](#tab/Python)
+
+### Transformer Class
+
+To implement the tag addition in Python, you can utilize the following transformer class:
+
+[!code-python[](../../../../examples/Python.ExampleApplication/hooks/transformers/migrated_tag_transformer.py)]
+
+### Registration
+
+For detailed instructions on registering the transformer, refer to the [documentation](~/samples/intro.md?tabs=Python#hook-registration).
+
+[//]: <> (Adding this as code as regions are not supported in python snippets)
+```Python
+plan_builder.transformers.add(MigratedTagTransformerForDataSources)
+plan_builder.transformers.add(MigratedTagTransformerForWorkbooks)
+```
+
+## [C#](#tab/CSharp)
+
+### Transformer Class
+
+In C#, the transformer class for adding tags is implemented as shown below:
+
+[!code-csharp[](../../../../examples/Csharp.ExampleApplication/Hooks/Transformers/MigratedTagTransformer.cs#class)]
+
+### Registration
+
+To register the transformer in C#, follow the guidance provided in the [documentation](~/samples/intro.md?tabs=CSharp#hook-registration).
+
+[!code-csharp[](../../../../examples/Csharp.ExampleApplication/MyMigrationApplication.cs#MigratedTagTransformer-Registration)]
+
+### Dependency Injection
+
+Learn more about dependency injection [here](~/articles/dependency_injection.md).
+
+[!code-csharp[](../../../../examples/Csharp.ExampleApplication/Program.cs#MigratedTagTransformer-DI)]
+
diff --git a/src/Documentation/samples/transformers/toc.yml b/src/Documentation/samples/transformers/toc.yml
new file mode 100644
index 0000000..2011f4a
--- /dev/null
+++ b/src/Documentation/samples/transformers/toc.yml
@@ -0,0 +1,4 @@
+- name: Add tags to content
+  href: migrated_tag_transformer.md
+- name: Encrypt Extracts
+  href: encrypt_extracts_transformer.md
diff --git a/src/Documentation/templates/tableau/styles/main.css b/src/Documentation/templates/tableau/styles/main.css
index aeb2f1b..6de48a3 100644
--- a/src/Documentation/templates/tableau/styles/main.css
+++ b/src/Documentation/templates/tableau/styles/main.css
@@ -168,4 +168,14 @@ body .toc {
 pre {
   border-radius: 10px;
   box-shadow: 0px 2px 2px 0px #c7c7c766;
-}
\ No newline at end of file
+}
+
+
+.tabGroup a[role="tab"]:hover,
+.tabGroup a[role="tab"]:focus,
+.tabGroup a[role="tab"][aria-selected="true"] {
+    font-weight: bold;
+    /* Make the selected tab heading bold # Brings the tab color scheme in line with the rest of the site */
+    border-bottom: 2px solid #337ab7;
+    color: #337ab7;
+}
diff --git a/src/Documentation/toc.yml b/src/Documentation/toc.yml
index 136cb8b..29ce220 100644
--- a/src/Documentation/toc.yml
+++ b/src/Documentation/toc.yml
@@ -1,9 +1,9 @@
-- name: API Reference
-  href: api/
-  homepage: api/index.md
-- name: Python Wrapper
-  href: python_wrapper/
-  homepage: python_wrapper/index.md
+- name: Python API Reference
+  href: api-python/
+  homepage: api-python/index.md
+- name: C# API Reference
+  href: api-csharp/
+  homepage: api-csharp/index.md
 - name: Code Samples
   href: samples/
   homepage: samples/intro.md
diff --git a/src/Python/CONTRIBUTING.md b/src/Python/CONTRIBUTING.md
index 9f196ee..ea48d90 100644
--- a/src/Python/CONTRIBUTING.md
+++ b/src/Python/CONTRIBUTING.md
@@ -75,10 +75,6 @@ Visual Studio test runner should see the Python tests and be able to run them.
 
 Python tests also run in the CI/CD pipeline on all supported OS types.
 
-### Liftime tests
-The lifetime tests are unstable. If they crash or create too many issues, create a `SKIP_PYTHON_LIFETIME_TESTS` variable
-then the lifetime tests will be skipped.
-
 ### To run tests manually
 
 * **Without hatch**:
diff --git a/src/Python/LICENSE b/src/Python/LICENSE
index 30404ce..ae7332a 100644
--- a/src/Python/LICENSE
+++ b/src/Python/LICENSE
@@ -1 +1,207 @@
-TODO
\ No newline at end of file
+Apache License Version 2.0
+
+Copyright (c) 2024 Salesforce, Inc.
+All rights reserved.
+
+Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
diff --git a/src/Python/Python.pyproj b/src/Python/Python.pyproj
index 8ef09f6..8ebcb3d 100644
--- a/src/Python/Python.pyproj
+++ b/src/Python/Python.pyproj
@@ -30,26 +30,45 @@
     <Compile Include="scripts\build_tests.py" />
     <Compile Include="scripts\import_modules.py" />
     <Compile Include="src\tableau_migration\migration.py" />
+    <Compile Include="src\tableau_migration\migration_api_rest_models.py" />
+    <Compile Include="src\tableau_migration\migration_api_rest_models_types.py" />
+    <Compile Include="src\tableau_migration\migration_content.py" />
+    <Compile Include="src\tableau_migration\migration_content_permissions.py" />
+    <Compile Include="src\tableau_migration\migration_engine_actions.py" />
+    <Compile Include="src\tableau_migration\migration_engine_endpoints_search.py" />
     <Compile Include="src\tableau_migration\migration_engine_hooks.py" />
     <Compile Include="src\tableau_migration\migration_engine_hooks_filters.py" />
+    <Compile Include="src\tableau_migration\migration_engine_hooks_filters_interop.py" />
+    <Compile Include="src\tableau_migration\migration_engine_hooks_interop.py" />
     <Compile Include="src\tableau_migration\migration_engine_hooks_mappings.py" />
+    <Compile Include="src\tableau_migration\migration_engine_hooks_mappings_interop.py" />
+    <Compile Include="src\tableau_migration\migration_engine_hooks_postpublish.py" />
+    <Compile Include="src\tableau_migration\migration_engine_hooks_postpublish_interop.py" />
     <Compile Include="src\tableau_migration\migration_engine_hooks_transformers.py" />
+    <Compile Include="src\tableau_migration\migration_engine_hooks_transformers_interop.py" />
+    <Compile Include="src\tableau_migration\migration_engine_manifest.py" />
     <Compile Include="src\tableau_migration\migration_engine_migrators.py" />
+    <Compile Include="src\tableau_migration\migration_engine_migrators_batch.py" />
     <Compile Include="src\tableau_migration\migration_engine_options.py" />
+    <Compile Include="src\tableau_migration\migration_enum.py" />
     <Compile Include="src\tableau_migration\migration_logger.py" />
     <Compile Include="src\tableau_migration\migration_engine.py" />
+    <Compile Include="src\tableau_migration\migration_services.py" />
     <Compile Include="src\tableau_migration\__init__.py" />
-    <Compile Include="tests\conftest.py" />
-    <Compile Include="tests\test_migrations_engine_hooks_filters_lifetime.py" />
-    <Compile Include="tests\test_migrations_engine_hooks_lifetime.py" />
-    <Compile Include="tests\test_migrations_engine_hooks_mappings_lifetime.py" />
-    <Compile Include="tests\test_migrations_engine_hooks_transformers.py" />
-    <Compile Include="tests\test_migrations_engine_hooks_mappings.py" />
-    <Compile Include="tests\test_migrations_engine_hooks_filters.py" />
-    <Compile Include="tests\test_migrations_engine_hooks.py" />
-    <Compile Include="tests\test_migrations_engine_hooks_transformers_lifetime.py" />
-    <Compile Include="tests\test_migrations_engine_options.py" />
+    <Compile Include="tests\helpers\autofixture.py" />
+    <Compile Include="tests\test_migration_content_permissions.py" />
+    <Compile Include="tests\test_migration_engine_hooks.py" />
+    <Compile Include="tests\test_migration_engine_hooks_filters.py" />
+    <Compile Include="tests\test_migration_engine_hooks_mappings.py" />
+    <Compile Include="tests\test_migration_engine_hooks_postpublish.py" />
+    <Compile Include="tests\test_migration_engine_hooks_transformers.py" />
+    <Compile Include="tests\test_migration_engine_options.py" />
+    <Compile Include="tests\test_migration_services.py" />
+    <Compile Include="tests\test_migration_api_rest_models.py" />
+    <Compile Include="tests\test_migration_content.py" />
     <Compile Include="tests\test_migration_engine.py" />
+    <Compile Include="tests\test_migration_engine_endpoints_search.py" />
+    <Compile Include="tests\test_migration_engine_migrators_batch.py" />
     <Compile Include="tests\test_other.py" />
     <Compile Include="tests\__init__.py" />
     <Compile Include="tests\test_classes.py" />
@@ -78,6 +97,7 @@
     <Folder Include="src\" />
     <Folder Include="src\tableau_migration\" />
     <Folder Include="Documentation\" />
+    <Folder Include="tests\helpers\" />
   </ItemGroup>
   <ItemGroup>
     <Interpreter Include="env\">
diff --git a/src/Python/pyproject.toml b/src/Python/pyproject.toml
index f180181..9b03479 100644
--- a/src/Python/pyproject.toml
+++ b/src/Python/pyproject.toml
@@ -17,6 +17,7 @@ classifiers = [
     "Programming Language :: Python :: 3",
     "Operating System :: OS Independent",
 ]
+license = "Apache-2.0"
 
 dependencies = [
     "typing_extensions==4.9.0",
@@ -60,9 +61,7 @@ dependencies = [
 ]
 
 [tool.hatch.envs.test.scripts]
-# Deselecting lifetime tests
-# W-14457586-Flaky Test - Python Hook Lifetime Test Fails on MacOS Only
-test = "pytest --deselect=tests/test_migrations_engine_hooks_lifetime.py --deselect=tests/test_migrations_engine_hooks_filters_lifetime.py --deselect=tests/test_migrations_engine_hooks_mappings_lifetime.py --deselect=tests/test_migrations_engine_hooks_transformers_lifetime.py"
+test = "pytest -vv"
 testcov = "test --cov-config=pyproject.toml --cov=tableau_migration"
 
 [[tool.hatch.envs.test.matrix]]
diff --git a/src/Python/requirements.txt b/src/Python/requirements.txt
index 395ddfe..58d776a 100644
--- a/src/Python/requirements.txt
+++ b/src/Python/requirements.txt
@@ -1,5 +1,4 @@
 cffi==1.16.0
-clr-loader==0.2.6
 pycparser==2.21
 pythonnet==3.0.3
 typing_extensions==4.9.0
diff --git a/src/Python/scripts/build_binaries.py b/src/Python/scripts/build_binaries.py
index 0609bbc..607dd38 100644
--- a/src/Python/scripts/build_binaries.py
+++ b/src/Python/scripts/build_binaries.py
@@ -4,14 +4,19 @@
 import shutil
 import sys
 
-# Build the solution so we have the published binaries
+# Build the solution so we have the published binaries.
 from os.path import abspath
 from pathlib import Path
 migration_project = abspath("../../Tableau.Migration/Tableau.Migration.csproj")
 
-# Build binaries and put them on the path
+# Build binaries and put them on the path.
 bin_path = abspath(Path(__file__).parent.resolve().__str__() + "/bin")
 sys.path.append(bin_path)
 
 shutil.rmtree(bin_path, True)
 subprocess.run(["dotnet", "publish", migration_project, "-o", bin_path, "-f", "net6.0"])
+
+# Regenerate automated Python wrapper tool.
+gen_path = bin_path + "/generator"
+generator_project = abspath("../../Tableau.Migration.PythonGenerator/Tableau.Migration.PythonGenerator.csproj")
+subprocess.run(["dotnet", "public", generator_project, "-o", gen_path])
diff --git a/src/Python/src/tableau_migration/__init__.py b/src/Python/src/tableau_migration/__init__.py
index 1138a62..ff94a11 100644
--- a/src/Python/src/tableau_migration/__init__.py
+++ b/src/Python/src/tableau_migration/__init__.py
@@ -37,7 +37,7 @@
 clr.AddReference("Tableau.Migration")
 clr.AddReference("Microsoft.Extensions.DependencyInjection")
 
-import tableau_migration.migration # noqa: E402 
+import tableau_migration.migration # noqa: E402
 _services = None
 _service_collection = None
 _logger_names = [] # List of logger names
@@ -50,6 +50,85 @@
 cancellation_token = cancellation_token_source.Token
 
 # Friendly renames for common top-level imports
-from tableau_migration.migration import PyMigrationCompletionStatus as MigrationCompletionStatus # noqa: E402,F401
-from tableau_migration.migration_engine import PyMigrationPlanBuilder as MigrationPlanBuilder # noqa: E402,F401
-from tableau_migration.migration_engine_migrators import PyMigrator as Migrator # noqa: E402,F401
+from tableau_migration.migration_engine import PyMigrationPlanBuilder as MigrationPlanBuilder # noqa: E402, F401
+from tableau_migration.migration_engine_hooks_filters_interop import PyContentFilterBase as ContentFilterBase # noqa: E402, F401
+from tableau_migration.migration_engine_hooks_interop import ( # noqa: E402, F401
+    PyContentBatchMigrationCompletedHookBase as ContentBatchMigrationCompletedHookBase,
+    PyMigrationActionCompletedHookBase as MigrationActionCompletedHookBase
+)
+from tableau_migration.migration_engine_hooks_mappings_interop import ( # noqa: E402, F401
+    PyContentMappingBase as ContentMappingBase,
+    PyTableauCloudUsernameMappingBase as TableauCloudUsernameMappingBase
+)
+from tableau_migration.migration_engine_hooks_postpublish_interop import ( # noqa: E402, F401
+    PyBulkPostPublishHookBase as BulkPostPublishHookBase,
+    PyContentItemPostPublishHookBase as ContentItemPostPublishHookBase
+)
+from tableau_migration.migration_engine_hooks_transformers_interop import ( # noqa: E402, F401
+    PyContentTransformerBase as ContentTransformerBase,
+    PyXmlContentTransformerBase as XmlContentTransformerBase
+)
+from tableau_migration.migration_engine_migrators import PyMigrator as Migrator # noqa: E402, F401
+from tableau_migration.migration_engine_endpoints_search import PyDestinationContentReferenceFinder as IDestinationContentReferenceFinder # noqa: E402, F401
+from tableau_migration.migration_engine_endpoints_search import PyDestinationContentReferenceFinderFactory as IDestinationContentReferenceFinderFactory # noqa: E402, F401
+from tableau_migration.migration_engine_endpoints_search import PySourceContentReferenceFinder as ISourceContentReferenceFinder # noqa: E402, F401
+from tableau_migration.migration_engine_endpoints_search import PySourceContentReferenceFinderFactory as ISourceContentReferenceFinderFactory # noqa: E402, F401
+
+# region _generated
+
+from tableau_migration.migration import PyContentLocation as ContentLocation # noqa: E402, F401
+from tableau_migration.migration import PyContentReference as IContentReference # noqa: E402, F401
+from tableau_migration.migration import PyMigrationCompletionStatus as MigrationCompletionStatus # noqa: E402, F401
+from tableau_migration.migration import PyResult as IResult # noqa: E402, F401
+from tableau_migration.migration_api_rest_models import PyAdministratorLevels as AdministratorLevels # noqa: E402, F401
+from tableau_migration.migration_api_rest_models import PyContentPermissions as ContentPermissions # noqa: E402, F401
+from tableau_migration.migration_api_rest_models import PyExtractEncryptionModes as ExtractEncryptionModes # noqa: E402, F401
+from tableau_migration.migration_api_rest_models import PyLabelCategories as LabelCategories # noqa: E402, F401
+from tableau_migration.migration_api_rest_models import PyLicenseLevels as LicenseLevels # noqa: E402, F401
+from tableau_migration.migration_api_rest_models import PyPermissionsCapabilityModes as PermissionsCapabilityModes # noqa: E402, F401
+from tableau_migration.migration_api_rest_models import PyPermissionsCapabilityNames as PermissionsCapabilityNames # noqa: E402, F401
+from tableau_migration.migration_api_rest_models import PySiteRoles as SiteRoles # noqa: E402, F401
+from tableau_migration.migration_api_rest_models_types import PyAuthenticationTypes as AuthenticationTypes # noqa: E402, F401
+from tableau_migration.migration_api_rest_models_types import PyDataSourceFileTypes as DataSourceFileTypes # noqa: E402, F401
+from tableau_migration.migration_api_rest_models_types import PyWorkbookFileTypes as WorkbookFileTypes # noqa: E402, F401
+from tableau_migration.migration_content import PyConnection as IConnection # noqa: E402, F401
+from tableau_migration.migration_content import PyConnectionsContent as IConnectionsContent # noqa: E402, F401
+from tableau_migration.migration_content import PyContainerContent as IContainerContent # noqa: E402, F401
+from tableau_migration.migration_content import PyDataSource as IDataSource # noqa: E402, F401
+from tableau_migration.migration_content import PyDataSourceDetails as IDataSourceDetails # noqa: E402, F401
+from tableau_migration.migration_content import PyDescriptionContent as IDescriptionContent # noqa: E402, F401
+from tableau_migration.migration_content import PyExtractContent as IExtractContent # noqa: E402, F401
+from tableau_migration.migration_content import PyGroup as IGroup # noqa: E402, F401
+from tableau_migration.migration_content import PyGroupUser as IGroupUser # noqa: E402, F401
+from tableau_migration.migration_content import PyLabel as ILabel # noqa: E402, F401
+from tableau_migration.migration_content import PyProject as IProject # noqa: E402, F401
+from tableau_migration.migration_content import PyPublishableDataSource as IPublishableDataSource # noqa: E402, F401
+from tableau_migration.migration_content import PyPublishableGroup as IPublishableGroup # noqa: E402, F401
+from tableau_migration.migration_content import PyPublishableWorkbook as IPublishableWorkbook # noqa: E402, F401
+from tableau_migration.migration_content import PyPublishedContent as IPublishedContent # noqa: E402, F401
+from tableau_migration.migration_content import PyTag as ITag # noqa: E402, F401
+from tableau_migration.migration_content import PyUser as IUser # noqa: E402, F401
+from tableau_migration.migration_content import PyUsernameContent as IUsernameContent # noqa: E402, F401
+from tableau_migration.migration_content import PyView as IView # noqa: E402, F401
+from tableau_migration.migration_content import PyWithDomain as IWithDomain # noqa: E402, F401
+from tableau_migration.migration_content import PyWithOwner as IWithOwner # noqa: E402, F401
+from tableau_migration.migration_content import PyWithTags as IWithTags # noqa: E402, F401
+from tableau_migration.migration_content import PyWorkbook as IWorkbook # noqa: E402, F401
+from tableau_migration.migration_content import PyWorkbookDetails as IWorkbookDetails # noqa: E402, F401
+from tableau_migration.migration_content_permissions import PyCapability as ICapability # noqa: E402, F401
+from tableau_migration.migration_content_permissions import PyGranteeCapability as IGranteeCapability # noqa: E402, F401
+from tableau_migration.migration_content_permissions import PyGranteeType as GranteeType # noqa: E402, F401
+from tableau_migration.migration_content_permissions import PyPermissions as IPermissions # noqa: E402, F401
+from tableau_migration.migration_engine import PyContentMigrationItem as ContentMigrationItem # noqa: E402, F401
+from tableau_migration.migration_engine_actions import PyMigrationActionResult as IMigrationActionResult # noqa: E402, F401
+from tableau_migration.migration_engine_hooks_mappings import PyContentMappingContext as ContentMappingContext # noqa: E402, F401
+from tableau_migration.migration_engine_hooks_postpublish import PyBulkPostPublishContext as BulkPostPublishContext # noqa: E402, F401
+from tableau_migration.migration_engine_hooks_postpublish import PyContentItemPostPublishContext as ContentItemPostPublishContext # noqa: E402, F401
+from tableau_migration.migration_engine_manifest import PyMigrationManifestEntry as IMigrationManifestEntry # noqa: E402, F401
+from tableau_migration.migration_engine_manifest import PyMigrationManifestEntryEditor as IMigrationManifestEntryEditor # noqa: E402, F401
+from tableau_migration.migration_engine_manifest import PyMigrationManifestEntryStatus as MigrationManifestEntryStatus # noqa: E402, F401
+from tableau_migration.migration_engine_migrators import PyContentItemMigrationResult as IContentItemMigrationResult # noqa: E402, F401
+from tableau_migration.migration_engine_migrators_batch import PyContentBatchMigrationResult as IContentBatchMigrationResult # noqa: E402, F401
+
+# endregion
+
diff --git a/src/Python/src/tableau_migration/migration.py b/src/Python/src/tableau_migration/migration.py
index 1759660..9761c6b 100644
--- a/src/Python/src/tableau_migration/migration.py
+++ b/src/Python/src/tableau_migration/migration.py
@@ -17,52 +17,79 @@
 
 Also any method required to start the sdk
 """
+import inspect
+import sys
+
 from typing import Type, TypeVar, List
 from typing_extensions import Self
 from uuid import UUID
 
-import System 
-import System.Collections.Generic
+# region Generic Wrapper Helpers
 
-# We are import Tableau.Migration again. This is because IServiceCollectionExtension
-# is defined in multiple namespaces. If we were to import it via a 'from import' statement it would
-# defined in the default python namespace and would get overriden by the next 'from import' statement.
+_wrapper_types = { }
 
-from Tableau.Migration import (
-    IServiceCollectionExtensions as MigrationSCE,
-    MigrationResult,
-    IResult
+def _find_wrapper_type(search_type):
+    for module in list(sys.modules.values()):
+        for member in inspect.getmembers(module, inspect.isclass):
+            t = member[1]
+            if hasattr(t, "_dotnet_base") and t._dotnet_base == search_type:
+                return t
+    
+    return None
+
+def _generic_wrapper(obj, type_override: type = None):
+    t = type_override if type_override is not None else type(obj)
+    if t not in _wrapper_types:
+        wrapper_type = _find_wrapper_type(t)
+        if wrapper_type is None:
+            raise Exception("Migration SDK wrapper type not found for type" + str(t))
+        _wrapper_types[t] = wrapper_type
+        
+    return _wrapper_types[t](obj)
+
+# endregion
+
+import System # noqa: E402
+from System import ( # noqa: E402
+    IServiceProvider,
+    Func,
+    String
 )
 
-from Tableau.Migration.Engine.Manifest import (
-    IMigrationManifestEditor
+import System.Collections.Generic # noqa: E402
+
+from Tableau.Migration import ( # noqa: E402
+    MigrationResult
 )
 
-from enum import IntEnum
+from Tableau.Migration.Engine.Manifest import ( # noqa: E402
+    IMigrationManifestEditor
+)
 
-from Tableau.Migration.Interop import (
-    IServiceCollectionExtensions as InteropSCE)
+from Tableau.Migration.Interop import ( # noqa: E402
+    IServiceCollectionExtensions as InteropSCE
+)
 
-from Tableau.Migration.Interop.Logging import (
-    NonGenericLoggerProvider, 
-    NonGenericLoggerBase)
+from Tableau.Migration.Interop.Logging import ( # noqa: E402
+    NonGenericLoggerBase
+)
 
-from Microsoft.Extensions.DependencyInjection import (
+from Microsoft.Extensions.DependencyInjection import ( # noqa: E402
     ServiceCollectionContainerBuilderExtensions, 
     ServiceCollection,
     IServiceCollection,
-    ServiceProviderServiceExtensions,ServiceProvider)
-
+    ServiceProviderServiceExtensions,
+    ServiceProvider
+)
 
-import tableau_migration 
-from tableau_migration.migration_logger import MigrationLogger
+import tableau_migration # noqa: E402
+from tableau_migration.migration_logger import MigrationLogger # noqa: E402
 
 # region init
 
 T = TypeVar("T")
-Action1 = getattr(System, "Action`1")
 
-def get_service(services: System.IServiceProvider, t: Type[T]) -> T:
+def get_service(services: IServiceProvider, t: Type[T]) -> T:
     """Gets service of type T.
 
     Args:
@@ -73,6 +100,7 @@ def get_service(services: System.IServiceProvider, t: Type[T]) -> T:
     """
     return ServiceProviderServiceExtensions.GetRequiredService[t](services)
 
+
 def get_service_provider() -> ServiceProvider:
     """Gets the Dependency Injection Service Provider.
     
@@ -83,29 +111,23 @@ def get_service_provider() -> ServiceProvider:
     else:
         raise Exception("Service provider is not initialized.")
 
-def _initialize() -> ServiceProvider:
+
+def _initialize() -> None:
     """Initializes the DI container and returns the services provider."""
     tableau_migration._service_collection = ServiceCollection()
     _configure_services(tableau_migration._service_collection) # moving to init
-    tableau_migration._services = _build_service_provider()
-    return tableau_migration._services
+    _build_service_provider(tableau_migration._service_collection)
 
-def _build_service_provider() -> ServiceProvider:
+
+def _build_service_provider(service_collection: IServiceCollection) -> None:
     """Gets the IServiceProvider with the Migration SDK registered."""
-    tableau_migration._services = ServiceCollectionContainerBuilderExtensions.BuildServiceProvider(tableau_migration._service_collection)
-    return tableau_migration._services
+    tableau_migration._services = ServiceCollectionContainerBuilderExtensions.BuildServiceProvider(service_collection)
 
 
 def _configure_services(service_collection: IServiceCollection) -> None:
     """Adds migration sdk and python logger to DI."""
     # Create the python logging provider so it's available from the beginning
-    MigrationSCE.AddTableauMigrationSdk(service_collection)
-    InteropSCE.AddPythonSupport(service_collection, System.Func[System.IServiceProvider, NonGenericLoggerProvider](_get_new_python_logging_provider_delegate))
-
-
-def _get_new_python_logging_provider_delegate(services: IServiceCollection):
-    """Simply returns a new NonGenericLoggerProvider."""
-    return NonGenericLoggerProvider(System.Func[System.String, NonGenericLoggerBase](_get_new_python_logger_delegate))
+    InteropSCE.AddPythonSupport(service_collection, Func[String, NonGenericLoggerBase](_get_new_python_logger_delegate))
 
 
 def _get_new_python_logger_delegate(name: str) -> MigrationLogger:
@@ -121,22 +143,6 @@ def _get_new_python_logger_delegate(name: str) -> MigrationLogger:
 # endregion
 
 # region objects
-class PyMigrationCompletionStatus(IntEnum):
-    """Enumeration of the various ways a migration can reach completion."""
-
-    Completed = 0
-    """
-    The migration reached completion normally.
-    """
-    Canceled = 1
-    """
-    The migration was canceled before completion.
-    """
-    FatalError = 2
-    """
-    The migration had a fatal error that interrupted completion.
-    """
-
 
 class PyMigrationManifest():
     """Interface for an object that describes the various Tableau data items found to migrate and their migration results."""
@@ -198,57 +204,216 @@ def add_errors(self, errors) -> Self:
         # or an exception will be thrown
         self._migration_manifest.AddErrors(errors)
 
-class PyMigrationResult():
-    """Interface for a result of a migration."""
+# endregion
+        
+# region _generated
 
-    _dotnet_base = MigrationResult # MigrationResult is a record struct, not an interface, hence it doesn't start with I
+from enum import IntEnum # noqa: E402, F401
+from typing import Sequence # noqa: E402, F401
+from typing_extensions import Self # noqa: E402, F401
+from uuid import UUID # noqa: E402, F401
 
-    def __init__(self, migration_result: MigrationResult) -> None:
-        """Default init.
+import System # noqa: E402
 
+from System import Guid # noqa: E402, F401
+from Tableau.Migration import (  # noqa: E402, F401
+    ContentLocation,
+    IContentReference,
+    IResult
+)
+
+class PyContentLocation():
+    """Structure representing a logical location of a content item on a Tableau site. For example, for workbooks this represents the project path and the workbook name."""
+    
+    _dotnet_base = ContentLocation
+    
+    def __init__(self, content_location: ContentLocation) -> None:
+        """Creates a new PyContentLocation object.
+        
         Args:
-            migration_result: Interface for a result of a migration.
+            content_location: A ContentLocation object.
         
         Returns: None.
         """
-        self._migrationResult = migration_result
-
+        self._dotnet = content_location
+        
     @property
-    def status(self) -> PyMigrationCompletionStatus:
-        """How the migration reached completion."""
-        return PyMigrationCompletionStatus(self._migrationResult.Status.value__)
-
-    @property 
-    def manifest(self) -> PyMigrationManifest:
-        """Gets the MigrationManifest the migration produced."""
-        return PyMigrationManifest(self._migrationResult.Manifest)
-
+    def path_segments(self) -> Sequence[str]:
+        """Gets the individual segments of the location path."""
+        return None if self._dotnet.PathSegments is None else list(self._dotnet.PathSegments)
+    
+    @property
+    def path_separator(self) -> str:
+        """Gets the separator to use between segments in the location path."""
+        return self._dotnet.PathSeparator
+    
+    @property
+    def path(self) -> str:
+        """Gets the full path of the location."""
+        return self._dotnet.Path
+    
+    @property
+    def name(self) -> str:
+        """Gets the non-pathed name of the location."""
+        return self._dotnet.Name
+    
+    @property
+    def is_empty(self) -> bool:
+        """Gets whether this location reprents an empty path."""
+        return self._dotnet.IsEmpty
+    
+    @classmethod
+    def for_username(cls, domain: str, username: str) -> Self:
+        """Creates a new ContentLocation value with the standard user/group name separator.
+        
+        Args:
+            domain: The user/group domain.
+            username: The user/group name.
+        
+        Returns: The newly created ContentLocation.
+        """
+        result = ContentLocation.ForUsername(domain, username)
+        return None if result is None else PyContentLocation(result)
+    
+    @classmethod
+    def from_path(cls, content_location_path: str, path_separator: str) -> Self:
+        """Creates a new ContentLocation value from a string.
+        
+        Args:
+            content_location_path: The full path of the location.
+            path_separator: The separator to use between segments in the location path.
+        
+        Returns: The newly created ContentLocation.
+        """
+        result = ContentLocation.FromPath(content_location_path, path_separator)
+        return None if result is None else PyContentLocation(result)
+    
+    def append(self, name: str) -> Self:
+        """Creates a new ContentLocation with a new path segment appended.
+        
+        Args:
+            name: The name to append to the path.
+        
+        Returns: The new ContentLocation with the appended path.
+        """
+        result = self._dotnet.Append(name)
+        return None if result is None else PyContentLocation(result)
+    
+    def rename(self, new_name: str) -> Self:
+        """Creates a new ContentLocation with the last path segment replaced.
+        
+        Args:
+            new_name: The new name to replace the last path segment with.
+        
+        Returns: The renamed ContentLocation.
+        """
+        result = self._dotnet.Rename(new_name)
+        return None if result is None else PyContentLocation(result)
+    
+    def parent(self) -> Self:
+        """Creates a new ContentLocation with the last path segment removed.
+        
+        Returns: The new ContentLocation with the parent path.
+        """
+        result = self._dotnet.Parent()
+        return None if result is None else PyContentLocation(result)
+    
+class PyContentReference():
+    """Interface for an object that describes information on how to reference an item of content, for example through a Tableau API."""
+    
+    _dotnet_base = IContentReference
+    
+    def __init__(self, content_reference: IContentReference) -> None:
+        """Creates a new PyContentReference object.
+        
+        Args:
+            content_reference: A IContentReference object.
+        
+        Returns: None.
+        """
+        self._dotnet = content_reference
+        
+    @property
+    def id(self) -> UUID:
+        """Gets the unique identifier of the content item, corresponding to the LUID in the Tableau REST API."""
+        return None if self._dotnet.Id is None else UUID(self._dotnet.Id.ToString())
+    
+    @property
+    def content_url(self) -> str:
+        """Get the site-unique "content URL" of the content item, or an empty string if the content type does not use a content URL."""
+        return self._dotnet.ContentUrl
+    
+    @property
+    def location(self) -> PyContentLocation:
+        """Gets the logical location path of the content item, for project-level content this is the project path and the content item name."""
+        return None if self._dotnet.Location is None else PyContentLocation(self._dotnet.Location)
+    
+    @property
+    def name(self) -> str:
+        """Gets the name of the content item. This is equivalent to the last segment of the Location. Renames should be performed through mapping."""
+        return self._dotnet.Name
+    
+class PyMigrationCompletionStatus(IntEnum):
+    """Enumeration of the various ways a migration can reach completion."""
+    
+    """The migration reached completion normally."""
+    COMPLETED = 0
+    
+    """The migration was canceled before completion."""
+    CANCELED = 1
+    
+    """The migration had a fatal error that interrupted completion."""
+    FATAL_ERROR = 2
+    
 class PyResult():
     """Interface representing the result of an operation."""
-
+    
     _dotnet_base = IResult
-        
+    
     def __init__(self, result: IResult) -> None:
-        """Default init.
-
+        """Creates a new PyResult object.
+        
         Args:
-            result: Representation of the result of an operation
+            result: A IResult object.
         
         Returns: None.
         """
-        self._result = result
-
-    """
-    Interface representing the result of an operation.
-    """
+        self._dotnet = result
+        
     @property
     def success(self) -> bool:
         """Gets whether the operation was successful."""
-        return self._result.Success
-
+        return self._dotnet.Success
+    
     @property
-    def errors(self):
+    def errors(self) -> Sequence[System.Exception]:
         """Gets any exceptions encountered during the operation."""
-        return self._result.Errors
+        return None if self._dotnet.Errors is None else list(self._dotnet.Errors)
+    
 
 # endregion
+
+class PyMigrationResult():
+    """Interface for a result of a migration."""
+
+    _dotnet_base = MigrationResult # MigrationResult is a record struct, not an interface, hence it doesn't start with I
+
+    def __init__(self, migration_result: MigrationResult) -> None:
+        """Default init.
+
+        Args:
+            migration_result: Interface for a result of a migration.
+        
+        Returns: None.
+        """
+        self._migrationResult = migration_result
+
+    @property
+    def status(self) -> PyMigrationCompletionStatus:
+        """How the migration reached completion."""
+        return PyMigrationCompletionStatus(self._migrationResult.Status.value__)
+
+    @property 
+    def manifest(self) -> PyMigrationManifest:
+        """Gets the MigrationManifest the migration produced."""
+        return PyMigrationManifest(self._migrationResult.Manifest)    
diff --git a/src/Python/src/tableau_migration/migration_api_rest_models.py b/src/Python/src/tableau_migration/migration_api_rest_models.py
new file mode 100644
index 0000000..c11263e
--- /dev/null
+++ b/src/Python/src/tableau_migration/migration_api_rest_models.py
@@ -0,0 +1,198 @@
+# Copyright (c) 2024, Salesforce, Inc.
+# SPDX-License-Identifier: Apache-2
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Wrapper for classes in Tableau.Migration.Api.Rest.Models namespace."""
+
+# region _generated
+
+from migration_enum import StrEnum # noqa: E402, F401
+
+class PyAdministratorLevels(StrEnum):
+    """The Administrator level for the user to be derived from a siterole in SiteRoles."""
+    
+    """Name for the level when a user has Site administrator permissions."""
+    SITE = "Site"
+    
+    """Name for the level when a user has no administrator permissions."""
+    NONE = "None"
+    
+class PyContentPermissions(StrEnum):
+    """Class containing content permissions constants. See https://help.tableau.com/current/api/rest_api/en-us/REST/rest_api_ref_projects.htm#create_project for documentation."""
+    
+    """Gets the name of the LockedToProject content permission mode."""
+    LOCKED_TO_PROJECT = "LockedToProject"
+    
+    """Gets the name of the ManagedByOwner content permission mode."""
+    MANAGED_BY_OWNER = "ManagedByOwner"
+    
+    """Gets the name of the LockedToProjectWithoutNested content permission mode."""
+    LOCKED_TO_PROJECT_WITHOUT_NESTED = "LockedToProjectWithoutNested"
+    
+class PyExtractEncryptionModes(StrEnum):
+    """Class containing extract encryption mode constants. See https://help.tableau.com/current/api/rest_api/en-us/REST/rest_api_ref_extract_and_encryption.htm for documentation."""
+    
+    """The mode to enforce encryption of all extracts on the site."""
+    ENFORCED = "enforced"
+    
+    """The mode to allow users to specify to encrypt all extracts associated with specific published workbooks or data sources."""
+    ENABLED = "enabled"
+    
+    """The mode to disable extract encryption on the site."""
+    DISABLED = "disabled"
+    
+class PyLabelCategories(StrEnum):
+    """The built-in categories for labels."""
+    
+    """Gets the name of the Certification category for a label."""
+    CERTIFICATION = "Certification"
+    
+    """Gets the name of the Data Quality Warning category for a label."""
+    DATA_QUALITY_WARNING = "DataQualityWarning"
+    
+    """Gets the name of the Sensitivity category for a label."""
+    SENSITIVITY = "Sensitivity"
+    
+class PyLicenseLevels(StrEnum):
+    """The license levels to be derived from a siterole in SiteRoles."""
+    
+    """Gets the name of the Creator license level."""
+    CREATOR = "Creator"
+    
+    """Gets the name of the Explorer license level."""
+    EXPLORER = "Explorer"
+    
+    """Gets the name of the Viewer license level."""
+    VIEWER = "Viewer"
+    
+    """Gets the name of the license level when a user is unlicensed."""
+    UNLICENSED = "Unlicensed"
+    
+class PyPermissionsCapabilityModes(StrEnum):
+    """The capability modes for a specific content type."""
+    
+    """The name of the Allow capability mode."""
+    ALLOW = "Allow"
+    
+    """The name of the Deny capability mode."""
+    DENY = "Deny"
+    
+class PyPermissionsCapabilityNames(StrEnum):
+    """The Capability names used in the test API."""
+    
+    """Gets the name of capability name for no capabilities."""
+    NONE = "None"
+    
+    """Gets the name of capability name for AddComment."""
+    ADD_COMMENT = "AddComment"
+    
+    """Gets the name of capability name for ChangeHierarchy."""
+    CHANGE_HIERARCHY = "ChangeHierarchy"
+    
+    """Gets the name of capability name for ChangePermissions."""
+    CHANGE_PERMISSIONS = "ChangePermissions"
+    
+    """Gets the name of capability name for Connect."""
+    CONNECT = "Connect"
+    
+    """Gets the name of capability name for CreateRefreshMetrics."""
+    CREATE_REFRESH_METRICS = "CreateRefreshMetrics"
+    
+    """Gets the name of capability name for Delete."""
+    DELETE = "Delete"
+    
+    """Gets the name of capability name for Execute."""
+    EXECUTE = "Execute"
+    
+    """Gets the name of capability name for ExportData."""
+    EXPORT_DATA = "ExportData"
+    
+    """Gets the name of capability name for ExportImage."""
+    EXPORT_IMAGE = "ExportImage"
+    
+    """Gets the name of capability name for ExportXml."""
+    EXPORT_XML = "ExportXml"
+    
+    """Gets the name of capability name for Filter."""
+    FILTER = "Filter"
+    
+    """Gets the name of capability name for InheritedProjectLeader."""
+    INHERITED_PROJECT_LEADER = "InheritedProjectLeader"
+    
+    """Gets the name of capability name for ProjectLeader."""
+    PROJECT_LEADER = "ProjectLeader"
+    
+    """Gets the name of capability name for Read."""
+    READ = "Read"
+    
+    """Gets the name of capability name for RunExplainData."""
+    RUN_EXPLAIN_DATA = "RunExplainData"
+    
+    """Gets the name of capability name for SaveAs."""
+    SAVE_AS = "SaveAs"
+    
+    """Gets the name of capability name for ShareView."""
+    SHARE_VIEW = "ShareView"
+    
+    """Gets the name of capability name for ViewComments."""
+    VIEW_COMMENTS = "ViewComments"
+    
+    """Gets the name of capability name for ViewUnderlyingData."""
+    VIEW_UNDERLYING_DATA = "ViewUnderlyingData"
+    
+    """Gets the name of capability name for WebAuthoring."""
+    WEB_AUTHORING = "WebAuthoring"
+    
+    """Gets the name of capability name for WebAuthoringForFlows."""
+    WEB_AUTHORING_FOR_FLOWS = "WebAuthoringForFlows"
+    
+    """Gets the name of capability name for Write."""
+    WRITE = "Write"
+    
+class PySiteRoles(StrEnum):
+    """Class containing site role constants.  See https://help.tableau.com/current/server/en-us/users_site_roles.htm#site-role-capabilities-summary for documentation."""
+    
+    """Gets the name of the Creator site role."""
+    CREATOR = "Creator"
+    
+    """Gets the name of the Explorer site role."""
+    EXPLORER = "Explorer"
+    
+    """Gets the name of the Explorer Can Publish site role."""
+    EXPLORER_CAN_PUBLISH = "ExplorerCanPublish"
+    
+    """Gets the name of the Guest site role."""
+    GUEST = "Guest"
+    
+    """Gets the name of the Server Administrator site role."""
+    SERVER_ADMINISTRATOR = "ServerAdministrator"
+    
+    """Gets the name of the Site Administrator Creator site role."""
+    SITE_ADMINISTRATOR_CREATOR = "SiteAdministratorCreator"
+    
+    """Gets the name of the Site Administrator Explorer site role."""
+    SITE_ADMINISTRATOR_EXPLORER = "SiteAdministratorExplorer"
+    
+    """Gets the name of the Support User site role."""
+    SUPPORT_USER = "SupportUser"
+    
+    """Gets the name of the Unlicensed site role."""
+    UNLICENSED = "Unlicensed"
+    
+    """Gets the name of the Viewer site role."""
+    VIEWER = "Viewer"
+    
+
+# endregion
+
diff --git a/src/Python/src/tableau_migration/migration_api_rest_models_types.py b/src/Python/src/tableau_migration/migration_api_rest_models_types.py
new file mode 100644
index 0000000..caf65e6
--- /dev/null
+++ b/src/Python/src/tableau_migration/migration_api_rest_models_types.py
@@ -0,0 +1,63 @@
+# Copyright (c) 2024, Salesforce, Inc.
+# SPDX-License-Identifier: Apache-2
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Wrapper for classes in Tableau.Migration.Api.Rest.Models.Types namespace."""
+
+# region _generated
+
+from migration_enum import StrEnum # noqa: E402, F401
+
+class PyAuthenticationTypes(StrEnum):
+    """Class containing authentication type constants.  See https://help.tableau.com/current/api/rest_api/en-us/REST/rest_api_ref_users_and_groups.htm#add_user_to_site for documentation."""
+    
+    """Gets the name of the server default authentication type."""
+    SERVER_DEFAULT = "ServerDefault"
+    
+    """Gets the name of the Open ID authentication type."""
+    OPEN_ID = "OpenID"
+    
+    """Gets the name of the SAML authentication type."""
+    SAML = "SAML"
+    
+    """Gets the name of the Tableau ID with MFA authentication type."""
+    TABLEAU_ID_WITH_MFA = "TableauIDWithMFA"
+    
+class PyDataSourceFileTypes(StrEnum):
+    """Class containing data source file type constants.  See https://help.tableau.com/current/api/rest_api/en-us/REST/rest_api_ref_data_sources.htm#publish_data_source for documentation."""
+    
+    """Gets the name of the Hyper data source file type."""
+    HYPER = "hyper"
+    
+    """Gets the name of the Tds data source file type."""
+    TDS = "tds"
+    
+    """Gets the name of the Tdsx data source file type."""
+    TDSX = "tdsx"
+    
+    """Gets the name of the Tde data source file type."""
+    TDE = "tde"
+    
+class PyWorkbookFileTypes(StrEnum):
+    """Class containing workbook file type constants.  See https://help.tableau.com/current/api/rest_api/en-us/REST/rest_api_ref_publishing.htm#publish_workbook for documentation."""
+    
+    """Gets the name of the twb workbook file type."""
+    TWB = "twb"
+    
+    """Gets the name of the twbx workbook file type."""
+    TWBX = "twbx"
+    
+
+# endregion
+
diff --git a/src/Python/src/tableau_migration/migration_content.py b/src/Python/src/tableau_migration/migration_content.py
new file mode 100644
index 0000000..f321f9b
--- /dev/null
+++ b/src/Python/src/tableau_migration/migration_content.py
@@ -0,0 +1,787 @@
+# Copyright (c) 2024, Salesforce, Inc.
+# SPDX-License-Identifier: Apache-2
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Wrapper for classes in Tableau.Migration.Content namespace."""
+
+# region _generated
+
+from tableau_migration.migration import PyContentReference # noqa: E402, F401
+from typing import (  # noqa: E402, F401
+    Sequence,
+    List
+)
+from uuid import UUID # noqa: E402, F401
+
+from System import (  # noqa: E402, F401
+    Guid,
+    String as String
+)
+from System.Collections.Generic import (  # noqa: E402, F401
+    List as DotnetList,
+    HashSet as DotnetHashSet
+)
+from Tableau.Migration.Content import (  # noqa: E402, F401
+    IConnection,
+    IConnectionsContent,
+    IContainerContent,
+    IDataSource,
+    IDataSourceDetails,
+    IDescriptionContent,
+    IExtractContent,
+    IGroup,
+    IGroupUser,
+    ILabel,
+    IProject,
+    IPublishableDataSource,
+    IPublishableGroup,
+    IPublishableWorkbook,
+    IPublishedContent,
+    ITag,
+    IUser,
+    IUsernameContent,
+    IView,
+    IWithDomain,
+    IWithOwner,
+    IWithTags,
+    IWorkbook,
+    IWorkbookDetails
+)
+
+class PyConnection():
+    """Interface for a content item's embedded connection."""
+    
+    _dotnet_base = IConnection
+    
+    def __init__(self, connection: IConnection) -> None:
+        """Creates a new PyConnection object.
+        
+        Args:
+            connection: A IConnection object.
+        
+        Returns: None.
+        """
+        self._dotnet = connection
+        
+    @property
+    def id(self) -> UUID:
+        """Gets the unique identifier."""
+        return None if self._dotnet.Id is None else UUID(self._dotnet.Id.ToString())
+    
+    @property
+    def type(self) -> str:
+        """Gets the connection type for the response."""
+        return self._dotnet.Type
+    
+    @property
+    def server_address(self) -> str:
+        """Gets the server address for the response."""
+        return self._dotnet.ServerAddress
+    
+    @property
+    def server_port(self) -> str:
+        """Gets the server port for the response."""
+        return self._dotnet.ServerPort
+    
+    @property
+    def connection_username(self) -> str:
+        """Gets the connection username for the response."""
+        return self._dotnet.ConnectionUsername
+    
+    @property
+    def query_tagging_enabled(self) -> bool:
+        """Gets the query tagging enabled flag for the response. This is returned only for administrator users."""
+        return self._dotnet.QueryTaggingEnabled
+    
+class PyConnectionsContent():
+    """Interface for content that has connection metadata."""
+    
+    _dotnet_base = IConnectionsContent
+    
+    def __init__(self, connections_content: IConnectionsContent) -> None:
+        """Creates a new PyConnectionsContent object.
+        
+        Args:
+            connections_content: A IConnectionsContent object.
+        
+        Returns: None.
+        """
+        self._dotnet = connections_content
+        
+    @property
+    def connections(self) -> Sequence[PyConnection]:
+        """Gets the connection metadata. Connection metadata is read only because connection metadata should not be transformed directly. Instead, connections should be modified by either: 1) manipulating XML before publishing, or 2) updating connection metadata in a post-publish hook."""
+        return None if self._dotnet.Connections is None else list((None if x is None else PyConnection(x)) for x in self._dotnet.Connections)
+    
+class PyContainerContent():
+    """Interface for a content item that belongs to a container (e.g. project or personal space)."""
+    
+    _dotnet_base = IContainerContent
+    
+    def __init__(self, container_content: IContainerContent) -> None:
+        """Creates a new PyContainerContent object.
+        
+        Args:
+            container_content: A IContainerContent object.
+        
+        Returns: None.
+        """
+        self._dotnet = container_content
+        
+    @property
+    def container(self) -> PyContentReference:
+        """Gets the container for the content item. Relocating the content should be done through mapping."""
+        return None if self._dotnet.Container is None else PyContentReference(self._dotnet.Container)
+    
+class PyPublishedContent():
+    """Interface for a content item that has metadata around publishing information."""
+    
+    _dotnet_base = IPublishedContent
+    
+    def __init__(self, published_content: IPublishedContent) -> None:
+        """Creates a new PyPublishedContent object.
+        
+        Args:
+            published_content: A IPublishedContent object.
+        
+        Returns: None.
+        """
+        self._dotnet = published_content
+        
+    @property
+    def created_at(self) -> str:
+        """Gets the created timestamp."""
+        return self._dotnet.CreatedAt
+    
+    @property
+    def updated_at(self) -> str:
+        """Gets the updated timestamp."""
+        return self._dotnet.UpdatedAt
+    
+    @property
+    def webpage_url(self) -> str:
+        """Gets the webpage URL."""
+        return self._dotnet.WebpageUrl
+    
+class PyDescriptionContent():
+    """Interface for a content item that has a description."""
+    
+    _dotnet_base = IDescriptionContent
+    
+    def __init__(self, description_content: IDescriptionContent) -> None:
+        """Creates a new PyDescriptionContent object.
+        
+        Args:
+            description_content: A IDescriptionContent object.
+        
+        Returns: None.
+        """
+        self._dotnet = description_content
+        
+    @property
+    def description(self) -> str:
+        """Gets or sets the description."""
+        return self._dotnet.Description
+    
+    @description.setter
+    def description(self, value: str) -> None:
+        """Gets or sets the description."""
+        self._dotnet.Description = value
+    
+class PyExtractContent():
+    """Interface for a content item that has an extract."""
+    
+    _dotnet_base = IExtractContent
+    
+    def __init__(self, extract_content: IExtractContent) -> None:
+        """Creates a new PyExtractContent object.
+        
+        Args:
+            extract_content: A IExtractContent object.
+        
+        Returns: None.
+        """
+        self._dotnet = extract_content
+        
+    @property
+    def encrypt_extracts(self) -> bool:
+        """Gets or sets whether or not extracts are encrypted."""
+        return self._dotnet.EncryptExtracts
+    
+    @encrypt_extracts.setter
+    def encrypt_extracts(self, value: bool) -> None:
+        """Gets or sets whether or not extracts are encrypted."""
+        self._dotnet.EncryptExtracts = value
+    
+class PyTag():
+    """Inteface for tags associated with content items."""
+    
+    _dotnet_base = ITag
+    
+    def __init__(self, tag: ITag) -> None:
+        """Creates a new PyTag object.
+        
+        Args:
+            tag: A ITag object.
+        
+        Returns: None.
+        """
+        self._dotnet = tag
+        
+    @property
+    def label(self) -> str:
+        """Gets or sets label for the tag."""
+        return self._dotnet.Label
+    
+    @label.setter
+    def label(self, value: str) -> None:
+        """Gets or sets label for the tag."""
+        self._dotnet.Label = value
+    
+class PyWithTags():
+    """Interface to be inherited by content items with tags."""
+    
+    _dotnet_base = IWithTags
+    
+    def __init__(self, with_tags: IWithTags) -> None:
+        """Creates a new PyWithTags object.
+        
+        Args:
+            with_tags: A IWithTags object.
+        
+        Returns: None.
+        """
+        self._dotnet = with_tags
+        
+    @property
+    def tags(self) -> List[PyTag]:
+        """Gets or sets the tags for the content item."""
+        return [] if self._dotnet.Tags is None else [PyTag(x) for x in self._dotnet.Tags if x is not None]
+    
+    @tags.setter
+    def tags(self, value: List[PyTag]) -> None:
+        """Gets or sets the tags for the content item."""
+        if value is None:
+            self._dotnet.Tags = DotnetList[ITag]()
+        else:
+            dotnet_collection = DotnetList[ITag]()
+            for x in filter(None,value):
+                dotnet_collection.Add(x._dotnet)
+            self._dotnet.Tags = dotnet_collection
+    
+class PyWithOwner(PyContentReference):
+    """Interface to be inherited by content items with owner."""
+    
+    _dotnet_base = IWithOwner
+    
+    def __init__(self, with_owner: IWithOwner) -> None:
+        """Creates a new PyWithOwner object.
+        
+        Args:
+            with_owner: A IWithOwner object.
+        
+        Returns: None.
+        """
+        self._dotnet = with_owner
+        
+    @property
+    def owner(self) -> PyContentReference:
+        """Gets or sets the owner for the content item."""
+        return None if self._dotnet.Owner is None else PyContentReference(self._dotnet.Owner)
+    
+    @owner.setter
+    def owner(self, value: PyContentReference) -> None:
+        """Gets or sets the owner for the content item."""
+        self._dotnet.Owner = None if value is None else value._dotnet
+    
+class PyDataSource(PyPublishedContent, PyDescriptionContent, PyExtractContent, PyWithTags, PyContainerContent, PyWithOwner):
+    """Interface for a data source content item."""
+    
+    _dotnet_base = IDataSource
+    
+    def __init__(self, data_source: IDataSource) -> None:
+        """Creates a new PyDataSource object.
+        
+        Args:
+            data_source: A IDataSource object.
+        
+        Returns: None.
+        """
+        self._dotnet = data_source
+        
+    @property
+    def has_extracts(self) -> bool:
+        """Gets whether or not the data source has extracts."""
+        return self._dotnet.HasExtracts
+    
+    @property
+    def is_certified(self) -> bool:
+        """Gets the IsCertified flag for the data source. Should be updated through a post-publish hook."""
+        return self._dotnet.IsCertified
+    
+    @property
+    def use_remote_query_agent(self) -> bool:
+        """Gets or sets the UseRemoteQueryAgent flag for the data source."""
+        return self._dotnet.UseRemoteQueryAgent
+    
+    @use_remote_query_agent.setter
+    def use_remote_query_agent(self, value: bool) -> None:
+        """Gets or sets the UseRemoteQueryAgent flag for the data source."""
+        self._dotnet.UseRemoteQueryAgent = value
+    
+class PyDataSourceDetails(PyDataSource):
+    """Interface for a data source object with extended information, from a GET query for example."""
+    
+    _dotnet_base = IDataSourceDetails
+    
+    def __init__(self, data_source_details: IDataSourceDetails) -> None:
+        """Creates a new PyDataSourceDetails object.
+        
+        Args:
+            data_source_details: A IDataSourceDetails object.
+        
+        Returns: None.
+        """
+        self._dotnet = data_source_details
+        
+    @property
+    def certification_note(self) -> str:
+        """Gets the certification note."""
+        return self._dotnet.CertificationNote
+    
+class PyWithDomain():
+    """Interface for content items with a domain."""
+    
+    _dotnet_base = IWithDomain
+    
+    def __init__(self, with_domain: IWithDomain) -> None:
+        """Creates a new PyWithDomain object.
+        
+        Args:
+            with_domain: A IWithDomain object.
+        
+        Returns: None.
+        """
+        self._dotnet = with_domain
+        
+    @property
+    def domain(self) -> str:
+        """Gets the domain this item belongs to. Changes should be made through mapping."""
+        return self._dotnet.Domain
+    
+class PyUsernameContent(PyContentReference, PyWithDomain):
+    """Interface for a content item that uses a domain qualified username."""
+    
+    _dotnet_base = IUsernameContent
+    
+    def __init__(self, username_content: IUsernameContent) -> None:
+        """Creates a new PyUsernameContent object.
+        
+        Args:
+            username_content: A IUsernameContent object.
+        
+        Returns: None.
+        """
+        self._dotnet = username_content
+        
+class PyGroup(PyUsernameContent):
+    """Interface for a group content item."""
+    
+    _dotnet_base = IGroup
+    
+    def __init__(self, group: IGroup) -> None:
+        """Creates a new PyGroup object.
+        
+        Args:
+            group: A IGroup object.
+        
+        Returns: None.
+        """
+        self._dotnet = group
+        
+    @property
+    def grant_license_mode(self) -> str:
+        """Gets the grant license mode of the group."""
+        return self._dotnet.GrantLicenseMode
+    
+    @grant_license_mode.setter
+    def grant_license_mode(self, value: str) -> None:
+        """Gets the grant license mode of the group."""
+        self._dotnet.GrantLicenseMode = value
+    
+    @property
+    def site_role(self) -> str:
+        """Gets the site role of the group."""
+        return self._dotnet.SiteRole
+    
+    @site_role.setter
+    def site_role(self, value: str) -> None:
+        """Gets the site role of the group."""
+        self._dotnet.SiteRole = value
+    
+class PyGroupUser():
+    """Interface for a user linked to a group content item."""
+    
+    _dotnet_base = IGroupUser
+    
+    def __init__(self, group_user: IGroupUser) -> None:
+        """Creates a new PyGroupUser object.
+        
+        Args:
+            group_user: A IGroupUser object.
+        
+        Returns: None.
+        """
+        self._dotnet = group_user
+        
+    @property
+    def user(self) -> PyContentReference:
+        """Gets the user that belongs to a group."""
+        return None if self._dotnet.User is None else PyContentReference(self._dotnet.User)
+    
+    @user.setter
+    def user(self, value: PyContentReference) -> None:
+        """Gets the user that belongs to a group."""
+        self._dotnet.User = None if value is None else value._dotnet
+    
+class PyLabel():
+    """Interface for a content item's label."""
+    
+    _dotnet_base = ILabel
+    
+    def __init__(self, label: ILabel) -> None:
+        """Creates a new PyLabel object.
+        
+        Args:
+            label: A ILabel object.
+        
+        Returns: None.
+        """
+        self._dotnet = label
+        
+    @property
+    def site_id(self) -> UUID:
+        """Gets the site ID."""
+        return None if self._dotnet.SiteId is None else UUID(self._dotnet.SiteId.ToString())
+    
+    @property
+    def owner_id(self) -> UUID:
+        """Gets the owner ID."""
+        return None if self._dotnet.OwnerId is None else UUID(self._dotnet.OwnerId.ToString())
+    
+    @property
+    def user_display_name(self) -> str:
+        """Gets the user display name."""
+        return self._dotnet.UserDisplayName
+    
+    @property
+    def content_id(self) -> UUID:
+        """Gets the ID for the label's content item."""
+        return None if self._dotnet.ContentId is None else UUID(self._dotnet.ContentId.ToString())
+    
+    @property
+    def content_type(self) -> str:
+        """Gets the type for the label's content item."""
+        return self._dotnet.ContentType
+    
+    @property
+    def message(self) -> str:
+        """Gets the message."""
+        return self._dotnet.Message
+    
+    @property
+    def value(self) -> str:
+        """Gets the value."""
+        return self._dotnet.Value
+    
+    @property
+    def category(self) -> str:
+        """Gets the category."""
+        return self._dotnet.Category
+    
+    @property
+    def active(self) -> bool:
+        """Gets the active flag."""
+        return self._dotnet.Active
+    
+    @property
+    def elevated(self) -> bool:
+        """Gets the active flag."""
+        return self._dotnet.Elevated
+    
+    @property
+    def created_at(self) -> str:
+        """Gets the create timestamp."""
+        return self._dotnet.CreatedAt
+    
+    @property
+    def updated_at(self) -> str:
+        """Gets the update timestamp."""
+        return self._dotnet.UpdatedAt
+    
+class PyProject(PyDescriptionContent, PyWithOwner):
+    """Interface for a project content item."""
+    
+    _dotnet_base = IProject
+    
+    def __init__(self, project: IProject) -> None:
+        """Creates a new PyProject object.
+        
+        Args:
+            project: A IProject object.
+        
+        Returns: None.
+        """
+        self._dotnet = project
+        
+    @property
+    def content_permissions(self) -> str:
+        """Gets or sets the content permission mode of the project."""
+        return self._dotnet.ContentPermissions
+    
+    @content_permissions.setter
+    def content_permissions(self, value: str) -> None:
+        """Gets or sets the content permission mode of the project."""
+        self._dotnet.ContentPermissions = value
+    
+    @property
+    def parent_project(self) -> PyContentReference:
+        """Gets the parent project reference, or null if the project is a top-level project. Should be changed through mapping."""
+        return None if self._dotnet.ParentProject is None else PyContentReference(self._dotnet.ParentProject)
+    
+class PyPublishableDataSource(PyDataSourceDetails, PyConnectionsContent):
+    """Interface for a IDataSource that has been downloaded and has full information necessary for re-publishing."""
+    
+    _dotnet_base = IPublishableDataSource
+    
+    def __init__(self, publishable_data_source: IPublishableDataSource) -> None:
+        """Creates a new PyPublishableDataSource object.
+        
+        Args:
+            publishable_data_source: A IPublishableDataSource object.
+        
+        Returns: None.
+        """
+        self._dotnet = publishable_data_source
+        
+class PyPublishableGroup(PyGroup):
+    """Interface for a group content item with users."""
+    
+    _dotnet_base = IPublishableGroup
+    
+    def __init__(self, publishable_group: IPublishableGroup) -> None:
+        """Creates a new PyPublishableGroup object.
+        
+        Args:
+            publishable_group: A IPublishableGroup object.
+        
+        Returns: None.
+        """
+        self._dotnet = publishable_group
+        
+    @property
+    def users(self) -> List[PyGroupUser]:
+        """Gets or sets the users assigned to the group."""
+        return [] if self._dotnet.Users is None else [PyGroupUser(x) for x in self._dotnet.Users if x is not None]
+    
+    @users.setter
+    def users(self, value: List[PyGroupUser]) -> None:
+        """Gets or sets the users assigned to the group."""
+        if value is None:
+            self._dotnet.Users = DotnetList[IGroupUser]()
+        else:
+            dotnet_collection = DotnetList[IGroupUser]()
+            for x in filter(None,value):
+                dotnet_collection.Add(x._dotnet)
+            self._dotnet.Users = dotnet_collection
+    
+class PyWorkbook(PyPublishedContent, PyDescriptionContent, PyExtractContent, PyWithTags, PyContainerContent, PyWithOwner):
+    """Interface for a workbook content item."""
+    
+    _dotnet_base = IWorkbook
+    
+    def __init__(self, workbook: IWorkbook) -> None:
+        """Creates a new PyWorkbook object.
+        
+        Args:
+            workbook: A IWorkbook object.
+        
+        Returns: None.
+        """
+        self._dotnet = workbook
+        
+    @property
+    def show_tabs(self) -> bool:
+        """Gets or sets whether tabs are shown."""
+        return self._dotnet.ShowTabs
+    
+    @show_tabs.setter
+    def show_tabs(self, value: bool) -> None:
+        """Gets or sets whether tabs are shown."""
+        self._dotnet.ShowTabs = value
+    
+    @property
+    def size(self) -> int:
+        """Gets the file size."""
+        return self._dotnet.Size
+    
+class PyView(PyWithTags, PyContentReference):
+    """Interface for view associated with the content item."""
+    
+    _dotnet_base = IView
+    
+    def __init__(self, view: IView) -> None:
+        """Creates a new PyView object.
+        
+        Args:
+            view: A IView object.
+        
+        Returns: None.
+        """
+        self._dotnet = view
+        
+class PyWorkbookDetails(PyWorkbook):
+    """Interface for a workbook object with extended information, from a GET query for example."""
+    
+    _dotnet_base = IWorkbookDetails
+    
+    def __init__(self, workbook_details: IWorkbookDetails) -> None:
+        """Creates a new PyWorkbookDetails object.
+        
+        Args:
+            workbook_details: A IWorkbookDetails object.
+        
+        Returns: None.
+        """
+        self._dotnet = workbook_details
+        
+    @property
+    def views(self) -> Sequence[PyView]:
+        """Gets the view metadata."""
+        return None if self._dotnet.Views is None else list((None if x is None else PyView(x)) for x in self._dotnet.Views)
+    
+class PyPublishableWorkbook(PyWorkbookDetails, PyConnectionsContent):
+    """Interface for an IWorkbook that has been downloaded and has full information necessary for re-publishing."""
+    
+    _dotnet_base = IPublishableWorkbook
+    
+    def __init__(self, publishable_workbook: IPublishableWorkbook) -> None:
+        """Creates a new PyPublishableWorkbook object.
+        
+        Args:
+            publishable_workbook: A IPublishableWorkbook object.
+        
+        Returns: None.
+        """
+        self._dotnet = publishable_workbook
+        
+    @property
+    def thumbnails_user_id(self) -> UUID:
+        """Gets the ID of the user to generate thumbnails as."""
+        return None if self._dotnet.ThumbnailsUserId is None else UUID(self._dotnet.ThumbnailsUserId.ToString())
+    
+    @thumbnails_user_id.setter
+    def thumbnails_user_id(self, value: UUID) -> None:
+        """Gets the ID of the user to generate thumbnails as."""
+        self._dotnet.ThumbnailsUserId = None if value is None else Guid.Parse(str(value))
+    
+    @property
+    def hidden_view_names(self) -> Sequence[str]:
+        """Gets the names of the views that should be hidden."""
+        return [] if self._dotnet.HiddenViewNames is None else [x for x in self._dotnet.HiddenViewNames if x is not None]
+    
+    @hidden_view_names.setter
+    def hidden_view_names(self, value: Sequence[str]) -> None:
+        """Gets the names of the views that should be hidden."""
+        if value is None:
+            self._dotnet.HiddenViewNames = DotnetHashSet[String]()
+        else:
+            dotnet_collection = DotnetHashSet[String]()
+            for x in filter(None,value):
+                dotnet_collection.Add(x)
+            self._dotnet.HiddenViewNames = dotnet_collection
+    
+class PyUser(PyUsernameContent):
+    """Interface for a user content item."""
+    
+    _dotnet_base = IUser
+    
+    def __init__(self, user: IUser) -> None:
+        """Creates a new PyUser object.
+        
+        Args:
+            user: A IUser object.
+        
+        Returns: None.
+        """
+        self._dotnet = user
+        
+    @property
+    def full_name(self) -> str:
+        """Gets or sets the full name of the user."""
+        return self._dotnet.FullName
+    
+    @full_name.setter
+    def full_name(self, value: str) -> None:
+        """Gets or sets the full name of the user."""
+        self._dotnet.FullName = value
+    
+    @property
+    def email(self) -> str:
+        """Gets or sets the email of the user."""
+        return self._dotnet.Email
+    
+    @email.setter
+    def email(self, value: str) -> None:
+        """Gets or sets the email of the user."""
+        self._dotnet.Email = value
+    
+    @property
+    def site_role(self) -> str:
+        """Gets or sets the site role of the user."""
+        return self._dotnet.SiteRole
+    
+    @site_role.setter
+    def site_role(self, value: str) -> None:
+        """Gets or sets the site role of the user."""
+        self._dotnet.SiteRole = value
+    
+    @property
+    def authentication_type(self) -> str:
+        """Gets or sets the authentication type of the user, or null to not send an explicit authentication type for the user during migration."""
+        return self._dotnet.AuthenticationType
+    
+    @authentication_type.setter
+    def authentication_type(self, value: str) -> None:
+        """Gets or sets the authentication type of the user, or null to not send an explicit authentication type for the user during migration."""
+        self._dotnet.AuthenticationType = value
+    
+    @property
+    def administrator_level(self) -> str:
+        """Gets the user's administrator level derived from SiteRole."""
+        return self._dotnet.AdministratorLevel
+    
+    @property
+    def license_level(self) -> str:
+        """Gets the user's license level derived from SiteRole."""
+        return self._dotnet.LicenseLevel
+    
+    @property
+    def can_publish(self) -> bool:
+        """Gets the user's publish capability derived from SiteRole."""
+        return self._dotnet.CanPublish
+    
+
+# endregion
+
diff --git a/src/Python/src/tableau_migration/migration_content_permissions.py b/src/Python/src/tableau_migration/migration_content_permissions.py
new file mode 100644
index 0000000..3f48be4
--- /dev/null
+++ b/src/Python/src/tableau_migration/migration_content_permissions.py
@@ -0,0 +1,154 @@
+# Copyright (c) 2024, Salesforce, Inc.
+# SPDX-License-Identifier: Apache-2
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Wrapper for classes in Tableau.Migration.Content.Permissions namespace."""
+
+# region _generated
+
+from enum import IntEnum # noqa: E402, F401
+from typing import (  # noqa: E402, F401
+    Set,
+    Sequence
+)
+from uuid import UUID # noqa: E402, F401
+
+from System import Guid # noqa: E402, F401
+from System.Collections.Generic import (  # noqa: E402, F401
+    HashSet as DotnetHashSet,
+    List as DotnetList
+)
+from Tableau.Migration.Content.Permissions import (  # noqa: E402, F401
+    ICapability,
+    IGranteeCapability,
+    IPermissions
+)
+
+class PyCapability():
+    """The interface for a grantee's capability."""
+    
+    _dotnet_base = ICapability
+    
+    def __init__(self, capability: ICapability) -> None:
+        """Creates a new PyCapability object.
+        
+        Args:
+            capability: A ICapability object.
+        
+        Returns: None.
+        """
+        self._dotnet = capability
+        
+    @property
+    def name(self) -> str:
+        """The capability name from PermissionsCapabilityNames."""
+        return self._dotnet.Name
+    
+    @property
+    def mode(self) -> str:
+        """The capability mode from PermissionsCapabilityModes."""
+        return self._dotnet.Mode
+    
+class PyGranteeType(IntEnum):
+    """Enum of grantee types."""
+    
+    """The group grantee type."""
+    GROUP = 0
+    
+    """The user grantee type."""
+    USER = 1
+    
+class PyGranteeCapability():
+    """Interface for the grantee of permissions."""
+    
+    _dotnet_base = IGranteeCapability
+    
+    def __init__(self, grantee_capability: IGranteeCapability) -> None:
+        """Creates a new PyGranteeCapability object.
+        
+        Args:
+            grantee_capability: A IGranteeCapability object.
+        
+        Returns: None.
+        """
+        self._dotnet = grantee_capability
+        
+    @property
+    def grantee_type(self) -> PyGranteeType:
+        """Indicates the type of grantee."""
+        return None if self._dotnet.GranteeType is None else PyGranteeType(self._dotnet.GranteeType.value__)
+    
+    @property
+    def grantee_id(self) -> UUID:
+        """The Id for the User or Group grantee."""
+        return None if self._dotnet.GranteeId is None else UUID(self._dotnet.GranteeId.ToString())
+    
+    @grantee_id.setter
+    def grantee_id(self, value: UUID) -> None:
+        """The Id for the User or Group grantee."""
+        self._dotnet.GranteeId = None if value is None else Guid.Parse(str(value))
+    
+    @property
+    def capabilities(self) -> Set[PyCapability]:
+        """The collection of capabilities of the grantee."""
+        return [] if self._dotnet.Capabilities is None else [PyCapability(x) for x in self._dotnet.Capabilities if x is not None]
+    
+    def resolve_capability_mode_conflicts(self) -> None:
+        """Resolves Deny in case of conflict."""
+        self._dotnet.ResolveCapabilityModeConflicts()
+    
+class PyPermissions():
+    """The interface for content permissions responses."""
+    
+    _dotnet_base = IPermissions
+    
+    def __init__(self, permissions: IPermissions) -> None:
+        """Creates a new PyPermissions object.
+        
+        Args:
+            permissions: A IPermissions object.
+        
+        Returns: None.
+        """
+        self._dotnet = permissions
+        
+    @property
+    def grantee_capabilities(self) -> Sequence[PyGranteeCapability]:
+        """The collection of Grantee Capabilities for this content item."""
+        return None if self._dotnet.GranteeCapabilities is None else list((None if x is None else PyGranteeCapability(x)) for x in self._dotnet.GranteeCapabilities)
+    
+    @grantee_capabilities.setter
+    def grantee_capabilities(self, value: Sequence[PyGranteeCapability]) -> None:
+        """The collection of Grantee Capabilities for this content item."""
+        if value is None:
+            self._dotnet.GranteeCapabilities = DotnetList[IGranteeCapability]()
+        else:
+            dotnet_collection = DotnetList[IGranteeCapability]()
+            for x in filter(None,value):
+                dotnet_collection.Add(x._dotnet)
+            self._dotnet.GranteeCapabilities = dotnet_collection.ToArray()
+    
+    @property
+    def parent_id(self) -> UUID:
+        """The ID of the parent content item The parent content can be one of the types in ParentContentTypeNames."""
+        return None if self._dotnet.ParentId is None else UUID(self._dotnet.ParentId.ToString())
+    
+    @parent_id.setter
+    def parent_id(self, value: UUID) -> None:
+        """The ID of the parent content item The parent content can be one of the types in ParentContentTypeNames."""
+        self._dotnet.ParentId = None if value is None else Guid.Parse(str(value))
+    
+
+# endregion
+
diff --git a/src/Python/src/tableau_migration/migration_engine.py b/src/Python/src/tableau_migration/migration_engine.py
index 55da554..342c584 100644
--- a/src/Python/src/tableau_migration/migration_engine.py
+++ b/src/Python/src/tableau_migration/migration_engine.py
@@ -14,30 +14,31 @@
 # limitations under the License.
 
 """Wrapper for classes in Tableau.Migration.Engine namespace."""
+from inspect import isclass
+from typing import Union, Callable
 from typing_extensions import Self
 from uuid import UUID
 
-import tableau_migration.migration
-from tableau_migration.migration import(
-    PyResult)
-from tableau_migration.migration_engine_hooks import PyMigrationHookBuilder
+from tableau_migration.migration import (
+    get_service_provider,
+    get_service
+)
+from tableau_migration.migration import PyResult
+from tableau_migration.migration_engine_hooks import PyMigrationHookBuilder, PyMigrationHookFactoryCollection
 from tableau_migration.migration_engine_hooks_filters import PyContentFilterBuilder
 from tableau_migration.migration_engine_hooks_mappings import PyContentMappingBuilder
 from tableau_migration.migration_engine_hooks_transformers import PyContentTransformerBuilder
 from tableau_migration.migration_engine_options import PyMigrationPlanOptionsBuilder
 
-from tableau_migration.migration_engine_options import (
-    PyMigrationPlanOptionsCollection,
-)
+from tableau_migration.migration_engine_options import PyMigrationPlanOptionsCollection
 
+from System import Func, IServiceProvider, Uri
 from Tableau.Migration import (
     IMigrationPlanBuilder, 
     IMigrationPlan, 
-    IServerToCloudMigrationPlanBuilder)
-
-from Tableau.Migration.Engine.Endpoints import(
-    IMigrationPlanEndpointConfiguration)
-from System import Uri
+    IServerToCloudMigrationPlanBuilder
+)
+from Tableau.Migration.Engine.Endpoints import IMigrationPlanEndpointConfiguration
 
 class PyMigrationPlan():
     """Default IMigrationPlan implementation."""
@@ -83,24 +84,24 @@ def destination(self):
         return self._migration_plan.Destination # TODO: IMigrationPlanEndpointConfiguration needs python wrapper
 
     @property
-    def hooks(self):
+    def hooks(self) -> PyMigrationHookFactoryCollection:
         """Gets the collection of registered hooks for each hook type."""
-        return PyMigrationPlanOptionsCollection(self._migration_plan.Hooks)
+        return PyMigrationHookFactoryCollection(self._migration_plan.Hooks)
     
     @property
-    def mappings(self):
+    def mappings(self) -> PyMigrationHookFactoryCollection:
         """Gets the collection of registered mappings for each content type."""
-        return PyMigrationPlanOptionsCollection(self._migration_plan.Mappings)
+        return PyMigrationHookFactoryCollection(self._migration_plan.Mappings)
     
     @property
-    def filters(self):
+    def filters(self) -> PyMigrationHookFactoryCollection:
         """Gets the collection of registered filters for each content type."""
-        return PyMigrationPlanOptionsCollection(self._migration_plan.Filters)
+        return PyMigrationHookFactoryCollection(self._migration_plan.Filters)
     
     @property
-    def transformers(self):
+    def transformers(self) -> PyMigrationHookFactoryCollection:
         """Gets the collection of registered transformers for each content type."""
-        return PyMigrationPlanOptionsCollection(self._migration_plan.Transformers)
+        return PyMigrationHookFactoryCollection(self._migration_plan.Transformers)
  
 class PyServerToCloudMigrationPlanBuilder():
     """Default IServerToCloudMigrationPlanBuilder implementation."""
@@ -285,19 +286,31 @@ def with_authentication_type(self, authentication_type: str, input_1, group_doma
             self._plan_builder.WithAuthenticationType(authentication_type, input_1)
         return self
 
-    def with_tableau_cloud_usernames(self, input_0, use_existing_email: bool = True) -> Self:
+    def with_tableau_cloud_usernames(self, input_0: Union[type, Callable, str], use_existing_email: bool = True) -> Self:
         """Adds an object to map usernames to be in the form of an email.
 
         Args:
-            input_0: Either 1) A domain name to use to build email usernames for users that lack emails, generated as "{username}@{input_0}", or 2) the mapping to execute.
-            use_existing_email: Whether or not existing user emails should be used when available, defaults to true. Not used when input_0 is a mapping object.
+            input_0: Either: 
+                1) The mapping type to execute, or
+                2) The callback function to execute, or
+                3) A string for a domain name to use to build email usernames for users that lack emails. Usernames will be generated as "{username}@{input_0}".
+            use_existing_email: Whether or not existing user emails should be used when available, defaults to true. Not used when input_0 is not a string.
 
         Returns: The same plan builder object for fluent API calls.
         """
         if isinstance(input_0, str):
             self._plan_builder.WithTableauCloudUsernames(input_0, use_existing_email)
         else:
-            self._plan_builder.WithTableauCloudUsernames(input_0)
+            from migration_content import PyUser
+            from migration_engine_hooks_mappings_interop import _PyTableauCloudUsernameMappingWrapper
+
+            if isclass(input_0):
+                wrapper = _PyTableauCloudUsernameMappingWrapper(input_0)
+            else:
+                wrapper = _PyTableauCloudUsernameMappingWrapper([PyUser], input_0)
+            
+            self._plan_builder.WithTableauCloudUsernames[wrapper.wrapper_type](Func[IServiceProvider, wrapper.wrapper_type](wrapper.factory))
+
         return self
 
 class PyMigrationPlanBuilder():
@@ -310,8 +323,8 @@ def __init__(self) -> None:
         
         Returns: None.
         """
-        self._services = tableau_migration.migration.get_service_provider()
-        self._plan_builder = tableau_migration.migration.get_service(self._services, IMigrationPlanBuilder)
+        self._services = get_service_provider()
+        self._plan_builder = get_service(self._services, IMigrationPlanBuilder)
         self._hooks = PyMigrationHookBuilder(self._plan_builder.Hooks)
         self._filters = PyContentFilterBuilder(self._plan_builder.Filters)
         self._mappings = PyContentMappingBuilder(self._plan_builder.Mappings)
@@ -431,3 +444,44 @@ def validate(self) -> PyResult:
         Returns: The validation result.
         """
         return PyResult(self._plan_builder.Validate())
+# region _generated
+
+from tableau_migration.migration import _generic_wrapper # noqa: E402, F401
+from tableau_migration.migration_engine_manifest import PyMigrationManifestEntryEditor # noqa: E402, F401
+from typing import (  # noqa: E402, F401
+    Generic,
+    TypeVar
+)
+
+from Tableau.Migration.Engine import ContentMigrationItem # noqa: E402, F401
+
+TContent = TypeVar("TContent")
+
+class PyContentMigrationItem(Generic[TContent]):
+    """Record containing in-progress migration state for a content item."""
+    
+    _dotnet_base = ContentMigrationItem
+    
+    def __init__(self, content_migration_item: ContentMigrationItem) -> None:
+        """Creates a new PyContentMigrationItem object.
+        
+        Args:
+            content_migration_item: A ContentMigrationItem object.
+        
+        Returns: None.
+        """
+        self._dotnet = content_migration_item
+        
+    @property
+    def source_item(self) -> TContent:
+        """The content item's source data."""
+        return None if self._dotnet.SourceItem is None else _generic_wrapper(self._dotnet.SourceItem)
+    
+    @property
+    def manifest_entry(self) -> PyMigrationManifestEntryEditor:
+        """The manifest entry that describes the content item's overall migration status."""
+        return None if self._dotnet.ManifestEntry is None else PyMigrationManifestEntryEditor(self._dotnet.ManifestEntry)
+    
+
+# endregion
+
diff --git a/src/Python/src/tableau_migration/migration_engine_actions.py b/src/Python/src/tableau_migration/migration_engine_actions.py
new file mode 100644
index 0000000..fe5a8d4
--- /dev/null
+++ b/src/Python/src/tableau_migration/migration_engine_actions.py
@@ -0,0 +1,58 @@
+# Copyright (c) 2024, Salesforce, Inc.
+# SPDX-License-Identifier: Apache-2
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Wrapper for classes in Tableau.Migration.Engine.Actions namespace."""
+
+# region _generated
+
+from tableau_migration.migration import PyResult # noqa: E402, F401
+from typing_extensions import Self # noqa: E402, F401
+
+from Tableau.Migration.Engine.Actions import IMigrationActionResult # noqa: E402, F401
+
+class PyMigrationActionResult(PyResult):
+    """IResult object for a migration action."""
+    
+    _dotnet_base = IMigrationActionResult
+    
+    def __init__(self, migration_action_result: IMigrationActionResult) -> None:
+        """Creates a new PyMigrationActionResult object.
+        
+        Args:
+            migration_action_result: A IMigrationActionResult object.
+        
+        Returns: None.
+        """
+        self._dotnet = migration_action_result
+        
+    @property
+    def perform_next_action(self) -> bool:
+        """Gets whether or not to perform the next action in the pipeline."""
+        return self._dotnet.PerformNextAction
+    
+    def for_next_action(self, perform_next_action: bool) -> Self:
+        """Creates a new PerformNextAction value.
+        
+        Args:
+            perform_next_action: Whether or not to perform the next action in the pipeline.
+        
+        Returns: The new IMigrationActionResult object.
+        """
+        result = self._dotnet.ForNextAction(perform_next_action)
+        return None if result is None else PyMigrationActionResult(result)
+    
+
+# endregion
+
diff --git a/src/Python/src/tableau_migration/migration_engine_endpoints_search.py b/src/Python/src/tableau_migration/migration_engine_endpoints_search.py
new file mode 100644
index 0000000..b8d5060
--- /dev/null
+++ b/src/Python/src/tableau_migration/migration_engine_endpoints_search.py
@@ -0,0 +1,268 @@
+# Copyright (c) 2024, Salesforce, Inc.
+# SPDX-License-Identifier: Apache-2
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Wrapper for classes in Tableau.Migration.Engine.Endpoints.Search namespace."""
+
+from tableau_migration import (
+    cancellation_token
+)
+from tableau_migration.migration import (
+    PyContentLocation,
+    PyContentReference
+)
+
+from Tableau.Migration.Engine.Endpoints.Search import (
+    IDestinationContentReferenceFinder,
+    ISourceContentReferenceFinder,
+    ManifestDestinationContentReferenceFinderFactory,
+    ManifestSourceContentReferenceFinderFactory
+)
+
+from Tableau.Migration import (
+    IContentReference,
+    TaskExtensions
+)
+
+from System import Guid
+
+from typing import (
+    Generic,
+    TypeVar,
+    Type
+)
+
+from uuid import UUID
+
+TContent = TypeVar("TContent")
+
+class PyDestinationContentReferenceFinder(Generic[TContent]):
+    """Interface for an object that can find destination content reference for given content information, applying mapping rules."""
+    
+    _dotnet_base = IDestinationContentReferenceFinder
+    
+    def __init__(self, destination_content_reference_finder: IDestinationContentReferenceFinder, t: Type[TContent]) -> None:
+        """Creates a new PyDestinationContentReferenceFinder object.
+        
+        Args:
+            destination_content_reference_finder: A ISyncDestinationContentReferenceFinder object.
+            t: The content type.
+        
+        Returns: None.
+        """
+        self._dotnet = destination_content_reference_finder
+        self._content_type = t
+        
+    def find_by_source_location(self, source_location: PyContentLocation, cancel = None) -> PyContentReference:
+        """Finds the destination content reference for the source content reference location.
+        
+        Args:
+            source_location: The source content reference location.
+            cancel: A cancellation token to obey.
+        
+        Returns: The found destination content reference, or None if no content reference was found.
+        """
+        if source_location is None:
+            return None
+        
+        if cancel is None:
+            cancel = cancellation_token
+
+        result = TaskExtensions.AwaitResult[IContentReference](self._dotnet.FindBySourceLocationAsync(source_location._dotnet, cancel))
+        return None if result is None else PyContentReference(result)
+    
+    def find_by_mapped_location(self, mapped_location: PyContentLocation, cancel = None) -> PyContentReference:
+        """Finds the destination content reference for the mapped destination content reference location.
+        
+        Args:
+            mapped_location: The destination mapped content reference location.
+            cancel: A cancellation token to obey.
+        
+        Returns: The found destination content reference, or None if no content reference was found.
+        """
+        if mapped_location is None:
+            return None
+        
+        if cancel is None:
+            cancel = cancellation_token
+
+        result = TaskExtensions.AwaitResult[IContentReference](self._dotnet.FindByMappedLocationAsync(mapped_location._dotnet, cancel))
+        return None if result is None else PyContentReference(result)
+    
+    def find_by_source_id(self, source_id: UUID, cancel = None) -> PyContentReference:
+        """Finds the destination content reference for the source content reference unique identifier.
+        
+        Args:
+            source_id: The source content reference unique identifier.
+            cancel: A cancellation token to obey.
+        
+        Returns: The found destination content reference, or None if no content reference was found.
+        """
+        if source_id is None:
+            return None
+        
+        if cancel is None:
+            cancel = cancellation_token
+
+        result = TaskExtensions.AwaitResult[IContentReference](self._dotnet.FindBySourceIdAsync(Guid.Parse(str(source_id)), cancel))
+        return None if result is None else PyContentReference(result)
+    
+    def find_by_id(self, id: UUID, cancel = None) -> PyContentReference:
+        """Finds the content reference by its unique identifier.
+        
+        Args:
+            id: The unique identifier.
+            cancel: A cancellation token to obey.
+        
+        Returns: The found content reference, or None if no content reference was found.
+        """
+        if id is None:
+            return None
+        
+        if cancel is None:
+            cancel = cancellation_token
+
+        result = TaskExtensions.AwaitResult[IContentReference](self._dotnet.FindByIdAsync(Guid.Parse(str(id)), cancel))
+        return None if result is None else PyContentReference(result)
+    
+    def find_by_source_content_url(self, source_content_url: str, cancel = None) -> PyContentReference:
+        """Finds the destination content reference for the source content reference URL.
+        
+        Args:
+            source_content_url: The source content reference URL.
+            cancel: A cancellation token to obey.
+        
+        Returns: The found destination content reference, or None if no content reference was found.
+        """
+        if source_content_url is None or not source_content_url.strip():
+            return None
+
+        if cancel is None:
+            cancel = cancellation_token
+
+        result = TaskExtensions.AwaitResult[IContentReference](self._dotnet.FindBySourceContentUrlAsync(source_content_url.strip(), cancel))
+        return None if result is None else PyContentReference(result)
+    
+class PySourceContentReferenceFinder(Generic[TContent]):
+    """Interface for an object that can find source content reference."""
+    
+    _dotnet_base = ISourceContentReferenceFinder
+    
+    def __init__(self, source_content_reference_finder: ISourceContentReferenceFinder, t: Type[TContent]) -> None:
+        """Creates a new PySourceContentReferenceFinder object.
+        
+        Args:
+            source_content_reference_finder: A ISyncSourceContentReferenceFinder object.
+            t: The content type.
+        
+        Returns: None.
+        """
+        self._dotnet = source_content_reference_finder
+        self._content_type = t
+
+    def find_by_source_location(self, source_location: PyContentLocation, cancel = None) -> PyContentReference:
+        """Finds the source content reference for the source content reference location.
+        
+        Args:
+            source_location: The source content reference location.
+            cancel: A cancellation token to obey.
+        
+        Returns: The found source content reference, or None if no content reference was found.
+        """
+        if source_location is None:
+            return None
+        
+        if cancel is None:
+            cancel = cancellation_token
+
+        result = TaskExtensions.AwaitResult[IContentReference](self._dotnet.FindBySourceLocationAsync(source_location._dotnet, cancel))
+        return None if result is None else PyContentReference(result)
+    
+    def find_by_id(self, id: UUID, cancel = None) -> PyContentReference:
+        """Finds the content reference by its unique identifier.
+        
+        Args:
+            id: The unique identifier.
+            cancel: A cancellation token to obey.
+        
+        Returns: The found content reference, or None if no content reference was found.
+        """
+        if id is None:
+            return None
+        
+        if cancel is None:
+            cancel = cancellation_token
+
+        result = TaskExtensions.AwaitResult[IContentReference](self._dotnet.FindByIdAsync(Guid.Parse(str(id)), cancel))
+        return None if result is None else PyContentReference(result)
+        
+class PyDestinationContentReferenceFinderFactory():
+    """Interface for an object that can create destination content reference finders based on content type."""
+    
+    _dotnet_base = ManifestDestinationContentReferenceFinderFactory
+    
+    def __init__(self, destination_content_reference_finder_factory: ManifestDestinationContentReferenceFinderFactory) -> None:
+        """Creates a new PyDestinationContentReferenceFinderFactory object.
+        
+        Args:
+            destination_content_reference_finder_factory: A ManifestDestinationContentReferenceFinderFactory object.
+        
+        Returns: None.
+        """
+        self._dotnet = destination_content_reference_finder_factory
+        
+    def for_destination_content_type(self, t: Type[TContent]) -> PyDestinationContentReferenceFinder[TContent]:
+        """Gets or creates a destination content reference finder for a given content type.
+        
+        Returns: The content reference finder.
+        """
+        try:
+            if not hasattr(t, "_dotnet_base"):
+                return None
+
+            result = self._dotnet.ForDestinationContentType[t._dotnet_base]()
+            return PyDestinationContentReferenceFinder[t](result, t)
+        except Exception:
+            return None
+
+class PySourceContentReferenceFinderFactory():
+    """Interface for an object that can create source content reference finders based on content type."""
+    
+    _dotnet_base = ManifestSourceContentReferenceFinderFactory
+    
+    def __init__(self, source_content_reference_finder_factory: ManifestSourceContentReferenceFinderFactory) -> None:
+        """Creates a new PySourceContentReferenceFinderFactory object.
+        
+        Args:
+            source_content_reference_finder_factory: A ManifestSourceContentReferenceFinderFactory object.
+        
+        Returns: None.
+        """
+        self._dotnet = source_content_reference_finder_factory
+        
+    def for_source_content_type(self, t: Type[TContent]):
+        """Gets or creates a source content reference finder for a given content type.
+        
+        Returns: The content reference finder.
+        """
+        try:
+            if not hasattr(t, "_dotnet_base"):
+                return None
+
+            result = self._dotnet.ForSourceContentType[t._dotnet_base]()
+            return PySourceContentReferenceFinder[t](result, t)
+        except Exception:
+            return None
+
+
diff --git a/src/Python/src/tableau_migration/migration_engine_hooks.py b/src/Python/src/tableau_migration/migration_engine_hooks.py
index 7d8b157..0cc8128 100644
--- a/src/Python/src/tableau_migration/migration_engine_hooks.py
+++ b/src/Python/src/tableau_migration/migration_engine_hooks.py
@@ -14,9 +14,11 @@
 # limitations under the License.
 
 """Wrapper for classes in Tableau.Migration.Engine.Hooks namespace."""
+
 from inspect import isclass
-from typing import Type, TypeVar
+from typing import Callable, get_args, get_origin, Type, TypeVar, Union
 from typing_extensions import Self
+
 from System import Func, IServiceProvider
 from Tableau.Migration.Engine.Hooks import IMigrationHookBuilder, IMigrationHookFactoryCollection
 
@@ -47,6 +49,25 @@ def get_hooks(self, type_to_get: Type[T]):
         """
         return self._migration_hook_factory_collection.GetHooks[type_to_get]()
 
+def _get_wrapper_from_callback_context(t: type) -> type:
+    from migration_engine_actions import PyMigrationActionResult
+    from migration_engine_hooks_interop import _PyMigrationActionCompletedHookWrapper, _PyContentBatchMigrationCompletedHookWrapper
+    from migration_engine_hooks_postpublish import PyBulkPostPublishContext, PyContentItemPostPublishContext
+    from migration_engine_hooks_postpublish_interop import _PyBulkPostPublishHookWrapper, _PyContentItemPostPublishHookWrapper
+    from migration_engine_migrators_batch import PyContentBatchMigrationResult
+
+    types = {
+        PyBulkPostPublishContext.__name__: _PyBulkPostPublishHookWrapper,
+        PyContentBatchMigrationResult.__name__: _PyContentBatchMigrationCompletedHookWrapper,
+        PyContentItemPostPublishContext.__name__: _PyContentItemPostPublishHookWrapper,
+        PyMigrationActionResult.__name__: _PyMigrationActionCompletedHookWrapper
+    }
+
+    if t.__name__ not in types:
+        return None
+
+    return types[t.__name__]
+
 class PyMigrationHookBuilder():
     """Default IMigrationHookBuilder implementation."""
 
@@ -72,35 +93,30 @@ def clear(self) -> Self:
         self._migration_hook_builder.Clear()
         return self
 
-
-    def add(self,input_0,input_1=None,input_2=None) -> Self:
-        """Adds a an object to execute one or more hooks.
+    
+    def add(self, input_0: type, input_1: Union[Callable, None] = None) -> Self:
+        """Adds an object or function to execute hooks.
 
         Args:
             input_0: Either: 
-                1) The hook to execute, or;
-                2) The hook type to execute, or;
-                3) The hook type to execute, or;
+                1) The hook type to execute, or
+                2) The hook context type for a callback function
             input_1: Either:
-                1) None, or;
-                2) None, or the function to resolve the type by using the service provider, or;
-                3) The context type for a callback function;
-            input_2: Either:
-                1) None, or;
-                2) None, or;
-                3) The callback function that will return the context type;
+                1) The callback function to execute, or
+                2) None
 
         Returns:
-            The same hook builder object for fluent API calls.
+            The same mapping builder object for fluent API calls.
         """
-        if isclass(input_0) and input_1 is None:
-            self._migration_hook_builder.Add[input_0]()
-        elif isclass(input_0) and input_1 is not None and isinstance(input_1,Func[IServiceProvider, input_0]):
-            self._migration_hook_builder.Add[input_0](input_1)
-        elif isclass(input_0) and input_1 is not None and isclass(input_1) and input_2 is not None and isinstance(input_2,Func[input_1, input_1]):
-            self._migration_hook_builder.Add[input_0,input_1](input_2)
+        if input_1 is None:
+            wrapper = input_0._wrapper(input_0)
         else:
-            self._migration_hook_builder.Add(input_0)
+            t = input_0 if isclass(input_0) else get_origin(input_0)
+            wrap_type = _get_wrapper_from_callback_context(t)
+            wrapper = wrap_type(list(get_args(input_0)), input_1)
+        
+        self._migration_hook_builder.Add[wrapper.wrapper_type](Func[IServiceProvider, wrapper.wrapper_type](wrapper.factory))
+
         return self
 
 
diff --git a/src/Python/src/tableau_migration/migration_engine_hooks_filters.py b/src/Python/src/tableau_migration/migration_engine_hooks_filters.py
index bf3950b..e981929 100644
--- a/src/Python/src/tableau_migration/migration_engine_hooks_filters.py
+++ b/src/Python/src/tableau_migration/migration_engine_hooks_filters.py
@@ -14,11 +14,11 @@
 # limitations under the License.
 
 """Wrapper for classes in Tableau.Migration.Engine.Hooks.Filters namespace."""
-from inspect import isclass
+
+from typing import  Callable, Union
 from typing_extensions import Self
+
 from System import IServiceProvider, Func
-from System.Collections.Generic import IEnumerable
-from Tableau.Migration.Engine import ContentMigrationItem
 from Tableau.Migration.Engine.Hooks.Filters import IContentFilterBuilder
 from tableau_migration.migration_engine_hooks import PyMigrationHookFactoryCollection
 
@@ -48,36 +48,26 @@ def clear(self) -> Self:
         return self
 
 
-    def add(self,input_0,input_1,input_2=None) -> Self:
-        """Adds a an object to execute one or more filters.
+    def add(self, input_0: type, input_1: Union[Callable, None] = None) -> Self:
+        """Adds an object or function to execute filters.
 
         Args:
             input_0: Either: 
-                1) The content type linked to the filter, or;
-                2) The filter type to execute, or;
-                3) The content type for a callback function;
+                1) The filter type to execute, or
+                2) The content type for a callback function
             input_1: Either:
-                1) The filter to execute, or;
-                2) The content type linked to the filter, or;
-                3) The callback function that will return the content type;
-            input_2: Either:
-                1) None, or;
-                2) None, or the function to resolve the filter type by using the service provider, or;
-                3) None;
+                1) The callback function to execute, or
+                2) None
 
         Returns:
-            The same filter builder object for fluent API calls.
+            The same mapping builder object for fluent API calls.
         """
-        if isclass(input_0) and isclass(input_1) and input_2 is None:
-            self._content_filters_builder.Add[input_0,input_1]()
-        elif isclass(input_0) and isclass(input_1) and input_2 is not None and isinstance(input_2,Func[IServiceProvider, input_0]):
-            self._content_filters_builder.Add[input_0,input_1](input_2)
-        elif isclass(input_0) and isinstance(input_1,Func[IEnumerable[ContentMigrationItem[input_0]], IEnumerable[ContentMigrationItem[input_0]]]):
-            self._content_filters_builder.Add[input_0](input_1)
-        else:
-            self._content_filters_builder.Add[input_0](input_1)
-        return self
+        from migration_engine_hooks_filters_interop import _PyFilterWrapper
+        
+        wrapper = _PyFilterWrapper(input_0, input_1)
+        self._content_filters_builder.Add[wrapper.wrapper_type, wrapper.dotnet_content_type](Func[IServiceProvider, wrapper.wrapper_type](wrapper.factory))
     
+        return self
 
     def by_content_type(self):
         """Gets the currently registered hook factories by their content types.
diff --git a/src/Python/src/tableau_migration/migration_engine_hooks_filters_interop.py b/src/Python/src/tableau_migration/migration_engine_hooks_filters_interop.py
new file mode 100644
index 0000000..77eea73
--- /dev/null
+++ b/src/Python/src/tableau_migration/migration_engine_hooks_filters_interop.py
@@ -0,0 +1,71 @@
+# Copyright (c) 2024, Salesforce, Inc.
+# SPDX-License-Identifier: Apache-2
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Interoperability utility for filters."""
+
+from typing import Callable, Generic, TypeVar
+
+from migration_engine import PyContentMigrationItem
+from migration_engine_hooks_interop import _PyHookWrapperBase
+
+from Tableau.Migration.Engine import ContentMigrationItem
+from Tableau.Migration.Engine.Hooks.Filters import ContentFilterBase
+
+TContent = TypeVar("TContent")
+
+class PyContentFilterBase(Generic[TContent]):
+    """Generic base class for filters."""
+
+    def should_migrate(self, item: PyContentMigrationItem[TContent]) -> bool:
+        """Checks if the item should be migrated.
+        
+        Args:
+            item: The item to evaluate.
+            
+        Returns:
+            True if the item should be migrated.
+        """
+        return True
+
+class _PyFilterWrapper(_PyHookWrapperBase):
+    
+    @property
+    def python_content_type(self) -> type:
+        return self.python_generic_types[0]
+
+    @property
+    def dotnet_content_type(self) -> type:
+        return self.dotnet_generic_types[0]
+
+    def _wrapper_base_type(self) -> type:
+        return ContentFilterBase[self.dotnet_content_type]
+
+    @property
+    def _wrapper_method_name(self) -> str:
+        return "ShouldMigrate"
+
+    @property
+    def _wrapper_async(self) -> bool:
+        return False
+
+    def _wrapper_context_type(self) -> type:
+        return ContentMigrationItem[self.dotnet_content_type]
+
+    def _wrap_execute_method(self) -> Callable:
+        return lambda w : w._hook.should_migrate
+    
+    def _wrap_context_callback(self) -> Callable:
+        return lambda ctx : PyContentMigrationItem[self.python_content_type](ctx)
+    
\ No newline at end of file
diff --git a/src/Python/src/tableau_migration/migration_engine_hooks_interop.py b/src/Python/src/tableau_migration/migration_engine_hooks_interop.py
new file mode 100644
index 0000000..6f1c835
--- /dev/null
+++ b/src/Python/src/tableau_migration/migration_engine_hooks_interop.py
@@ -0,0 +1,257 @@
+# Copyright (c) 2024, Salesforce, Inc.
+# SPDX-License-Identifier: Apache-2
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Interoperability utility for hooks."""
+
+from abc import ABC, abstractmethod
+from inspect import signature
+from typing import Callable, Generic, get_args, TypeVar, Union
+from uuid import uuid4
+
+from migration_engine_actions import PyMigrationActionResult
+from migration_engine_migrators_batch import PyContentBatchMigrationResult
+
+from System import IServiceProvider
+from System.Threading.Tasks import Task
+from Tableau.Migration.Engine.Actions import IMigrationActionResult
+from Tableau.Migration.Engine.Migrators.Batch import IContentBatchMigrationResult
+from Tableau.Migration.Interop.Hooks import ISyncContentBatchMigrationCompletedHook, ISyncMigrationActionCompletedHook
+
+TContent = TypeVar("TContent")
+
+def _wrapper_init_object(inner_hook_type) -> Callable:
+    from migration_services import ScopedMigrationServices
+    
+    def _init(self, scoped_services: IServiceProvider) -> None:
+        self._hook = inner_hook_type()
+        self._hook.services = ScopedMigrationServices(scoped_services)
+
+    return _init
+
+def _wrapper_init_callback() -> Callable:
+    from migration_services import ScopedMigrationServices
+    
+    def _init(self, scoped_services: IServiceProvider) -> None:
+        self.services = ScopedMigrationServices(scoped_services)
+        
+    return _init
+    
+def _wrapper_create(t: type) -> Callable:
+    def _create(scoped_services: IServiceProvider):
+        return t(scoped_services)
+    
+    return _create
+
+def _unwrap(result):
+    return result._dotnet if hasattr(result, "_dotnet") else result
+
+def _unwrap_async(ctx_type: type, result):
+    dotnet_result = _unwrap(result)
+    return Task.FromResult[ctx_type](dotnet_result)
+
+class _PyHookWrapperBase(ABC):
+
+    @property
+    def _wrapper_method_name(self) -> str:
+        return "ExecuteAsync"
+
+    @property
+    def _wrapper_async(self) -> bool:
+        return True
+
+    def __init__(self, t: Union[type, list], callback: Union[Callable, None] = None) -> None:
+        if callback is None:
+            self.python_generic_types = get_args(t.__orig_bases__[0]) if hasattr(t, "__orig_bases__") else []
+            module = t.__module__
+            init = _wrapper_init_object(t)
+            wrap_type_name = t.__name__ + "_InteropWrapper_" + str(uuid4())
+        else:
+            self.python_generic_types = t if isinstance(t, list) else [t]
+            module = callback.__module__
+            init = _wrapper_init_callback()
+            wrap_type_name = callback.__name__ + "_InteropWrapper_" + str(uuid4())
+
+        self.dotnet_generic_types = [x._dotnet_base for x in self.python_generic_types]
+
+        members = {
+            "__namespace__": module,
+            "__init__": init
+        }
+
+        wrap_context = self._wrap_context_callback()
+
+        if callback is None:
+            members[self._wrapper_method_name] = self.build_wrapper_execute(self._wrap_execute_method(), wrap_context, self._wrapper_context_type(), self._wrapper_async)
+        else:
+            members[self._wrapper_method_name] = self.build_wrapper_execute_callback(callback, wrap_context, self._wrapper_context_type(), self._wrapper_async)
+
+        self.set_extra_wrapper_members(members, wrap_context)
+
+        base_types = (self._wrapper_base_type(),)
+        base_types = self.set_extra_base_types(base_types)
+
+        self.wrapper_type = type(wrap_type_name, base_types, members)
+        self.factory = _wrapper_create(self.wrapper_type)
+        
+    def build_wrapper_execute(self, wrap_method: Callable, wrap_context: Callable, ctx_type: type, is_async: bool) -> Callable:
+        def _execute(s, ctx):
+            result = wrap_method(s)(wrap_context(ctx))
+            return _unwrap(result)
+    
+        def _execute_async(s, ctx, cancel):
+            result = wrap_method(s)(wrap_context(ctx))
+            return _unwrap_async(ctx_type, result)
+
+        return _execute_async if is_async else _execute
+    
+    def build_wrapper_execute_callback(self, callback: Callable, wrap_context: Callable, ctx_type: type, is_async: bool) -> Callable:
+        def _execute(s, ctx):
+            result = callback(wrap_context(ctx))
+            return _unwrap(result)
+
+        def _execute_async(s, ctx, cancel):
+            result = callback(wrap_context(ctx))
+            return _unwrap_async(ctx_type, result)
+
+        def _execute_services(s, ctx):
+            result = callback(wrap_context(ctx), s.services)
+            return _unwrap(result)
+
+        def _execute_services_async(s, ctx, cancel):
+            result = callback(wrap_context(ctx), s.services)
+            return _unwrap_async(ctx_type, result)
+
+        if len(signature(callback).parameters) == 1:
+            return _execute_async if is_async else _execute
+        else:
+            return _execute_services_async if is_async else _execute_services
+
+    def set_extra_wrapper_members(self, members: dict, wrap_context: Callable) -> None:
+        pass
+    
+    def set_extra_base_types(self, types: tuple) -> tuple:
+        return types
+
+    @abstractmethod
+    def _wrapper_base_type(self) -> type:
+        ...
+
+    @abstractmethod
+    def _wrapper_context_type(self) -> type:
+        ...
+        
+    @abstractmethod
+    def _wrap_execute_method(self) -> Callable:
+        ...
+
+    @abstractmethod
+    def _wrap_context_callback(self) -> Callable:
+        ...
+        
+class _PyMigrationActionCompletedHookWrapper(_PyHookWrapperBase):
+
+    @property
+    def _wrapper_method_name(self) -> str:
+        return "Execute"
+
+    @property
+    def _wrapper_async(self) -> bool:
+        return False
+
+    def _wrapper_base_type(self) -> type:
+        return ISyncMigrationActionCompletedHook
+
+    def _wrapper_context_type(self) -> type:
+        return IMigrationActionResult
+
+    def _wrap_execute_method(self) -> Callable:
+        def _wrap_execute(w):
+            return w._hook.execute
+        
+        return _wrap_execute
+    
+    def _wrap_context_callback(self) -> Callable:
+        def _wrap_context(ctx):
+            return PyMigrationActionResult(ctx)
+        
+        return _wrap_context
+
+class PyMigrationActionCompletedHookBase():
+    """Base class for migration action completed hooks."""
+
+    _wrapper = _PyMigrationActionCompletedHookWrapper
+
+    def execute(self, ctx: PyMigrationActionResult) -> PyMigrationActionResult:
+        """Executes a hook callback.
+        
+        Args:
+            ctx: The input context from the migration engine or previous hook.
+            
+        Returns:
+            The context, potentially modified to pass on to the next hook or migration engine, or None to continue passing the input context.
+        """
+        return ctx
+
+class _PyContentBatchMigrationCompletedHookWrapper(_PyHookWrapperBase):
+
+    @property
+    def python_content_type(self) -> type:
+        return self.python_generic_types[0]
+
+    @property
+    def dotnet_content_type(self) -> type:
+        return self.dotnet_generic_types[0]
+    
+    @property
+    def _wrapper_method_name(self) -> str:
+        return "Execute"
+
+    @property
+    def _wrapper_async(self) -> bool:
+        return False
+
+    def _wrapper_base_type(self) -> type:
+        return ISyncContentBatchMigrationCompletedHook[self.dotnet_content_type]
+
+    def _wrapper_context_type(self) -> type:
+        return IContentBatchMigrationResult[self.dotnet_content_type]
+
+    def _wrap_execute_method(self) -> Callable:
+        def _wrap_execute(w):
+            return w._hook.execute
+        
+        return _wrap_execute
+    
+    def _wrap_context_callback(self) -> Callable:
+        def _wrap_context(ctx):
+            return PyContentBatchMigrationResult[self.python_content_type](ctx)
+        
+        return _wrap_context
+
+class PyContentBatchMigrationCompletedHookBase(Generic[TContent]):
+    """Generic base class for content batch completion hooks."""
+
+    _wrapper = _PyContentBatchMigrationCompletedHookWrapper
+
+    def execute(self, ctx: PyContentBatchMigrationResult[TContent]) -> PyContentBatchMigrationResult[TContent]:
+        """Executes a hook callback.
+        
+        Args:
+            ctx: The input context from the migration engine or previous hook.
+            
+        Returns:
+            The context, potentially modified to pass on to the next hook or migration engine, or None to continue passing the input context.
+        """
+        return ctx
\ No newline at end of file
diff --git a/src/Python/src/tableau_migration/migration_engine_hooks_mappings.py b/src/Python/src/tableau_migration/migration_engine_hooks_mappings.py
index af1a8dd..dc74a4a 100644
--- a/src/Python/src/tableau_migration/migration_engine_hooks_mappings.py
+++ b/src/Python/src/tableau_migration/migration_engine_hooks_mappings.py
@@ -14,10 +14,12 @@
 # limitations under the License.
 
 """Wrapper for classes in Tableau.Migration.Engine.Hooks.Mappings namespace."""
-from inspect import isclass
+
+from typing import  Callable, Union
 from typing_extensions import Self
+
 from System import IServiceProvider, Func
-from Tableau.Migration.Engine.Hooks.Mappings import IContentMappingBuilder,ContentMappingContext
+from Tableau.Migration.Engine.Hooks.Mappings import IContentMappingBuilder
 from tableau_migration.migration_engine_hooks import PyMigrationHookFactoryCollection
 
 class PyContentMappingBuilder():
@@ -46,34 +48,25 @@ def clear(self) -> Self:
         return self
 
 
-    def add(self,input_0,input_1,input_2=None) -> Self:
-        """Adds a an object to execute one or more mappings.
+    def add(self, input_0: type, input_1: Union[Callable, None] = None) -> Self:
+        """Adds an object or function to execute mappings.
 
         Args:
             input_0: Either: 
-                1) The content type linked to the mapping, or;
-                2) The mapping type to execute, or;
-                3) The content type for a callback function;
+                1) The mapping type to execute, or
+                2) The content type for a callback function
             input_1: Either:
-                1) The mapping to execute, or;
-                2) The content type linked to the mapping, or;
-                3) The callback function that will return the content type;
-            input_2: Either:
-                1) None, or;
-                2) None, or the function to resolve the mapping type by using the service provider, or;
-                3) None;
+                1) The callback function to execute, or
+                2) None
 
         Returns:
             The same mapping builder object for fluent API calls.
         """
-        if isclass(input_0)  and isclass(input_1) and input_2 is None:
-            self._content_mapping_builder.Add[input_0,input_1]()
-        elif isclass(input_0) and isclass(input_1) and input_2 is not None and isinstance(input_2,Func[IServiceProvider, input_0]):
-            self._content_mapping_builder.Add[input_0,input_1](input_2)
-        elif isclass(input_0) and isinstance(input_1,Func[ContentMappingContext[input_0], ContentMappingContext[input_0]]):
-            self._content_mapping_builder.Add[input_0](input_1)
-        else:
-            self._content_mapping_builder.Add[input_0](input_1)
+        from migration_engine_hooks_mappings_interop import _PyMappingWrapper
+        
+        wrapper = _PyMappingWrapper(input_0, input_1)
+        self._content_mapping_builder.Add[wrapper.wrapper_type, wrapper.dotnet_content_type](Func[IServiceProvider, wrapper.wrapper_type](wrapper.factory))
+
         return self
 
 
@@ -86,10 +79,66 @@ def by_content_type(self):
         return self._content_mapping_builder.ByContentType()
 
 
-    def build(self) -> Self:
+    def build(self) -> PyMigrationHookFactoryCollection:
         """Builds an immutable collection from the currently added mappings.
 
         Returns:
             The created collection.
         """
         return PyMigrationHookFactoryCollection(self._content_mapping_builder.Build())
+
+# region _generated
+
+from tableau_migration.migration import (  # noqa: E402, F401
+    _generic_wrapper,
+    PyContentLocation
+)
+from typing import (  # noqa: E402, F401
+    Generic,
+    TypeVar
+)
+from typing_extensions import Self # noqa: E402, F401
+
+from Tableau.Migration.Engine.Hooks.Mappings import ContentMappingContext # noqa: E402, F401
+
+TContent = TypeVar("TContent")
+
+class PyContentMappingContext(Generic[TContent]):
+    """Context for IContentMapping operations mapping a content item to an intended destination location for publishing and content references."""
+    
+    _dotnet_base = ContentMappingContext
+    
+    def __init__(self, content_mapping_context: ContentMappingContext) -> None:
+        """Creates a new PyContentMappingContext object.
+        
+        Args:
+            content_mapping_context: A ContentMappingContext object.
+        
+        Returns: None.
+        """
+        self._dotnet = content_mapping_context
+        
+    @property
+    def content_item(self) -> TContent:
+        """Gets the content item being mapped."""
+        return None if self._dotnet.ContentItem is None else _generic_wrapper(self._dotnet.ContentItem)
+    
+    @property
+    def mapped_location(self) -> PyContentLocation:
+        """Gets the destination location the content item will be mapped and/or published to."""
+        return None if self._dotnet.MappedLocation is None else PyContentLocation(self._dotnet.MappedLocation)
+    
+    def map_to(self, mapped_location: PyContentLocation) -> Self:
+        """Maps the content item to a new destination location.
+        
+        Args:
+            mapped_location: The destination location to map to.
+        
+        Returns: A new context for the content item with the mapped location.
+        """
+        result = self._dotnet.MapTo(None if mapped_location is None else mapped_location._dotnet)
+        return None if result is None else PyContentMappingContext[TContent](result)
+    
+
+# endregion
+
diff --git a/src/Python/src/tableau_migration/migration_engine_hooks_mappings_interop.py b/src/Python/src/tableau_migration/migration_engine_hooks_mappings_interop.py
new file mode 100644
index 0000000..aa0e810
--- /dev/null
+++ b/src/Python/src/tableau_migration/migration_engine_hooks_mappings_interop.py
@@ -0,0 +1,81 @@
+# Copyright (c) 2024, Salesforce, Inc.
+# SPDX-License-Identifier: Apache-2
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Interoperability utility for mappings."""
+
+from typing import Callable, Generic, TypeVar
+
+from migration_content import PyUser
+from migration_engine_hooks_mappings import PyContentMappingContext
+from migration_engine_hooks_interop import _PyHookWrapperBase
+
+from Tableau.Migration.Engine.Hooks.Mappings import ContentMappingBase, ContentMappingContext
+from Tableau.Migration.Engine.Hooks.Mappings.Default import ITableauCloudUsernameMapping
+
+TContent = TypeVar("TContent")
+
+class PyContentMappingBase(Generic[TContent]):
+    """Generic base class for mappings."""
+
+    def map(self, ctx: PyContentMappingContext[TContent]) -> PyContentMappingContext[TContent]:
+        """Executes the mapping.
+        
+        Args:
+            ctx: The input context from the migration engine or previous hook.
+            
+        Returns:
+            The context, potentially modified to pass on to the next hook or migration engine, or None to continue passing the input context.
+        """
+        return ctx
+
+class _PyMappingWrapper(_PyHookWrapperBase):
+    
+    @property
+    def python_content_type(self) -> type:
+        return self.python_generic_types[0]
+
+    @property
+    def dotnet_content_type(self) -> type:
+        return self.dotnet_generic_types[0]
+
+    def _wrapper_base_type(self) -> type:
+        return ContentMappingBase[self.dotnet_content_type]
+
+    @property
+    def _wrapper_method_name(self) -> str:
+        return "MapAsync"
+
+    def _wrapper_context_type(self) -> type:
+        return ContentMappingContext[self.dotnet_content_type]
+
+    def _wrap_execute_method(self) -> Callable:
+        def _wrap_execute(w):
+            return w._hook.map
+        
+        return _wrap_execute
+    
+    def _wrap_context_callback(self) -> Callable:
+        def _wrap_context(ctx):
+            return PyContentMappingContext[self.python_content_type](ctx)
+        
+        return _wrap_context
+
+class PyTableauCloudUsernameMappingBase(PyContentMappingBase[PyUser]):
+    """Base class for mapping users to supply a Tableau Cloud compatible usernames."""
+    pass
+
+class _PyTableauCloudUsernameMappingWrapper(_PyMappingWrapper):
+    def set_extra_base_types(self, types: tuple) -> tuple:
+        return types + (ITableauCloudUsernameMapping,)
\ No newline at end of file
diff --git a/src/Python/src/tableau_migration/migration_engine_hooks_postpublish.py b/src/Python/src/tableau_migration/migration_engine_hooks_postpublish.py
new file mode 100644
index 0000000..f15f9f1
--- /dev/null
+++ b/src/Python/src/tableau_migration/migration_engine_hooks_postpublish.py
@@ -0,0 +1,88 @@
+# Copyright (c) 2024, Salesforce, Inc.
+# SPDX-License-Identifier: Apache-2
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Wrapper for classes in Tableau.Migration.Engine.Hooks.PostPublish namespace."""
+
+# region _generated
+
+from tableau_migration.migration import _generic_wrapper # noqa: E402, F401
+from tableau_migration.migration_engine_manifest import PyMigrationManifestEntryEditor # noqa: E402, F401
+from typing import (  # noqa: E402, F401
+    Generic,
+    TypeVar,
+    Sequence
+)
+
+from Tableau.Migration.Engine.Hooks.PostPublish import (  # noqa: E402, F401
+    BulkPostPublishContext,
+    ContentItemPostPublishContext
+)
+
+TPublish = TypeVar("TPublish")
+TResult = TypeVar("TResult")
+
+class PyBulkPostPublishContext(Generic[TPublish]):
+    """Context for BulkPostPublishContext operations for published content items."""
+    
+    _dotnet_base = BulkPostPublishContext
+    
+    def __init__(self, bulk_post_publish_context: BulkPostPublishContext) -> None:
+        """Creates a new PyBulkPostPublishContext object.
+        
+        Args:
+            bulk_post_publish_context: A BulkPostPublishContext object.
+        
+        Returns: None.
+        """
+        self._dotnet = bulk_post_publish_context
+        
+    @property
+    def published_items(self) -> Sequence[TPublish]:
+        """Gets the content item being published."""
+        return None if self._dotnet.PublishedItems is None else list((None if x is None else _generic_wrapper(x)) for x in self._dotnet.PublishedItems)
+    
+class PyContentItemPostPublishContext(Generic[TPublish, TResult]):
+    """Context for ContentItemPostPublishHookBase operations for published content items."""
+    
+    _dotnet_base = ContentItemPostPublishContext
+    
+    def __init__(self, content_item_post_publish_context: ContentItemPostPublishContext) -> None:
+        """Creates a new PyContentItemPostPublishContext object.
+        
+        Args:
+            content_item_post_publish_context: A ContentItemPostPublishContext object.
+        
+        Returns: None.
+        """
+        self._dotnet = content_item_post_publish_context
+        
+    @property
+    def manifest_entry(self) -> PyMigrationManifestEntryEditor:
+        """Gets the manifest entry for the content item."""
+        return None if self._dotnet.ManifestEntry is None else PyMigrationManifestEntryEditor(self._dotnet.ManifestEntry)
+    
+    @property
+    def published_item(self) -> TPublish:
+        """Gets the content item being published."""
+        return None if self._dotnet.PublishedItem is None else _generic_wrapper(self._dotnet.PublishedItem)
+    
+    @property
+    def destination_item(self) -> TResult:
+        """Gets the returned content item after publishing."""
+        return None if self._dotnet.DestinationItem is None else _generic_wrapper(self._dotnet.DestinationItem)
+    
+
+# endregion
+
diff --git a/src/Python/src/tableau_migration/migration_engine_hooks_postpublish_interop.py b/src/Python/src/tableau_migration/migration_engine_hooks_postpublish_interop.py
new file mode 100644
index 0000000..f1cf499
--- /dev/null
+++ b/src/Python/src/tableau_migration/migration_engine_hooks_postpublish_interop.py
@@ -0,0 +1,126 @@
+# Copyright (c) 2024, Salesforce, Inc.
+# SPDX-License-Identifier: Apache-2
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Interoperability utility for post publish hooks."""
+
+from typing import Callable, Generic, TypeVar
+
+from migration_engine_hooks_interop import _PyHookWrapperBase
+from migration_engine_hooks_postpublish import PyBulkPostPublishContext, PyContentItemPostPublishContext
+
+from Tableau.Migration.Engine.Hooks.PostPublish import (
+    BulkPostPublishContext, BulkPostPublishHookBase, 
+    ContentItemPostPublishContext, ContentItemPostPublishHookBase
+)
+
+TSource = TypeVar("TSource")
+TPublish = TypeVar("TPublish")
+TResult = TypeVar("TResult")
+
+class _PyContentItemPostPublishHookWrapper(_PyHookWrapperBase):
+    
+    @property
+    def python_publish_type(self) -> type:
+        return self.python_generic_types[0]
+    
+    @property
+    def python_result_type(self) -> type:
+        return self.python_generic_types[1]
+
+    @property
+    def dotnet_publish_type(self) -> type:
+        return self.dotnet_generic_types[0]
+    
+    @property
+    def dotnet_result_type(self) -> type:
+        return self.dotnet_generic_types[1]
+
+    def _wrapper_base_type(self) -> type:
+        return ContentItemPostPublishHookBase[self.dotnet_publish_type, self.dotnet_result_type]
+
+    def _wrapper_context_type(self) -> type:
+        return ContentItemPostPublishContext[self.dotnet_publish_type, self.dotnet_result_type]
+
+    def _wrap_execute_method(self) -> Callable:
+        def _wrap_execute(w):
+            return w._hook.execute
+        
+        return _wrap_execute
+    
+    def _wrap_context_callback(self) -> Callable:
+        def _wrap_context(ctx):
+            return PyContentItemPostPublishContext[self.python_publish_type, self.python_result_type](ctx)
+        
+        return _wrap_context
+    
+class PyContentItemPostPublishHookBase(Generic[TPublish, TResult]):
+    """Generic base class for single item post publish hooks."""
+
+    _wrapper = _PyContentItemPostPublishHookWrapper
+
+    def execute(self, ctx: PyContentItemPostPublishContext[TPublish, TResult]) -> PyContentItemPostPublishContext[TPublish, TResult]:
+        """Executes a hook callback.
+        
+        Args:
+            ctx: The input context from the migration engine or previous hook.
+
+        Returns:
+            The context, potentially modified to pass on to the next hook or migration engine, or None to continue passing the input context.
+        """
+        return ctx
+
+class _PyBulkPostPublishHookWrapper(_PyHookWrapperBase):
+    
+    @property
+    def python_source_type(self) -> type:
+        return self.python_generic_types[0]
+
+    @property
+    def dotnet_source_type(self) -> type:
+        return self.dotnet_generic_types[0]
+
+    def _wrapper_base_type(self) -> type:
+        return BulkPostPublishHookBase[self.dotnet_source_type]
+
+    def _wrapper_context_type(self) -> type:
+        return BulkPostPublishContext[self.dotnet_source_type]
+
+    def _wrap_execute_method(self) -> Callable:
+        def _wrap_execute(w):
+            return w._hook.execute
+        
+        return _wrap_execute
+    
+    def _wrap_context_callback(self) -> Callable:
+        def _wrap_context(ctx):
+            return PyBulkPostPublishContext[self.python_source_type](ctx)
+        
+        return _wrap_context
+
+class PyBulkPostPublishHookBase(Generic[TSource]):
+    """Generic base class for bulk post publish hooks."""
+
+    _wrapper = _PyBulkPostPublishHookWrapper
+
+    def execute(self, ctx: PyBulkPostPublishContext[TSource]) -> PyBulkPostPublishContext[TSource]:
+        """Executes a hook callback.
+        
+        Args:
+            ctx: The input context from the migration engine or previous hook.
+            
+        Returns:
+            The context, potentially modified to pass on to the next hook or migration engine, or None to continue passing the input context.
+        """
+        return ctx
\ No newline at end of file
diff --git a/src/Python/src/tableau_migration/migration_engine_hooks_transformers.py b/src/Python/src/tableau_migration/migration_engine_hooks_transformers.py
index d6ae22b..b78323c 100644
--- a/src/Python/src/tableau_migration/migration_engine_hooks_transformers.py
+++ b/src/Python/src/tableau_migration/migration_engine_hooks_transformers.py
@@ -14,8 +14,10 @@
 # limitations under the License.
 
 """Wrapper for classes in Tableau.Migration.Engine.Hooks.Transformers namespace."""
-from inspect import isclass
+
+from typing import Callable, Union
 from typing_extensions import Self
+
 from System import IServiceProvider, Func
 from Tableau.Migration.Engine.Hooks.Transformers import IContentTransformerBuilder
 from tableau_migration.migration_engine_hooks import PyMigrationHookFactoryCollection
@@ -46,34 +48,31 @@ def clear(self) -> Self:
         return self
 
 
-    def add(self,input_0,input_1,input_2=None) -> Self:
-        """Adds an object to execute one or more transformers.
+    def add(self, input_0: type, input_1: Union[Callable, None] = None, is_xml: bool = False) -> Self:
+        """Adds an object or function to execute transformers.
 
         Args:
             input_0: Either: 
-                1) The type linked to the transformer, or;
-                2) The transformer type to execute, or;
-                3) The content type for a callback function;
+                1) The transformer type to execute, or
+                2) The content type for a callback function
             input_1: Either:
-                1) The transformer to execute, or;
-                2) The content type linked to the transformer, or;
-                3) The callback function that will return the content type;
-            input_2: Either:
-                1) None, or;
-                2) None, or the function to resolve the transformer type by using the service provider, or;
-                3) None;
+                1) The callback function to execute, or
+                2) None
+            is_xml: True if the given callback function is an xml transformer callback, otherwise false.
 
         Returns:
-            The same transformer builder object for fluent API calls.
+            The same mapping builder object for fluent API calls.
         """
-        if isclass(input_0) and isclass(input_1) and input_2 is None:
-            self._content_transformer_builder.Add[input_0,input_1]()
-        elif isclass(input_0) and isclass(input_1) and input_2 is not None and isinstance(input_2,Func[IServiceProvider, input_0]):
-            self._content_transformer_builder.Add[input_0,input_1](input_2)
-        elif isclass(input_0) and isinstance(input_1,Func[input_0, input_0]):
-            self._content_transformer_builder.Add[input_0](input_1)
+        from migration_engine_hooks_transformers_interop import _PyTransformerWrapper, _PyXmlTransformerWrapper
+
+        if input_1 is None:
+            wrapper = input_0._wrapper(input_0)
         else:
-            self._content_transformer_builder.Add[input_0](input_1)
+            wrap_type = _PyXmlTransformerWrapper if is_xml else _PyTransformerWrapper
+            wrapper = wrap_type(input_0, input_1)
+        
+        self._content_transformer_builder.Add[wrapper.wrapper_type, wrapper.dotnet_publish_type](Func[IServiceProvider, wrapper.wrapper_type](wrapper.factory))
+        
         return self
     
 
diff --git a/src/Python/src/tableau_migration/migration_engine_hooks_transformers_interop.py b/src/Python/src/tableau_migration/migration_engine_hooks_transformers_interop.py
new file mode 100644
index 0000000..b75582e
--- /dev/null
+++ b/src/Python/src/tableau_migration/migration_engine_hooks_transformers_interop.py
@@ -0,0 +1,163 @@
+# Copyright (c) 2024, Salesforce, Inc.
+# SPDX-License-Identifier: Apache-2
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Interoperability utility for transformers."""
+
+from inspect import signature
+from typing import Callable, Generic, TypeVar
+from xml.etree import ElementTree
+
+from migration import _generic_wrapper
+from migration_engine_hooks_interop import _PyHookWrapperBase
+
+import System # System.Xml.Linq must be imported as System
+from System.Threading.Tasks import Task
+from Tableau.Migration.Engine.Hooks.Transformers import ContentTransformerBase, IXmlContentTransformer
+
+TPublish = TypeVar("TPublish")
+
+# Register XML namespaces used in Tableau files (TWB/TDS).
+# This ensures that namespace declarations are preserved in XML transformers.
+ElementTree.register_namespace("user", "http://www.tableausoftware.com/xml/user")
+
+class _PyTransformerWrapper(_PyHookWrapperBase):
+    
+    @property
+    def python_publish_type(self) -> type:
+        return self.python_generic_types[0]
+
+    @property
+    def dotnet_publish_type(self) -> type:
+        return self.dotnet_generic_types[0]
+
+    def _wrapper_base_type(self) -> type:
+        return ContentTransformerBase[self.dotnet_publish_type]
+
+    @property
+    def _wrapper_method_name(self) -> str:
+        return "TransformAsync"
+
+    def _wrapper_context_type(self) -> type:
+        return self.dotnet_publish_type
+
+    def _wrap_execute_method(self) -> Callable:
+        def _wrap_transform(w):
+            return w._hook.transform
+        
+        return _wrap_transform
+    
+    def _wrap_context_callback(self) -> Callable:
+        def _wrap_context(ctx):
+            return _generic_wrapper(ctx, self.dotnet_publish_type)
+        
+        return _wrap_context
+    
+class PyContentTransformerBase(Generic[TPublish]):
+    """Generic base class for transformers."""
+
+    _wrapper = _PyTransformerWrapper
+
+    def transform(self, item_to_transform: TPublish) -> TPublish:
+        """Executes the transformation.
+        
+        Args:
+            item_to_transform: The input context from the migration engine or previous hook.
+            
+        Returns:
+            The context, potentially modified to pass on to the next hook or migration engine, or None to continue passing the input context.
+        """
+        return item_to_transform
+    
+class _PyXmlTransformerWrapper(_PyTransformerWrapper):
+
+    @classmethod
+    def read_xml(cls, xml: System.Xml.Linq.XDocument) -> ElementTree.Element:
+        return ElementTree.fromstring(xml.ToString())
+    
+    @classmethod
+    def write_xml(cls, orig_xml: System.Xml.Linq.XDocument, new_xml: ElementTree.Element) -> None:
+        s = ElementTree.tostring(new_xml, "unicode")
+        
+        new_root = System.Xml.Linq.XElement.Parse(s, System.Xml.Linq.LoadOptions.PreserveWhitespace)
+        orig_xml.Root.ReplaceWith(new_root)
+
+    def _wrapper_base_type(self) -> type:
+        return IXmlContentTransformer[self.dotnet_publish_type]
+
+    def _wrap_execute_method(self) -> Callable:
+        def _wrap_transform_xml(w):
+            return w._hook._transform_xml
+        
+        return _wrap_transform_xml
+    
+    def build_wrapper_execute(self, wrap_method: Callable, wrap_context: Callable, ctx_type: type, is_async: bool) -> Callable:
+        def _transform_async(s, ctx, xml, cancel):
+            wrap_method(s)(wrap_context(ctx), xml)
+            return Task.CompletedTask
+
+        return _transform_async
+    
+    def build_wrapper_execute_callback(self, callback: Callable, wrap_context: Callable, ctx_type: type, is_async: bool) -> Callable:
+        def _transform_async(s, ctx, xml, cancel):
+            py_xml = self.read_xml(xml)
+            callback(wrap_context(ctx), py_xml)
+            self.write_xml(xml, py_xml)
+            
+            return Task.CompletedTask
+
+        def _transform_services_async(s, ctx, xml, cancel):
+            py_xml = self.read_xml(xml)
+            callback(wrap_context(ctx), py_xml, s.services)
+            self.write_xml(xml, py_xml)
+
+            return Task.CompletedTask
+
+        return _transform_async if len(signature(callback).parameters) == 2 else _transform_services_async
+
+    def set_extra_wrapper_members(self, members: dict, wrap_context: Callable) -> None:
+        
+        def _wrap_needs_transforming(w, ctx):
+            return w._hook.needs_xml_transforming(wrap_context(ctx))
+
+        members["NeedsXmlTransforming"] = _wrap_needs_transforming
+    
+class PyXmlContentTransformerBase(Generic[TPublish]):
+    """Generic base class for XML transformers."""
+
+    _wrapper = _PyXmlTransformerWrapper
+    
+    def needs_xml_transforming(self, ctx: TPublish) -> bool:
+        """Finds whether the content item needs any XML changes, returning false prevents file IO from occurring.
+        
+        Args:
+            ctx: The content item to inspect.
+            
+        Returns: Whether or not the content item needs XML changes.
+        """
+        return True
+    
+    def _transform_xml(self, ctx: TPublish, xml) -> None:
+        py_xml = _PyXmlTransformerWrapper.read_xml(xml)
+        self.transform(ctx, py_xml)
+        _PyXmlTransformerWrapper.write_xml(xml, py_xml)
+
+    def transform(self, ctx: TPublish, xml: ElementTree.Element) -> None:
+        """Transforms the XML of the content item.
+        
+        Args:
+            ctx: The content item being transformed.
+            xml: The XML of the content item to transform. Any changes made to the XML are persisted back to the file before publishing.
+        """
+        pass
diff --git a/src/Python/src/tableau_migration/migration_engine_manifest.py b/src/Python/src/tableau_migration/migration_engine_manifest.py
new file mode 100644
index 0000000..2cbcabe
--- /dev/null
+++ b/src/Python/src/tableau_migration/migration_engine_manifest.py
@@ -0,0 +1,161 @@
+# Copyright (c) 2024, Salesforce, Inc.
+# SPDX-License-Identifier: Apache-2
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Wrapper for classes in Tableau.Migration.Engine.Manifest namespace."""
+
+# region _generated
+
+from enum import IntEnum # noqa: E402, F401
+from tableau_migration.migration import (  # noqa: E402, F401
+    PyContentReference,
+    PyContentLocation
+)
+from typing import Sequence # noqa: E402, F401
+from typing_extensions import Self # noqa: E402, F401
+
+import System # noqa: E402
+
+from Tableau.Migration.Engine.Manifest import (  # noqa: E402, F401
+    IMigrationManifestEntry,
+    IMigrationManifestEntryEditor
+)
+
+class PyMigrationManifestEntryStatus(IntEnum):
+    """An enumeration of the various migration statuses states of a content item."""
+    
+    """The content item has not yet been processed."""
+    PENDING = 0
+    
+    """The content item was not migrated due to filtering."""
+    SKIPPED = 1
+    
+    """The content item was migrated successfully."""
+    MIGRATED = 2
+    
+    """An attempt was made to migrate the content item, but it resulted in one or more errors. The content item may be missing on the destination or may be partially migrated."""
+    ERROR = 3
+    
+    """An attempt was made to migrate the content item, but the process was canceled mid-migration. The content item may be missing on the destination or may be partially migrated."""
+    CANCELED = 4
+    
+class PyMigrationManifestEntry():
+    """Interface for an entry on a IMigrationManifest that describes the migration state of single content item."""
+    
+    _dotnet_base = IMigrationManifestEntry
+    
+    def __init__(self, migration_manifest_entry: IMigrationManifestEntry) -> None:
+        """Creates a new PyMigrationManifestEntry object.
+        
+        Args:
+            migration_manifest_entry: A IMigrationManifestEntry object.
+        
+        Returns: None.
+        """
+        self._dotnet = migration_manifest_entry
+        
+    @property
+    def source(self) -> PyContentReference:
+        """Gets the content item's source information."""
+        return None if self._dotnet.Source is None else PyContentReference(self._dotnet.Source)
+    
+    @property
+    def mapped_location(self) -> PyContentLocation:
+        """Gets the content item's intended destination location, regardless if a Destination value's location if available."""
+        return None if self._dotnet.MappedLocation is None else PyContentLocation(self._dotnet.MappedLocation)
+    
+    @property
+    def destination(self) -> PyContentReference:
+        """Gets the content item's destination information, or null if the content item was not migrated due to filtering, or otherwise not found in the destination during the course of the migration."""
+        return None if self._dotnet.Destination is None else PyContentReference(self._dotnet.Destination)
+    
+    @property
+    def status(self) -> PyMigrationManifestEntryStatus:
+        """Gets the migration status code of the content item for the current run. See HasMigrated for the migration status across all runs."""
+        return None if self._dotnet.Status is None else PyMigrationManifestEntryStatus(self._dotnet.Status.value__)
+    
+    @property
+    def has_migrated(self) -> bool:
+        """Gets whether or not the content item has been migrated, either in a previous run or the current run."""
+        return self._dotnet.HasMigrated
+    
+    @property
+    def errors(self) -> Sequence[System.Exception]:
+        """Gets errors that occurred while migrating the content item."""
+        return None if self._dotnet.Errors is None else list(self._dotnet.Errors)
+    
+class PyMigrationManifestEntryEditor(PyMigrationManifestEntry):
+    """Interface for a IMigrationManifestEntry that can be edited."""
+    
+    _dotnet_base = IMigrationManifestEntryEditor
+    
+    def __init__(self, migration_manifest_entry_editor: IMigrationManifestEntryEditor) -> None:
+        """Creates a new PyMigrationManifestEntryEditor object.
+        
+        Args:
+            migration_manifest_entry_editor: A IMigrationManifestEntryEditor object.
+        
+        Returns: None.
+        """
+        self._dotnet = migration_manifest_entry_editor
+        
+    def map_to_destination(self, destination_location: PyContentLocation) -> Self:
+        """Sets the intended mapped destination location to the manifest entry. Clears the Destination information if the mapped location is different.
+        
+        Args:
+            destination_location: The intended destination location to migrate to.
+        
+        Returns: The current entry editor, for fluent API usage.
+        """
+        result = self._dotnet.MapToDestination(None if destination_location is None else destination_location._dotnet)
+        return None if result is None else PyMigrationManifestEntryEditor(result)
+    
+    def destination_found(self, destination_info: PyContentReference) -> Self:
+        """Sets the MappedLocation information based on the given destination item reference.
+        
+        Args:
+            destination_info: The destination reference information.
+        
+        Returns: The current entry editor, for fluent API usage.
+        """
+        result = self._dotnet.DestinationFound(None if destination_info is None else destination_info._dotnet)
+        return None if result is None else PyMigrationManifestEntryEditor(result)
+    
+    def set_skipped(self) -> Self:
+        """Sets the entry to skipped status.
+        
+        Returns: The current entry editor, for fluent API usage.
+        """
+        result = self._dotnet.SetSkipped()
+        return None if result is None else PyMigrationManifestEntryEditor(result)
+    
+    def set_canceled(self) -> Self:
+        """Sets the entry to canceled status.
+        
+        Returns: The current entry editor, for fluent API usage.
+        """
+        result = self._dotnet.SetCanceled()
+        return None if result is None else PyMigrationManifestEntryEditor(result)
+    
+    def set_migrated(self) -> Self:
+        """Sets the entry to migrated status.
+        
+        Returns: The current entry editor, for fluent API usage.
+        """
+        result = self._dotnet.SetMigrated()
+        return None if result is None else PyMigrationManifestEntryEditor(result)
+    
+
+# endregion
+
diff --git a/src/Python/src/tableau_migration/migration_engine_migrators.py b/src/Python/src/tableau_migration/migration_engine_migrators.py
index 3b92431..951a51e 100644
--- a/src/Python/src/tableau_migration/migration_engine_migrators.py
+++ b/src/Python/src/tableau_migration/migration_engine_migrators.py
@@ -14,13 +14,16 @@
 # limitations under the License.
 
 """Wrapper for classes in Tableau.Migration.Engine.Migrators namespace."""
-import tableau_migration
 from Tableau.Migration import IMigrator
+from tableau_migration import (
+    cancellation_token
+)
 from tableau_migration.migration import (
    PyMigrationResult,
    PyMigrationManifest,
    get_service_provider, 
-   get_service )
+   get_service
+)
 from tableau_migration.migration_engine import PyMigrationPlan
 
 class PyMigrator():
@@ -36,7 +39,7 @@ def __init__(self) -> None:
         self._services = get_service_provider()
         self._migrator = get_service(self._services, IMigrator)
         
-    def execute(self, plan: PyMigrationPlan, previous_manifest: PyMigrationManifest = None, cancel = tableau_migration.cancellation_token):
+    def execute(self, plan: PyMigrationPlan, previous_manifest: PyMigrationManifest = None, cancel = None):
         """Executes a migration asynchronously.
 
         Args:
@@ -46,7 +49,71 @@ def execute(self, plan: PyMigrationPlan, previous_manifest: PyMigrationManifest
 
         Returns: The results of the migration.
         """
+        if cancel is None:
+            cancel = cancellation_token
+
         if(previous_manifest is None):
             return PyMigrationResult(self._migrator.ExecuteAsync(plan._migration_plan, cancel).GetAwaiter().GetResult())
         else:
             return PyMigrationResult(self._migrator.ExecuteAsync(plan._migration_plan, previous_manifest._migration_manifest, cancel).GetAwaiter().GetResult())
+# region _generated
+
+from tableau_migration.migration import (  # noqa: E402, F401
+    _generic_wrapper,
+    PyResult
+)
+from tableau_migration.migration_engine_manifest import PyMigrationManifestEntry # noqa: E402, F401
+from typing import (  # noqa: E402, F401
+    Generic,
+    TypeVar
+)
+from typing_extensions import Self # noqa: E402, F401
+
+from Tableau.Migration.Engine.Migrators import IContentItemMigrationResult # noqa: E402, F401
+
+TContent = TypeVar("TContent")
+
+class PyContentItemMigrationResult(Generic[TContent], PyResult):
+    """IResult object for a content item migration action."""
+    
+    _dotnet_base = IContentItemMigrationResult
+    
+    def __init__(self, content_item_migration_result: IContentItemMigrationResult) -> None:
+        """Creates a new PyContentItemMigrationResult object.
+        
+        Args:
+            content_item_migration_result: A IContentItemMigrationResult object.
+        
+        Returns: None.
+        """
+        self._dotnet = content_item_migration_result
+        
+    @property
+    def continue_batch(self) -> bool:
+        """Gets whether or not the current migration batch should continue."""
+        return self._dotnet.ContinueBatch
+    
+    @property
+    def is_canceled(self) -> bool:
+        """Gets whether the item migration was canceled."""
+        return self._dotnet.IsCanceled
+    
+    @property
+    def manifest_entry(self) -> PyMigrationManifestEntry:
+        """Gets the manifest entry for the content item."""
+        return None if self._dotnet.ManifestEntry is None else PyMigrationManifestEntry(self._dotnet.ManifestEntry)
+    
+    def for_continue_batch(self, continue_batch: bool) -> Self:
+        """Creates a new ContinueBatch value.
+        
+        Args:
+            continue_batch: Whether or not the current migration batch should continue.
+        
+        Returns: The new IContentItemMigrationResult object.
+        """
+        result = self._dotnet.ForContinueBatch(continue_batch)
+        return None if result is None else PyContentItemMigrationResult[TContent](result)
+    
+
+# endregion
+
diff --git a/src/Python/src/tableau_migration/migration_engine_migrators_batch.py b/src/Python/src/tableau_migration/migration_engine_migrators_batch.py
new file mode 100644
index 0000000..c7403ba
--- /dev/null
+++ b/src/Python/src/tableau_migration/migration_engine_migrators_batch.py
@@ -0,0 +1,74 @@
+# Copyright (c) 2024, Salesforce, Inc.
+# SPDX-License-Identifier: Apache-2
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Wrapper for classes in Tableau.Migration.Engine.Migrators.Batch namespace."""
+
+# region _generated
+
+from tableau_migration.migration import (  # noqa: E402, F401
+    _generic_wrapper,
+    PyResult
+)
+from tableau_migration.migration_engine_migrators import PyContentItemMigrationResult # noqa: E402, F401
+from typing import (  # noqa: E402, F401
+    Generic,
+    TypeVar,
+    Sequence
+)
+from typing_extensions import Self # noqa: E402, F401
+
+from Tableau.Migration.Engine.Migrators.Batch import IContentBatchMigrationResult # noqa: E402, F401
+
+TContent = TypeVar("TContent")
+
+class PyContentBatchMigrationResult(Generic[TContent], PyResult):
+    """IResult object for a migration action."""
+    
+    _dotnet_base = IContentBatchMigrationResult
+    
+    def __init__(self, content_batch_migration_result: IContentBatchMigrationResult) -> None:
+        """Creates a new PyContentBatchMigrationResult object.
+        
+        Args:
+            content_batch_migration_result: A IContentBatchMigrationResult object.
+        
+        Returns: None.
+        """
+        self._dotnet = content_batch_migration_result
+        
+    @property
+    def perform_next_batch(self) -> bool:
+        """Gets whether or not to migrate the next batch, if any."""
+        return self._dotnet.PerformNextBatch
+    
+    @property
+    def item_results(self) -> Sequence[PyContentItemMigrationResult[TContent]]:
+        """Gets the migration result of each item in the batch, in the order they finished."""
+        return None if self._dotnet.ItemResults is None else list((None if x is None else PyContentItemMigrationResult[TContent](x)) for x in self._dotnet.ItemResults)
+    
+    def for_next_batch(self, perform_next_batch: bool) -> Self:
+        """Creates a new PerformNextBatch value.
+        
+        Args:
+            perform_next_batch: Whether or not to migrate the next batch.
+        
+        Returns: The new IContentBatchMigrationResult object.
+        """
+        result = self._dotnet.ForNextBatch(perform_next_batch)
+        return None if result is None else PyContentBatchMigrationResult[TContent](result)
+    
+
+# endregion
+
diff --git a/src/Python/src/tableau_migration/migration_engine_options.py b/src/Python/src/tableau_migration/migration_engine_options.py
index 514109c..e37460c 100644
--- a/src/Python/src/tableau_migration/migration_engine_options.py
+++ b/src/Python/src/tableau_migration/migration_engine_options.py
@@ -22,7 +22,9 @@
 from Tableau.Migration.Engine.Options import(
     IMigrationPlanOptionsBuilder,
     IMigrationPlanOptionsCollection)
-import tableau_migration
+from tableau_migration.migration import (
+    get_service_provider
+)
 
 T = TypeVar("T")
 class PyMigrationPlanOptionsCollection:
@@ -41,7 +43,7 @@ def __init__(self, migration_plan_options_collection: IMigrationPlanOptionsColle
         self._migration_plan_options_collection = migration_plan_options_collection
 
 
-    def get(self, type_to_get: Type[T], services: System.IServiceProvider = tableau_migration.migration.get_service_provider()) -> Type[T]:
+    def get(self, type_to_get: Type[T], services: System.IServiceProvider = None) -> Type[T]:
         """Gets the options for the given type.
         
         or null if no options for the given type have been registered.
@@ -54,6 +56,9 @@ def get(self, type_to_get: Type[T], services: System.IServiceProvider = tableau_
         Returns:
             The options for the given type, or null.
         """
+        if services is None:
+            services = get_service_provider()
+
         return self._migration_plan_options_collection.Get[type_to_get](services)
 
 class PyMigrationPlanOptionsBuilder():
diff --git a/src/Python/src/tableau_migration/migration_enum.py b/src/Python/src/tableau_migration/migration_enum.py
new file mode 100644
index 0000000..77dd734
--- /dev/null
+++ b/src/Python/src/tableau_migration/migration_enum.py
@@ -0,0 +1,27 @@
+# Copyright (c) 2024, Salesforce, Inc.
+# SPDX-License-Identifier: Apache-2
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Enumeration-related Python utility for the Migration SDK."""
+
+import sys
+
+if sys.version_info >= (3, 11):
+    from enum import StrEnum
+else:
+    from enum import Enum
+
+    class StrEnum(str, Enum):
+        """Enumeration for string values."""
+        pass
\ No newline at end of file
diff --git a/src/Python/src/tableau_migration/migration_services.py b/src/Python/src/tableau_migration/migration_services.py
new file mode 100644
index 0000000..ee7f2b6
--- /dev/null
+++ b/src/Python/src/tableau_migration/migration_services.py
@@ -0,0 +1,115 @@
+# Copyright (c) 2024, Salesforce, Inc.
+# SPDX-License-Identifier: Apache-2
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Service-related Python utility for the Migration SDK."""
+
+# Not in migration.py to avoid circular references.
+
+from typing import Type, TypeVar
+
+from System import IServiceProvider
+from Tableau.Migration import (
+    IMigrationManifest, 
+    IMigrationPlan
+)
+from Tableau.Migration.Engine.Endpoints.Search import (
+    IDestinationContentReferenceFinderFactory,
+    ISourceContentReferenceFinderFactory
+)
+
+from tableau_migration.migration import (
+    get_service,
+    PyMigrationManifest
+)
+from tableau_migration.migration_engine import (
+    PyMigrationPlan
+)
+from tableau_migration.migration_engine_endpoints_search import (
+    PyDestinationContentReferenceFinder,
+    PyDestinationContentReferenceFinderFactory,
+    PySourceContentReferenceFinder,
+    PySourceContentReferenceFinderFactory
+)
+
+T = TypeVar("T")
+TContent = TypeVar("TContent")
+
+class ScopedMigrationServices():
+    """Class that represents a migration-scoped service provider."""
+
+    def __init__(self, scoped_services: IServiceProvider) -> None:
+        """Default init.
+        
+        Args:
+            scoped_services: The scoped service provider.
+        
+        Returns: None.
+        """
+        self._scoped_services = scoped_services
+
+    def _get_service(self, t: Type[T]) -> T:
+        """Get the service from the service provider.
+
+        Returns: The service.
+        """
+        return get_service(self._scoped_services, t)
+    
+    def get_manifest(self) -> PyMigrationManifest:
+        """Get the current migration manifest.
+
+        Returns: The current IMigrationManifest.
+        """
+        return PyMigrationManifest(self._get_service(IMigrationManifest))
+
+    def get_plan(self) -> PyMigrationPlan:
+        """Get the current migration plan.
+
+        Returns: The current IMigrationPlan.
+        """
+        return PyMigrationPlan(self._get_service(IMigrationPlan))
+
+    def get_source_finder_factory(self) -> PySourceContentReferenceFinderFactory:
+        """Get the current source finder factory.
+
+        Returns: The current ISourceContentReferenceFinderFactory.
+        """
+        return PySourceContentReferenceFinderFactory(self._get_service(ISourceContentReferenceFinderFactory))
+
+    def get_source_finder(self, t: Type[TContent]) -> PySourceContentReferenceFinder[TContent]:
+        """Get the TContent source finder.
+
+        Args:
+            t: The content type.
+        
+        Returns: The current PySourceContentReferenceFinder for TContent.
+        """
+        return self.get_source_finder_factory().for_source_content_type(t)
+
+    def get_destination_finder_factory(self) -> PyDestinationContentReferenceFinderFactory:
+        """Get the current destination finder factory.
+
+        Returns: The current IDestinationContentReferenceFinderFactory.
+        """
+        return PyDestinationContentReferenceFinderFactory(self._get_service(IDestinationContentReferenceFinderFactory))
+
+    def get_destination_finder(self, t: Type[TContent]) -> PyDestinationContentReferenceFinder[TContent]:
+        """Get the TContent destination finder.
+        
+        Args:
+            t: The content type.
+        
+        Returns: The current PyDestinationContentReferenceFinder for TContent.
+        """
+        return self.get_destination_finder_factory().for_destination_content_type(t)
diff --git a/src/Python/tests/__init__.py b/src/Python/tests/__init__.py
index 0179ebe..ff948b3 100644
--- a/src/Python/tests/__init__.py
+++ b/src/Python/tests/__init__.py
@@ -36,5 +36,7 @@
     print("MIG_SDK_PYTHON_BUILD set to false. Skipping dotnet build for python tests.")
 
 from tableau_migration import clr
+clr.AddReference("AutoFixture")
+clr.AddReference("AutoFixture.AutoMoq")
 clr.AddReference("Moq")
 clr.AddReference("Tableau.Migration.Tests")
diff --git a/src/Python/tests/helpers/autofixture.py b/src/Python/tests/helpers/autofixture.py
new file mode 100644
index 0000000..d8b9b57
--- /dev/null
+++ b/src/Python/tests/helpers/autofixture.py
@@ -0,0 +1,29 @@
+# Copyright (c) 2024, Salesforce, Inc.
+# SPDX-License-Identifier: Apache-2
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from AutoFixture import IFixture, SpecimenFactory
+from AutoFixture.AutoMoq import AutoMoqCustomization
+from Tableau.Migration.Tests import FixtureFactory
+
+class AutoFixtureTestBase():
+    
+    def setup_method(self, method):
+        self.fixture = FixtureFactory.Create().Customize(AutoMoqCustomization())
+
+    def create(self, T):
+        return SpecimenFactory.Create[T](self.fixture)
+    
+    def create_many(self, T):
+        return SpecimenFactory.CreateMany[T](self.fixture)
\ No newline at end of file
diff --git a/src/Python/tests/test_classes.py b/src/Python/tests/test_classes.py
index a21df6c..e50db6c 100644
--- a/src/Python/tests/test_classes.py
+++ b/src/Python/tests/test_classes.py
@@ -24,6 +24,7 @@
 # That in turns means the Test Explorer won't display the tests
 # If this happens, always check the "Test Output" for errors
 ###
+
 import pytest
 import sys
 from os.path import abspath
@@ -43,6 +44,12 @@
     PyServerToCloudMigrationPlanBuilder,
     PyMigrationPlan)
 
+from tableau_migration.migration_engine_endpoints_search import (
+    PyDestinationContentReferenceFinder,
+    PyDestinationContentReferenceFinderFactory,
+    PySourceContentReferenceFinder,
+    PySourceContentReferenceFinderFactory)
+
 from tableau_migration.migration_engine_hooks import (
     PyMigrationHookBuilder,
     PyMigrationHookFactoryCollection)
@@ -75,8 +82,12 @@ def get_class_methods(cls):
     https://stackoverflow.com/a/4241225.
     """
     _base_object = dir(type('dummy', (object,), {}))
-    return [item[0] for item in inspect.getmembers(cls, predicate=inspect.isfunction)
+    methods = [item[0] for item in inspect.getmembers(cls, predicate=inspect.ismethod)
                 if item[0] not in _base_object]
+    methods.extend([item[0] for item in inspect.getmembers(cls, predicate=inspect.isfunction) if item[0] not in _base_object])
+    
+    #Remove python internal methods
+    return (m for m in methods if not m.startswith("__"))
     
 
 def get_class_properties(cls):
@@ -173,8 +184,8 @@ def verify_enum(python_enum, dotnet_enum):
     """
     from Tableau.Migration.Interop import InteropHelper
 
-    dotnet_enum = [(item.Item1, item.Item2) for item in InteropHelper.GetEnum[dotnet_enum]()]
-    python_enum = get_enum(python_enum)
+    dotnet_enum = [(normalize_name(item.Item1), item.Item2) for item in InteropHelper.GetEnum[dotnet_enum]()]
+    python_enum = [(normalize_name(item[0]), item[1]) for item in get_enum(python_enum)]
 
     message = compare_lists(dotnet_enum, python_enum)
     assert not message
@@ -210,25 +221,188 @@ def test_overloaded_missing(self):
 
         message = compare_names(dotnet_names, python_names)
         assert not message
+        
+# region _generated
 
-
-@pytest.mark.parametrize("python_class, ignored_methods", [
-                          (PyMigrationPlanBuilder, None),
-                          (PyServerToCloudMigrationPlanBuilder, None),
-                          (PyMigrationResult, None),
-                          (PyMigrationManifest, None),
-                          (PyResult, ["CastFailure"]),
-                          (PyMigrator, None),
-                          (PyMigrationPlan, None),
-                          (PyMigrationHookBuilder, None),
-                          (PyContentTransformerBuilder, None),
-                          (PyContentMappingBuilder, None),
-                          (PyContentFilterBuilder, None),
-                          (PyMigrationPlanOptionsBuilder, None),
-                          (PyMigrationPlanOptionsCollection, None),
-                          (PyMigrationHookFactoryCollection, None)
-                          ])
-def test_classes(python_class, ignored_methods):
+from tableau_migration.migration import (  # noqa: E402, F401
+    PyContentLocation,
+    PyContentReference,
+    PyMigrationCompletionStatus,
+    PyResult
+)
+
+from tableau_migration.migration_api_rest_models import (  # noqa: E402, F401
+    PyAdministratorLevels,
+    PyContentPermissions,
+    PyExtractEncryptionModes,
+    PyLabelCategories,
+    PyLicenseLevels,
+    PyPermissionsCapabilityModes,
+    PyPermissionsCapabilityNames,
+    PySiteRoles
+)
+
+from tableau_migration.migration_api_rest_models_types import (  # noqa: E402, F401
+    PyAuthenticationTypes,
+    PyDataSourceFileTypes,
+    PyWorkbookFileTypes
+)
+
+from tableau_migration.migration_content import (  # noqa: E402, F401
+    PyConnection,
+    PyConnectionsContent,
+    PyContainerContent,
+    PyDataSource,
+    PyDataSourceDetails,
+    PyDescriptionContent,
+    PyExtractContent,
+    PyGroup,
+    PyGroupUser,
+    PyLabel,
+    PyProject,
+    PyPublishableDataSource,
+    PyPublishableGroup,
+    PyPublishableWorkbook,
+    PyPublishedContent,
+    PyTag,
+    PyUser,
+    PyUsernameContent,
+    PyView,
+    PyWithDomain,
+    PyWithOwner,
+    PyWithTags,
+    PyWorkbook,
+    PyWorkbookDetails
+)
+
+from tableau_migration.migration_content_permissions import (  # noqa: E402, F401
+    PyCapability,
+    PyGranteeCapability,
+    PyGranteeType,
+    PyPermissions
+)
+
+from tableau_migration.migration_engine import PyContentMigrationItem # noqa: E402, F401
+
+from tableau_migration.migration_engine_actions import PyMigrationActionResult # noqa: E402, F401
+
+from tableau_migration.migration_engine_hooks_mappings import PyContentMappingContext # noqa: E402, F401
+
+from tableau_migration.migration_engine_hooks_postpublish import (  # noqa: E402, F401
+    PyBulkPostPublishContext,
+    PyContentItemPostPublishContext
+)
+
+from tableau_migration.migration_engine_manifest import (  # noqa: E402, F401
+    PyMigrationManifestEntry,
+    PyMigrationManifestEntryEditor,
+    PyMigrationManifestEntryStatus
+)
+
+from tableau_migration.migration_engine_migrators import PyContentItemMigrationResult # noqa: E402, F401
+
+from tableau_migration.migration_engine_migrators_batch import PyContentBatchMigrationResult # noqa: E402, F401
+
+
+from Tableau.Migration import MigrationCompletionStatus
+from Tableau.Migration.Api.Rest.Models import AdministratorLevels
+from Tableau.Migration.Api.Rest.Models import ContentPermissions
+from Tableau.Migration.Api.Rest.Models import ExtractEncryptionModes
+from Tableau.Migration.Api.Rest.Models import LabelCategories
+from Tableau.Migration.Api.Rest.Models import LicenseLevels
+from Tableau.Migration.Api.Rest.Models import PermissionsCapabilityModes
+from Tableau.Migration.Api.Rest.Models import PermissionsCapabilityNames
+from Tableau.Migration.Api.Rest.Models import SiteRoles
+from Tableau.Migration.Api.Rest.Models.Types import AuthenticationTypes
+from Tableau.Migration.Api.Rest.Models.Types import DataSourceFileTypes
+from Tableau.Migration.Api.Rest.Models.Types import WorkbookFileTypes
+from Tableau.Migration.Content.Permissions import GranteeType
+from Tableau.Migration.Engine.Manifest import MigrationManifestEntryStatus
+
+_generated_class_data = [
+    (PyContentLocation, None),
+    (PyContentReference, None),
+    (PyResult, [ "CastFailure" ]),
+    (PyConnection, None),
+    (PyConnectionsContent, None),
+    (PyContainerContent, None),
+    (PyDataSource, [ "SetLocation" ]),
+    (PyDataSourceDetails, [ "SetLocation" ]),
+    (PyDescriptionContent, None),
+    (PyExtractContent, None),
+    (PyGroup, [ "SetLocation" ]),
+    (PyGroupUser, None),
+    (PyLabel, [ "Id" ]),
+    (PyProject, [ "Container", "SetLocation" ]),
+    (PyPublishableDataSource, [ "DisposeAsync", "File", "SetLocation" ]),
+    (PyPublishableGroup, [ "SetLocation" ]),
+    (PyPublishableWorkbook, [ "ChildPermissionContentItems", "ChildType", "DisposeAsync", "File", "SetLocation", "ShouldMigrateChildPermissions" ]),
+    (PyPublishedContent, None),
+    (PyTag, None),
+    (PyUser, [ "SetLocation" ]),
+    (PyUsernameContent, [ "SetLocation" ]),
+    (PyView, None),
+    (PyWithDomain, None),
+    (PyWithOwner, None),
+    (PyWithTags, None),
+    (PyWorkbook, [ "SetLocation" ]),
+    (PyWorkbookDetails, [ "ChildPermissionContentItems", "ChildType", "SetLocation", "ShouldMigrateChildPermissions" ]),
+    (PyCapability, None),
+    (PyGranteeCapability, None),
+    (PyPermissions, None),
+    (PyContentMigrationItem, None),
+    (PyMigrationActionResult, [ "CastFailure" ]),
+    (PyContentMappingContext, [ "ToTask" ]),
+    (PyBulkPostPublishContext, [ "ToTask" ]),
+    (PyContentItemPostPublishContext, [ "ToTask" ]),
+    (PyMigrationManifestEntry, None),
+    (PyMigrationManifestEntryEditor, [ "SetFailed" ]),
+    (PyContentItemMigrationResult, [ "CastFailure" ]),
+    (PyContentBatchMigrationResult, [ "CastFailure" ])
+]
+
+_generated_enum_data = [
+    (PyMigrationCompletionStatus, MigrationCompletionStatus),
+    (PyAdministratorLevels, AdministratorLevels),
+    (PyContentPermissions, ContentPermissions),
+    (PyExtractEncryptionModes, ExtractEncryptionModes),
+    (PyLabelCategories, LabelCategories),
+    (PyLicenseLevels, LicenseLevels),
+    (PyPermissionsCapabilityModes, PermissionsCapabilityModes),
+    (PyPermissionsCapabilityNames, PermissionsCapabilityNames),
+    (PySiteRoles, SiteRoles),
+    (PyAuthenticationTypes, AuthenticationTypes),
+    (PyDataSourceFileTypes, DataSourceFileTypes),
+    (PyWorkbookFileTypes, WorkbookFileTypes),
+    (PyGranteeType, GranteeType),
+    (PyMigrationManifestEntryStatus, MigrationManifestEntryStatus)
+]
+
+# endregion
+
+_test_class_data = [
+    (PyMigrationPlanBuilder, None),
+    (PyServerToCloudMigrationPlanBuilder, None),
+    (PyMigrationResult, None),
+    (PyMigrationManifest, None),
+    (PyMigrator, None),
+    (PyMigrationPlan, None),
+    (PyMigrationHookBuilder, None),
+    (PyContentTransformerBuilder, None),
+    (PyContentMappingBuilder, None),
+    (PyContentFilterBuilder, None),
+    (PyMigrationPlanOptionsBuilder, None),
+    (PyMigrationPlanOptionsCollection, None),
+    (PyMigrationHookFactoryCollection, None),
+    (PyDestinationContentReferenceFinder, None),
+    (PyDestinationContentReferenceFinderFactory, [ "ForContentType" ]),
+    (PySourceContentReferenceFinder, None),
+    (PySourceContentReferenceFinderFactory, [ "ForContentType" ])
+]
+_test_class_data.extend(_generated_class_data)
+
+@pytest.mark.parametrize("python_class, ignored_members", _test_class_data)
+def test_classes(python_class, ignored_members):
     """Verify that all the python wrapper classes actually wrap all the dotnet methods and properties."""
     from Tableau.Migration.Interop import InteropHelper
 
@@ -242,26 +416,28 @@ def test_classes(python_class, ignored_methods):
     _all_py_props = get_class_properties(python_class)
     
     # Get all the dotnet methods and properties
-    _all_dotnet_methods = InteropHelper.GetMethods[dotnet_class]()
-    _all_dotnet_props = InteropHelper.GetProperties[dotnet_class]()
+    _all_dotnet_methods = InteropHelper.GetMethods(dotnet_class)
+    _all_dotnet_props = InteropHelper.GetProperties(dotnet_class)
 
     # Clean methods that should be ignored
-    if ignored_methods is None:
+    if ignored_members is None:
         _clean_dotnet_method = _all_dotnet_methods
+        _clean_dotnet_props = _all_dotnet_props
     else:
-        _clean_dotnet_method = [method for method in _all_dotnet_methods if method not in ignored_methods]
+        _clean_dotnet_method = [method for method in _all_dotnet_methods if method not in ignored_members]
+        _clean_dotnet_props = [prop for prop in _all_dotnet_props if prop not in ignored_members]
 
     # Compare the lists
     method_message = compare_names(_clean_dotnet_method, _all_py_methods)
-    prop_message = compare_names(_all_dotnet_props, _all_py_props)
+    prop_message = compare_names(_clean_dotnet_props, _all_py_props)
     
     # Assert
     assert not method_message # Remember that the names are normalize
     assert not prop_message # Remember that the names are normalize
 
+_test_enum_data = []
+_test_enum_data.extend(_generated_enum_data)
 
-@pytest.mark.parametrize("python_class, dotnet_enum", [
-    (PyMigrationCompletionStatus, MigrationCompletionStatus)
-    ])
+@pytest.mark.parametrize("python_class, dotnet_enum", _test_enum_data)
 def test_enum(python_class, dotnet_enum):
     verify_enum(python_class, dotnet_enum)
diff --git a/src/Python/tests/test_migration.py b/src/Python/tests/test_migration.py
index b0414b3..87695ab 100644
--- a/src/Python/tests/test_migration.py
+++ b/src/Python/tests/test_migration.py
@@ -21,6 +21,7 @@
 import pytest
 
 from tableau_migration.migration import (
+    PyContentLocation,
     PyMigrationManifest, 
     PyMigrationResult)
 from tableau_migration.migration_engine import (
@@ -30,6 +31,7 @@
 
 import System
 from Tableau.Migration import (
+    ContentLocation,
     IMigrator, 
     IMigrationManifest, 
     IMigrationPlan,
@@ -134,4 +136,12 @@ def test_add_error_throw_on_bad_type(self):
         invokedMethodNames = [methodInfo.Method.Name for methodInfo in manifest_mock.Invocations]
         # dotnet function was not called, as there was no function to call that takes
         # a python exception
-        assert not invokedMethodNames 
+        assert not invokedMethodNames
+        
+class TestPyContentLocation():    
+    def test_path_segments(self):
+        dotnet = ContentLocation(["parent", "child", "item"])
+        py = PyContentLocation(dotnet)
+        
+        path = py.path_segments
+        assert path == ["parent", "child", "item"]
diff --git a/src/Python/tests/conftest.py b/src/Python/tests/test_migration_api_rest_models.py
similarity index 51%
rename from src/Python/tests/conftest.py
rename to src/Python/tests/test_migration_api_rest_models.py
index 0bdc7e1..318e3cb 100644
--- a/src/Python/tests/conftest.py
+++ b/src/Python/tests/test_migration_api_rest_models.py
@@ -13,15 +13,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
 import pytest
-import os
 
-# The conftest.py file serves as a means of providing fixtures for an entire directory. 
-# Fixtures defined in a conftest.py can be used by any test in that package without needing to import them (pytest will automatically discover them).
-# https://docs.pytest.org/en/7.1.x/reference/fixtures.html#conftest-py-sharing-fixtures-across-multiple-files
+from tableau_migration.migration_api_rest_models import PyAdministratorLevels
 
-@pytest.fixture(autouse=False)
-def skip_by_python_lifetime_env_var():
-    if os.getenv('SKIP_PYTHON_LIFETIME_TESTS', 'False').lower() == 'true':
-        pytest.skip("skipped due to SKIP_PYTHON_LIFETIME_TESTS environment variable")
+class TestPyAdministratorLevels:
+    def test_string_compare(self):
+        assert "Site" == PyAdministratorLevels.SITE
\ No newline at end of file
diff --git a/src/Python/tests/test_migration_content.py b/src/Python/tests/test_migration_content.py
new file mode 100644
index 0000000..07e3a8e
--- /dev/null
+++ b/src/Python/tests/test_migration_content.py
@@ -0,0 +1,860 @@
+# Copyright (c) 2024, Salesforce, Inc.
+# SPDX-License-Identifier: Apache-2
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from typing import List
+import pytest
+
+from tableau_migration.migration_content import PyConnection, PyPublishableWorkbook, PyTag, PyUsernameContent, PyWithTags
+from uuid import uuid4
+
+from Tableau.Migration.Content import IConnection, IPublishableWorkbook, IUsernameContent, IWithTags, ITag
+import Moq
+
+from tests.helpers.autofixture import AutoFixtureTestBase
+from System import String
+
+class TestPyUsernameContent():
+    def test_init(self):
+        mock = Moq.Mock[IUsernameContent]()
+        py = PyUsernameContent(mock.Object)
+
+        d = py.domain
+
+class TestPyConnection():
+    def test_query_tagging_enabled(self):
+        mock = Moq.Mock[IConnection]()
+        py = PyConnection(mock.Object)
+
+        assert py.query_tagging_enabled is None
+
+
+class TestPyPublishableWorkbook(AutoFixtureTestBase):
+    def test_thumbnails_user_id(self):
+        mock = Moq.Mock[IPublishableWorkbook]()
+        py = PyPublishableWorkbook(mock.Object)
+
+        new_id = uuid4()
+        py.thumbnails_user_id = new_id
+
+    def test_hidden_view_names(self):
+        dotnet = self.create(IPublishableWorkbook)
+        py = PyPublishableWorkbook(dotnet)
+
+        assert len(dotnet.HiddenViewNames) != 0
+        assert len(py.hidden_view_names) == len(dotnet.HiddenViewNames)
+        assert set(py.hidden_view_names) == set(dotnet.HiddenViewNames)
+
+    def test_hidden_view_names_set(self):
+        dotnet = self.create(IPublishableWorkbook)
+        py = PyPublishableWorkbook(dotnet)
+        
+        assert len(dotnet.HiddenViewNames) != 0
+        assert len(py.hidden_view_names) == len(dotnet.HiddenViewNames)
+        
+        # create test data        
+        testValue1 = "Hidden View 1"
+        testValue2 = "Hidden View 2"
+        testCollection = [testValue1,testValue2]
+        
+        # set property to new test value
+        py.hidden_view_names = testCollection
+        # assert value
+        assert len(py.hidden_view_names) == len(testCollection)    
+        assert set(py.hidden_view_names) == set(testCollection)
+
+class TestPyWithTags(AutoFixtureTestBase):
+
+    def test_ctor(self):
+        dotnet = self.create(IWithTags)
+        py = PyWithTags(dotnet)
+
+        assert len(dotnet.Tags) != 0
+        assert len(py.tags) == len(dotnet.Tags)
+
+        # Compare labels
+        dotnet_labels = [dotnet_tag.Label for dotnet_tag in dotnet.Tags]
+        py_labels = [py_tag.label for py_tag in py.tags]
+        assert set(py_labels) == set(dotnet_labels)
+
+    def test_setter(self):
+        dotnet = self.create(IWithTags)
+        py = PyWithTags(dotnet)
+
+        assert len(dotnet.Tags) != 0
+        assert len(py.tags) == len(dotnet.Tags)
+
+        tag1 = PyTag(self.create(ITag))
+        tag2 = PyTag(self.create(ITag))
+        tags_collection = [tag1, tag2]
+
+        assert len(tags_collection) == 2
+
+        py.tags = tags_collection
+
+        assert len(py.tags) == len(tags_collection)
+        
+    def test_setter_empty(self):
+        dotnet = self.create(IWithTags)
+        py = PyWithTags(dotnet)
+
+        assert len(dotnet.Tags) != 0
+        assert len(py.tags) == len(dotnet.Tags)
+
+        tags_collection = None
+
+        assert tags_collection is None
+
+        py.tags = tags_collection
+
+        assert len(py.tags) == 0
+# region _generated
+
+from tableau_migration.migration import PyContentReference # noqa: E402, F401
+from typing import (  # noqa: E402, F401
+    Sequence,
+    List
+)
+from uuid import UUID # noqa: E402, F401
+
+from System import (  # noqa: E402, F401
+    Guid,
+    String as String
+)
+from System.Collections.Generic import (  # noqa: E402, F401
+    List as DotnetList,
+    HashSet as DotnetHashSet
+)
+from Tableau.Migration.Content import (  # noqa: E402, F401
+    IConnection,
+    IConnectionsContent,
+    IContainerContent,
+    IDataSource,
+    IDataSourceDetails,
+    IDescriptionContent,
+    IExtractContent,
+    IGroup,
+    IGroupUser,
+    ILabel,
+    IProject,
+    IPublishableDataSource,
+    IPublishableGroup,
+    IPublishableWorkbook,
+    IPublishedContent,
+    ITag,
+    IUser,
+    IUsernameContent,
+    IView,
+    IWithDomain,
+    IWithOwner,
+    IWithTags,
+    IWorkbook,
+    IWorkbookDetails
+)
+
+from tableau_migration.migration_content import (  # noqa: E402, F401
+    PyConnection,
+    PyConnectionsContent,
+    PyContainerContent,
+    PyDataSource,
+    PyDataSourceDetails,
+    PyDescriptionContent,
+    PyExtractContent,
+    PyGroup,
+    PyGroupUser,
+    PyLabel,
+    PyProject,
+    PyPublishableDataSource,
+    PyPublishableGroup,
+    PyPublishableWorkbook,
+    PyPublishedContent,
+    PyTag,
+    PyUser,
+    PyUsernameContent,
+    PyView,
+    PyWithDomain,
+    PyWithOwner,
+    PyWithTags,
+    PyWorkbook,
+    PyWorkbookDetails
+)
+
+
+# Extra imports for tests.
+from Tableau.Migration import IContentReference # noqa: E402, F401
+from System import (  # noqa: E402, F401
+    Boolean,
+    Nullable
+)
+from tests.helpers.autofixture import AutoFixtureTestBase # noqa: E402, F401
+
+class TestPyConnectionGenerated(AutoFixtureTestBase):
+    
+    def test_ctor(self):
+        dotnet = self.create(IConnection)
+        py = PyConnection(dotnet)
+        assert py._dotnet == dotnet
+    
+    def test_id_getter(self):
+        dotnet = self.create(IConnection)
+        py = PyConnection(dotnet)
+        assert py.id == None if dotnet.Id is None else UUID(dotnet.Id.ToString())
+    
+    def test_type_getter(self):
+        dotnet = self.create(IConnection)
+        py = PyConnection(dotnet)
+        assert py.type == dotnet.Type
+    
+    def test_server_address_getter(self):
+        dotnet = self.create(IConnection)
+        py = PyConnection(dotnet)
+        assert py.server_address == dotnet.ServerAddress
+    
+    def test_server_port_getter(self):
+        dotnet = self.create(IConnection)
+        py = PyConnection(dotnet)
+        assert py.server_port == dotnet.ServerPort
+    
+    def test_connection_username_getter(self):
+        dotnet = self.create(IConnection)
+        py = PyConnection(dotnet)
+        assert py.connection_username == dotnet.ConnectionUsername
+    
+    def test_query_tagging_enabled_getter(self):
+        dotnet = self.create(IConnection)
+        py = PyConnection(dotnet)
+        assert py.query_tagging_enabled == dotnet.QueryTaggingEnabled
+    
+class TestPyConnectionsContentGenerated(AutoFixtureTestBase):
+    
+    def test_ctor(self):
+        dotnet = self.create(IConnectionsContent)
+        py = PyConnectionsContent(dotnet)
+        assert py._dotnet == dotnet
+    
+    def test_connections_getter(self):
+        dotnet = self.create(IConnectionsContent)
+        py = PyConnectionsContent(dotnet)
+        assert len(dotnet.Connections) != 0
+        assert len(py.connections) == len(dotnet.Connections)
+    
+class TestPyContainerContentGenerated(AutoFixtureTestBase):
+    
+    def test_ctor(self):
+        dotnet = self.create(IContainerContent)
+        py = PyContainerContent(dotnet)
+        assert py._dotnet == dotnet
+    
+    def test_container_getter(self):
+        dotnet = self.create(IContainerContent)
+        py = PyContainerContent(dotnet)
+        assert py.container == None if dotnet.Container is None else PyContentReference(dotnet.Container)
+    
+class TestPyDataSourceGenerated(AutoFixtureTestBase):
+    
+    def test_ctor(self):
+        dotnet = self.create(IDataSource)
+        py = PyDataSource(dotnet)
+        assert py._dotnet == dotnet
+    
+    def test_has_extracts_getter(self):
+        dotnet = self.create(IDataSource)
+        py = PyDataSource(dotnet)
+        assert py.has_extracts == dotnet.HasExtracts
+    
+    def test_is_certified_getter(self):
+        dotnet = self.create(IDataSource)
+        py = PyDataSource(dotnet)
+        assert py.is_certified == dotnet.IsCertified
+    
+    def test_use_remote_query_agent_getter(self):
+        dotnet = self.create(IDataSource)
+        py = PyDataSource(dotnet)
+        assert py.use_remote_query_agent == dotnet.UseRemoteQueryAgent
+    
+    def test_use_remote_query_agent_setter(self):
+        dotnet = self.create(IDataSource)
+        py = PyDataSource(dotnet)
+        
+        # create test data
+        testValue = self.create(Boolean)
+        
+        # set property to new test value
+        py.use_remote_query_agent = testValue
+        
+        # assert value
+        assert py.use_remote_query_agent == testValue
+    
+class TestPyDataSourceDetailsGenerated(AutoFixtureTestBase):
+    
+    def test_ctor(self):
+        dotnet = self.create(IDataSourceDetails)
+        py = PyDataSourceDetails(dotnet)
+        assert py._dotnet == dotnet
+    
+    def test_certification_note_getter(self):
+        dotnet = self.create(IDataSourceDetails)
+        py = PyDataSourceDetails(dotnet)
+        assert py.certification_note == dotnet.CertificationNote
+    
+class TestPyDescriptionContentGenerated(AutoFixtureTestBase):
+    
+    def test_ctor(self):
+        dotnet = self.create(IDescriptionContent)
+        py = PyDescriptionContent(dotnet)
+        assert py._dotnet == dotnet
+    
+    def test_description_getter(self):
+        dotnet = self.create(IDescriptionContent)
+        py = PyDescriptionContent(dotnet)
+        assert py.description == dotnet.Description
+    
+    def test_description_setter(self):
+        dotnet = self.create(IDescriptionContent)
+        py = PyDescriptionContent(dotnet)
+        
+        # create test data
+        testValue = self.create(String)
+        
+        # set property to new test value
+        py.description = testValue
+        
+        # assert value
+        assert py.description == testValue
+    
+class TestPyExtractContentGenerated(AutoFixtureTestBase):
+    
+    def test_ctor(self):
+        dotnet = self.create(IExtractContent)
+        py = PyExtractContent(dotnet)
+        assert py._dotnet == dotnet
+    
+    def test_encrypt_extracts_getter(self):
+        dotnet = self.create(IExtractContent)
+        py = PyExtractContent(dotnet)
+        assert py.encrypt_extracts == dotnet.EncryptExtracts
+    
+    def test_encrypt_extracts_setter(self):
+        dotnet = self.create(IExtractContent)
+        py = PyExtractContent(dotnet)
+        
+        # create test data
+        testValue = self.create(Boolean)
+        
+        # set property to new test value
+        py.encrypt_extracts = testValue
+        
+        # assert value
+        assert py.encrypt_extracts == testValue
+    
+class TestPyGroupGenerated(AutoFixtureTestBase):
+    
+    def test_ctor(self):
+        dotnet = self.create(IGroup)
+        py = PyGroup(dotnet)
+        assert py._dotnet == dotnet
+    
+    def test_grant_license_mode_getter(self):
+        dotnet = self.create(IGroup)
+        py = PyGroup(dotnet)
+        assert py.grant_license_mode == dotnet.GrantLicenseMode
+    
+    def test_grant_license_mode_setter(self):
+        dotnet = self.create(IGroup)
+        py = PyGroup(dotnet)
+        
+        # create test data
+        testValue = self.create(String)
+        
+        # set property to new test value
+        py.grant_license_mode = testValue
+        
+        # assert value
+        assert py.grant_license_mode == testValue
+    
+    def test_site_role_getter(self):
+        dotnet = self.create(IGroup)
+        py = PyGroup(dotnet)
+        assert py.site_role == dotnet.SiteRole
+    
+    def test_site_role_setter(self):
+        dotnet = self.create(IGroup)
+        py = PyGroup(dotnet)
+        
+        # create test data
+        testValue = self.create(String)
+        
+        # set property to new test value
+        py.site_role = testValue
+        
+        # assert value
+        assert py.site_role == testValue
+    
+class TestPyGroupUserGenerated(AutoFixtureTestBase):
+    
+    def test_ctor(self):
+        dotnet = self.create(IGroupUser)
+        py = PyGroupUser(dotnet)
+        assert py._dotnet == dotnet
+    
+    def test_user_getter(self):
+        dotnet = self.create(IGroupUser)
+        py = PyGroupUser(dotnet)
+        assert py.user == None if dotnet.User is None else PyContentReference(dotnet.User)
+    
+    def test_user_setter(self):
+        dotnet = self.create(IGroupUser)
+        py = PyGroupUser(dotnet)
+        
+        # create test data
+        testValue = self.create(IContentReference)
+        
+        # set property to new test value
+        py.user = None if testValue is None else PyContentReference(testValue)
+        
+        # assert value
+        assert py.user == None if testValue is None else PyContentReference(testValue)
+    
+class TestPyLabelGenerated(AutoFixtureTestBase):
+    
+    def test_ctor(self):
+        dotnet = self.create(ILabel)
+        py = PyLabel(dotnet)
+        assert py._dotnet == dotnet
+    
+    def test_site_id_getter(self):
+        dotnet = self.create(ILabel)
+        py = PyLabel(dotnet)
+        assert py.site_id == None if dotnet.SiteId is None else UUID(dotnet.SiteId.ToString())
+    
+    def test_owner_id_getter(self):
+        dotnet = self.create(ILabel)
+        py = PyLabel(dotnet)
+        assert py.owner_id == None if dotnet.OwnerId is None else UUID(dotnet.OwnerId.ToString())
+    
+    def test_user_display_name_getter(self):
+        dotnet = self.create(ILabel)
+        py = PyLabel(dotnet)
+        assert py.user_display_name == dotnet.UserDisplayName
+    
+    def test_content_id_getter(self):
+        dotnet = self.create(ILabel)
+        py = PyLabel(dotnet)
+        assert py.content_id == None if dotnet.ContentId is None else UUID(dotnet.ContentId.ToString())
+    
+    def test_content_type_getter(self):
+        dotnet = self.create(ILabel)
+        py = PyLabel(dotnet)
+        assert py.content_type == dotnet.ContentType
+    
+    def test_message_getter(self):
+        dotnet = self.create(ILabel)
+        py = PyLabel(dotnet)
+        assert py.message == dotnet.Message
+    
+    def test_value_getter(self):
+        dotnet = self.create(ILabel)
+        py = PyLabel(dotnet)
+        assert py.value == dotnet.Value
+    
+    def test_category_getter(self):
+        dotnet = self.create(ILabel)
+        py = PyLabel(dotnet)
+        assert py.category == dotnet.Category
+    
+    def test_active_getter(self):
+        dotnet = self.create(ILabel)
+        py = PyLabel(dotnet)
+        assert py.active == dotnet.Active
+    
+    def test_elevated_getter(self):
+        dotnet = self.create(ILabel)
+        py = PyLabel(dotnet)
+        assert py.elevated == dotnet.Elevated
+    
+    def test_created_at_getter(self):
+        dotnet = self.create(ILabel)
+        py = PyLabel(dotnet)
+        assert py.created_at == dotnet.CreatedAt
+    
+    def test_updated_at_getter(self):
+        dotnet = self.create(ILabel)
+        py = PyLabel(dotnet)
+        assert py.updated_at == dotnet.UpdatedAt
+    
+class TestPyProjectGenerated(AutoFixtureTestBase):
+    
+    def test_ctor(self):
+        dotnet = self.create(IProject)
+        py = PyProject(dotnet)
+        assert py._dotnet == dotnet
+    
+    def test_content_permissions_getter(self):
+        dotnet = self.create(IProject)
+        py = PyProject(dotnet)
+        assert py.content_permissions == dotnet.ContentPermissions
+    
+    def test_content_permissions_setter(self):
+        dotnet = self.create(IProject)
+        py = PyProject(dotnet)
+        
+        # create test data
+        testValue = self.create(String)
+        
+        # set property to new test value
+        py.content_permissions = testValue
+        
+        # assert value
+        assert py.content_permissions == testValue
+    
+    def test_parent_project_getter(self):
+        dotnet = self.create(IProject)
+        py = PyProject(dotnet)
+        assert py.parent_project == None if dotnet.ParentProject is None else PyContentReference(dotnet.ParentProject)
+    
+class TestPyPublishableGroupGenerated(AutoFixtureTestBase):
+    
+    def test_ctor(self):
+        dotnet = self.create(IPublishableGroup)
+        py = PyPublishableGroup(dotnet)
+        assert py._dotnet == dotnet
+    
+    def test_users_getter(self):
+        dotnet = self.create(IPublishableGroup)
+        py = PyPublishableGroup(dotnet)
+        assert len(dotnet.Users) != 0
+        assert len(py.users) == len(dotnet.Users)
+    
+    def test_users_setter(self):
+        dotnet = self.create(IPublishableGroup)
+        py = PyPublishableGroup(dotnet)
+        assert len(dotnet.Users) != 0
+        assert len(py.users) == len(dotnet.Users)
+        
+        # create test data
+        dotnetCollection = DotnetList[IGroupUser]()
+        dotnetCollection.Add(self.create(IGroupUser))
+        dotnetCollection.Add(self.create(IGroupUser))
+        testCollection = [] if dotnetCollection is None else [PyGroupUser(x) for x in dotnetCollection if x is not None]
+        
+        # set property to new test value
+        py.users = testCollection
+        
+        # assert value
+        assert len(py.users) == len(testCollection)
+    
+class TestPyPublishableWorkbookGenerated(AutoFixtureTestBase):
+    
+    def test_ctor(self):
+        dotnet = self.create(IPublishableWorkbook)
+        py = PyPublishableWorkbook(dotnet)
+        assert py._dotnet == dotnet
+    
+    def test_thumbnails_user_id_getter(self):
+        dotnet = self.create(IPublishableWorkbook)
+        py = PyPublishableWorkbook(dotnet)
+        assert py.thumbnails_user_id == None if dotnet.ThumbnailsUserId is None else UUID(dotnet.ThumbnailsUserId.ToString())
+    
+    def test_thumbnails_user_id_setter(self):
+        dotnet = self.create(IPublishableWorkbook)
+        py = PyPublishableWorkbook(dotnet)
+        
+        # create test data
+        testValue = self.create(Nullable[Guid])
+        
+        # set property to new test value
+        py.thumbnails_user_id = None if testValue is None else UUID(testValue.ToString())
+        
+        # assert value
+        assert py.thumbnails_user_id == None if testValue is None else UUID(testValue.ToString())
+    
+    def test_hidden_view_names_getter(self):
+        dotnet = self.create(IPublishableWorkbook)
+        py = PyPublishableWorkbook(dotnet)
+        assert len(dotnet.HiddenViewNames) != 0
+        assert len(py.hidden_view_names) == len(dotnet.HiddenViewNames)
+    
+    def test_hidden_view_names_setter(self):
+        dotnet = self.create(IPublishableWorkbook)
+        py = PyPublishableWorkbook(dotnet)
+        assert len(dotnet.HiddenViewNames) != 0
+        assert len(py.hidden_view_names) == len(dotnet.HiddenViewNames)
+        
+        # create test data
+        dotnetCollection = DotnetList[String]()
+        dotnetCollection.Add(self.create(String))
+        dotnetCollection.Add(self.create(String))
+        testCollection = [] if dotnetCollection is None else [x for x in dotnetCollection if x is not None]
+        
+        # set property to new test value
+        py.hidden_view_names = testCollection
+        
+        # assert value
+        assert len(py.hidden_view_names) == len(testCollection)
+    
+class TestPyPublishedContentGenerated(AutoFixtureTestBase):
+    
+    def test_ctor(self):
+        dotnet = self.create(IPublishedContent)
+        py = PyPublishedContent(dotnet)
+        assert py._dotnet == dotnet
+    
+    def test_created_at_getter(self):
+        dotnet = self.create(IPublishedContent)
+        py = PyPublishedContent(dotnet)
+        assert py.created_at == dotnet.CreatedAt
+    
+    def test_updated_at_getter(self):
+        dotnet = self.create(IPublishedContent)
+        py = PyPublishedContent(dotnet)
+        assert py.updated_at == dotnet.UpdatedAt
+    
+    def test_webpage_url_getter(self):
+        dotnet = self.create(IPublishedContent)
+        py = PyPublishedContent(dotnet)
+        assert py.webpage_url == dotnet.WebpageUrl
+    
+class TestPyTagGenerated(AutoFixtureTestBase):
+    
+    def test_ctor(self):
+        dotnet = self.create(ITag)
+        py = PyTag(dotnet)
+        assert py._dotnet == dotnet
+    
+    def test_label_getter(self):
+        dotnet = self.create(ITag)
+        py = PyTag(dotnet)
+        assert py.label == dotnet.Label
+    
+    def test_label_setter(self):
+        dotnet = self.create(ITag)
+        py = PyTag(dotnet)
+        
+        # create test data
+        testValue = self.create(String)
+        
+        # set property to new test value
+        py.label = testValue
+        
+        # assert value
+        assert py.label == testValue
+    
+class TestPyUserGenerated(AutoFixtureTestBase):
+    
+    def test_ctor(self):
+        dotnet = self.create(IUser)
+        py = PyUser(dotnet)
+        assert py._dotnet == dotnet
+    
+    def test_full_name_getter(self):
+        dotnet = self.create(IUser)
+        py = PyUser(dotnet)
+        assert py.full_name == dotnet.FullName
+    
+    def test_full_name_setter(self):
+        dotnet = self.create(IUser)
+        py = PyUser(dotnet)
+        
+        # create test data
+        testValue = self.create(String)
+        
+        # set property to new test value
+        py.full_name = testValue
+        
+        # assert value
+        assert py.full_name == testValue
+    
+    def test_email_getter(self):
+        dotnet = self.create(IUser)
+        py = PyUser(dotnet)
+        assert py.email == dotnet.Email
+    
+    def test_email_setter(self):
+        dotnet = self.create(IUser)
+        py = PyUser(dotnet)
+        
+        # create test data
+        testValue = self.create(String)
+        
+        # set property to new test value
+        py.email = testValue
+        
+        # assert value
+        assert py.email == testValue
+    
+    def test_site_role_getter(self):
+        dotnet = self.create(IUser)
+        py = PyUser(dotnet)
+        assert py.site_role == dotnet.SiteRole
+    
+    def test_site_role_setter(self):
+        dotnet = self.create(IUser)
+        py = PyUser(dotnet)
+        
+        # create test data
+        testValue = self.create(String)
+        
+        # set property to new test value
+        py.site_role = testValue
+        
+        # assert value
+        assert py.site_role == testValue
+    
+    def test_authentication_type_getter(self):
+        dotnet = self.create(IUser)
+        py = PyUser(dotnet)
+        assert py.authentication_type == dotnet.AuthenticationType
+    
+    def test_authentication_type_setter(self):
+        dotnet = self.create(IUser)
+        py = PyUser(dotnet)
+        
+        # create test data
+        testValue = self.create(String)
+        
+        # set property to new test value
+        py.authentication_type = testValue
+        
+        # assert value
+        assert py.authentication_type == testValue
+    
+    def test_administrator_level_getter(self):
+        dotnet = self.create(IUser)
+        py = PyUser(dotnet)
+        assert py.administrator_level == dotnet.AdministratorLevel
+    
+    def test_license_level_getter(self):
+        dotnet = self.create(IUser)
+        py = PyUser(dotnet)
+        assert py.license_level == dotnet.LicenseLevel
+    
+    def test_can_publish_getter(self):
+        dotnet = self.create(IUser)
+        py = PyUser(dotnet)
+        assert py.can_publish == dotnet.CanPublish
+    
+class TestPyWithDomainGenerated(AutoFixtureTestBase):
+    
+    def test_ctor(self):
+        dotnet = self.create(IWithDomain)
+        py = PyWithDomain(dotnet)
+        assert py._dotnet == dotnet
+    
+    def test_domain_getter(self):
+        dotnet = self.create(IWithDomain)
+        py = PyWithDomain(dotnet)
+        assert py.domain == dotnet.Domain
+    
+class TestPyWithOwnerGenerated(AutoFixtureTestBase):
+    
+    def test_ctor(self):
+        dotnet = self.create(IWithOwner)
+        py = PyWithOwner(dotnet)
+        assert py._dotnet == dotnet
+    
+    def test_owner_getter(self):
+        dotnet = self.create(IWithOwner)
+        py = PyWithOwner(dotnet)
+        assert py.owner == None if dotnet.Owner is None else PyContentReference(dotnet.Owner)
+    
+    def test_owner_setter(self):
+        dotnet = self.create(IWithOwner)
+        py = PyWithOwner(dotnet)
+        
+        # create test data
+        testValue = self.create(IContentReference)
+        
+        # set property to new test value
+        py.owner = None if testValue is None else PyContentReference(testValue)
+        
+        # assert value
+        assert py.owner == None if testValue is None else PyContentReference(testValue)
+    
+class TestPyWithTagsGenerated(AutoFixtureTestBase):
+    
+    def test_ctor(self):
+        dotnet = self.create(IWithTags)
+        py = PyWithTags(dotnet)
+        assert py._dotnet == dotnet
+    
+    def test_tags_getter(self):
+        dotnet = self.create(IWithTags)
+        py = PyWithTags(dotnet)
+        assert len(dotnet.Tags) != 0
+        assert len(py.tags) == len(dotnet.Tags)
+    
+    def test_tags_setter(self):
+        dotnet = self.create(IWithTags)
+        py = PyWithTags(dotnet)
+        assert len(dotnet.Tags) != 0
+        assert len(py.tags) == len(dotnet.Tags)
+        
+        # create test data
+        dotnetCollection = DotnetList[ITag]()
+        dotnetCollection.Add(self.create(ITag))
+        dotnetCollection.Add(self.create(ITag))
+        testCollection = [] if dotnetCollection is None else [PyTag(x) for x in dotnetCollection if x is not None]
+        
+        # set property to new test value
+        py.tags = testCollection
+        
+        # assert value
+        assert len(py.tags) == len(testCollection)
+    
+class TestPyWorkbookGenerated(AutoFixtureTestBase):
+    
+    def test_ctor(self):
+        dotnet = self.create(IWorkbook)
+        py = PyWorkbook(dotnet)
+        assert py._dotnet == dotnet
+    
+    def test_show_tabs_getter(self):
+        dotnet = self.create(IWorkbook)
+        py = PyWorkbook(dotnet)
+        assert py.show_tabs == dotnet.ShowTabs
+    
+    def test_show_tabs_setter(self):
+        dotnet = self.create(IWorkbook)
+        py = PyWorkbook(dotnet)
+        
+        # create test data
+        testValue = self.create(Boolean)
+        
+        # set property to new test value
+        py.show_tabs = testValue
+        
+        # assert value
+        assert py.show_tabs == testValue
+    
+    def test_size_getter(self):
+        dotnet = self.create(IWorkbook)
+        py = PyWorkbook(dotnet)
+        assert py.size == dotnet.Size
+    
+class TestPyWorkbookDetailsGenerated(AutoFixtureTestBase):
+    
+    def test_ctor(self):
+        dotnet = self.create(IWorkbookDetails)
+        py = PyWorkbookDetails(dotnet)
+        assert py._dotnet == dotnet
+    
+    def test_views_getter(self):
+        dotnet = self.create(IWorkbookDetails)
+        py = PyWorkbookDetails(dotnet)
+        assert len(dotnet.Views) != 0
+        assert len(py.views) == len(dotnet.Views)
+    
+
+# endregion
+
diff --git a/src/Python/tests/test_migration_content_permissions.py b/src/Python/tests/test_migration_content_permissions.py
new file mode 100644
index 0000000..f07879a
--- /dev/null
+++ b/src/Python/tests/test_migration_content_permissions.py
@@ -0,0 +1,141 @@
+# region _generated
+
+from enum import IntEnum # noqa: E402, F401
+from typing import (  # noqa: E402, F401
+    Set,
+    Sequence
+)
+from uuid import UUID # noqa: E402, F401
+
+from System import Guid # noqa: E402, F401
+from System.Collections.Generic import (  # noqa: E402, F401
+    HashSet as DotnetHashSet,
+    List as DotnetList
+)
+from Tableau.Migration.Content.Permissions import (  # noqa: E402, F401
+    ICapability,
+    IGranteeCapability,
+    IPermissions
+)
+
+from tableau_migration.migration_content_permissions import (  # noqa: E402, F401
+    PyCapability,
+    PyGranteeCapability,
+    PyGranteeType,
+    PyPermissions
+)
+
+
+from Tableau.Migration.Content.Permissions import GranteeType
+
+# Extra imports for tests.
+from Tableau.Migration import IContentReference # noqa: E402, F401
+from System import Nullable # noqa: E402, F401
+from System.Collections.Generic import List as DotnetList # noqa: E402, F401
+from tests.helpers.autofixture import AutoFixtureTestBase # noqa: E402, F401
+
+class TestPyCapabilityGenerated(AutoFixtureTestBase):
+    
+    def test_ctor(self):
+        dotnet = self.create(ICapability)
+        py = PyCapability(dotnet)
+        assert py._dotnet == dotnet
+    
+    def test_name_getter(self):
+        dotnet = self.create(ICapability)
+        py = PyCapability(dotnet)
+        assert py.name == dotnet.Name
+    
+    def test_mode_getter(self):
+        dotnet = self.create(ICapability)
+        py = PyCapability(dotnet)
+        assert py.mode == dotnet.Mode
+    
+class TestPyGranteeCapabilityGenerated(AutoFixtureTestBase):
+    
+    def test_ctor(self):
+        dotnet = self.create(IGranteeCapability)
+        py = PyGranteeCapability(dotnet)
+        assert py._dotnet == dotnet
+    
+    def test_grantee_type_getter(self):
+        dotnet = self.create(IGranteeCapability)
+        py = PyGranteeCapability(dotnet)
+        assert py.grantee_type.value == (None if dotnet.GranteeType is None else PyGranteeType(dotnet.GranteeType.value__)).value
+    
+    def test_grantee_id_getter(self):
+        dotnet = self.create(IGranteeCapability)
+        py = PyGranteeCapability(dotnet)
+        assert py.grantee_id == None if dotnet.GranteeId is None else UUID(dotnet.GranteeId.ToString())
+    
+    def test_grantee_id_setter(self):
+        dotnet = self.create(IGranteeCapability)
+        py = PyGranteeCapability(dotnet)
+        
+        # create test data
+        testValue = self.create(Guid)
+        
+        # set property to new test value
+        py.grantee_id = None if testValue is None else UUID(testValue.ToString())
+        
+        # assert value
+        assert py.grantee_id == None if testValue is None else UUID(testValue.ToString())
+    
+    def test_capabilities_getter(self):
+        dotnet = self.create(IGranteeCapability)
+        py = PyGranteeCapability(dotnet)
+        assert len(dotnet.Capabilities) != 0
+        assert len(py.capabilities) == len(dotnet.Capabilities)
+    
+class TestPyPermissionsGenerated(AutoFixtureTestBase):
+    
+    def test_ctor(self):
+        dotnet = self.create(IPermissions)
+        py = PyPermissions(dotnet)
+        assert py._dotnet == dotnet
+    
+    def test_grantee_capabilities_getter(self):
+        dotnet = self.create(IPermissions)
+        py = PyPermissions(dotnet)
+        assert len(dotnet.GranteeCapabilities) != 0
+        assert len(py.grantee_capabilities) == len(dotnet.GranteeCapabilities)
+    
+    def test_grantee_capabilities_setter(self):
+        dotnet = self.create(IPermissions)
+        py = PyPermissions(dotnet)
+        assert len(dotnet.GranteeCapabilities) != 0
+        assert len(py.grantee_capabilities) == len(dotnet.GranteeCapabilities)
+        
+        # create test data
+        dotnetCollection = DotnetList[IGranteeCapability]()
+        dotnetCollection.Add(self.create(IGranteeCapability))
+        dotnetCollection.Add(self.create(IGranteeCapability))
+        testCollection = None if dotnetCollection is None else list((None if x is None else PyGranteeCapability(x)) for x in dotnetCollection)
+        
+        # set property to new test value
+        py.grantee_capabilities = testCollection
+        
+        # assert value
+        assert len(py.grantee_capabilities) == len(testCollection)
+    
+    def test_parent_id_getter(self):
+        dotnet = self.create(IPermissions)
+        py = PyPermissions(dotnet)
+        assert py.parent_id == None if dotnet.ParentId is None else UUID(dotnet.ParentId.ToString())
+    
+    def test_parent_id_setter(self):
+        dotnet = self.create(IPermissions)
+        py = PyPermissions(dotnet)
+        
+        # create test data
+        testValue = self.create(Nullable[Guid])
+        
+        # set property to new test value
+        py.parent_id = None if testValue is None else UUID(testValue.ToString())
+        
+        # assert value
+        assert py.parent_id == None if testValue is None else UUID(testValue.ToString())
+    
+
+# endregion
+
diff --git a/src/Python/tests/test_migration_engine_endpoints_search.py b/src/Python/tests/test_migration_engine_endpoints_search.py
new file mode 100644
index 0000000..0be651a
--- /dev/null
+++ b/src/Python/tests/test_migration_engine_endpoints_search.py
@@ -0,0 +1,356 @@
+# Copyright (c) 2024, Salesforce, Inc.
+# SPDX-License-Identifier: Apache-2
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+import pytest
+
+from uuid import UUID
+
+from tableau_migration.migration import (
+    PyContentLocation
+)
+
+from tableau_migration.migration_engine_endpoints_search import (
+    PyDestinationContentReferenceFinderFactory,
+    PyDestinationContentReferenceFinder,
+    PySourceContentReferenceFinderFactory,
+    PySourceContentReferenceFinder
+)
+
+from tableau_migration.migration_content import (
+    PyUser,
+    PyGroup,
+    PyProject,
+    PyDataSource,
+    PyWorkbook
+)
+
+from tests.helpers.autofixture import AutoFixtureTestBase
+
+from System import (
+    IServiceProvider
+)
+
+from System.Threading import (
+    CancellationToken
+)
+
+from Microsoft.Extensions.DependencyInjection import (
+    ServiceCollectionContainerBuilderExtensions, 
+    ServiceCollection
+)
+
+import Moq
+
+from Tableau.Migration import (
+    ContentLocation
+)
+
+from Tableau.Migration.Content import ( 
+    IUser,
+    IGroup,
+    IProject,
+    IDataSource,
+    IWorkbook
+)
+
+from Tableau.Migration.Engine.Endpoints.Search import (
+    IDestinationContentReferenceFinder,
+    ISourceContentReferenceFinder,
+    ManifestDestinationContentReferenceFinderFactory,
+    ManifestSourceContentReferenceFinderFactory
+)
+
+class TestPySourceContentReferenceFinderFactory(AutoFixtureTestBase):
+    _test_data = [
+        (IUser, None),
+        (PyUser, PySourceContentReferenceFinder),
+        (IGroup, None),
+        (PyGroup, PySourceContentReferenceFinder),
+        (IProject, None),
+        (PyProject, PySourceContentReferenceFinder),
+        (IDataSource, None),
+        (PyDataSource, PySourceContentReferenceFinder),
+        (IWorkbook, None),
+        (PyWorkbook, PySourceContentReferenceFinder)
+    ]
+
+    @pytest.mark.parametrize("searched_type", _test_data)
+    def test_for_source_content_type_nothing_registered(self, searched_type):
+        service_collection = ServiceCollection()
+        provider = ServiceCollectionContainerBuilderExtensions.BuildServiceProvider(service_collection)
+        factory = PySourceContentReferenceFinderFactory(ManifestSourceContentReferenceFinderFactory(provider))
+
+        finder = factory.for_source_content_type(searched_type)
+
+        assert finder is None
+
+    @pytest.mark.parametrize("searched_type, expected_type", _test_data)
+    def test_for_source_content_type(self, searched_type, expected_type):
+        provider = self.create(IServiceProvider)
+        
+        factory = PySourceContentReferenceFinderFactory(ManifestSourceContentReferenceFinderFactory(provider))
+
+        finder = factory.for_source_content_type(searched_type)
+
+        if expected_type is None:
+            assert finder is None
+        else:
+            assert isinstance(finder, expected_type)
+            assert finder._content_type is searched_type
+
+class TestPyDestinationContentReferenceFinderFactory(AutoFixtureTestBase):
+    _test_data = [
+        (IUser, None),
+        (PyUser, PyDestinationContentReferenceFinder),
+        (IGroup, None),
+        (PyGroup, PyDestinationContentReferenceFinder),
+        (IProject, None),
+        (PyProject, PyDestinationContentReferenceFinder),
+        (IDataSource, None),
+        (PyDataSource, PyDestinationContentReferenceFinder),
+        (IWorkbook, None),
+        (PyWorkbook, PyDestinationContentReferenceFinder)
+    ]
+
+    @pytest.mark.parametrize("searched_type", _test_data)
+    def test_for_source_content_type_nothing_registered(self, searched_type):
+        service_collection = ServiceCollection()
+        provider = ServiceCollectionContainerBuilderExtensions.BuildServiceProvider(service_collection)
+        factory = PyDestinationContentReferenceFinderFactory(ManifestDestinationContentReferenceFinderFactory(provider))
+
+        finder = factory.for_destination_content_type(searched_type)
+
+        assert finder is None
+
+    @pytest.mark.parametrize("searched_type, expected_type", _test_data)
+    def test_for_source_content_type(self, searched_type, expected_type):
+        provider = self.create(IServiceProvider)
+        
+        factory = PyDestinationContentReferenceFinderFactory(ManifestDestinationContentReferenceFinderFactory(provider))
+
+        finder = factory.for_destination_content_type(searched_type)
+
+        if expected_type is None:
+            assert finder is None
+        else:
+            assert isinstance(finder, expected_type)
+            assert finder._content_type is searched_type
+            
+class TestPySourceContentReferenceFinder(AutoFixtureTestBase):
+    def test_find_by_id_with_none_id(self):
+        dotnet_source_finder = Moq.Mock[ISourceContentReferenceFinder[IUser]]()
+        finder = PySourceContentReferenceFinder(dotnet_source_finder.Object, IUser)
+
+        result = finder.find_by_id(None)
+        
+        assert result is None
+
+        invokedMethodNames = [methodInfo.Method.Name for methodInfo in dotnet_source_finder.Invocations]
+
+        assert invokedMethodNames == []
+        
+    def test_find_by_id(self):
+        dotnet_source_finder = self.create(ISourceContentReferenceFinder[IUser])
+        finder = PySourceContentReferenceFinder(dotnet_source_finder, IUser)
+
+        result = finder.find_by_id(UUID('{12345678-0000-0000-0000-000000000000}'))
+        
+        assert result is not None
+        
+    def test_find_by_id_with_cancel(self):
+        dotnet_source_finder = self.create(ISourceContentReferenceFinder[IUser])
+        finder = PySourceContentReferenceFinder(dotnet_source_finder, IUser)
+
+        result = finder.find_by_id(UUID('{12345678-0000-0000-0000-000000000000}'), CancellationToken(True))
+        
+        assert result is not None
+        
+    def test_find_by_source_location_with_none_location(self):
+        dotnet_source_finder = Moq.Mock[ISourceContentReferenceFinder[IProject]]()
+        finder = PySourceContentReferenceFinder(dotnet_source_finder.Object, IProject)
+
+        result = finder.find_by_source_location(None)
+        
+        assert result is None
+
+        invokedMethodNames = [methodInfo.Method.Name for methodInfo in dotnet_source_finder.Invocations]
+
+        assert invokedMethodNames == []
+        
+    def test_find_by_source_location(self):
+        dotnet_source_finder = self.create(ISourceContentReferenceFinder[IProject])
+        finder = PySourceContentReferenceFinder(dotnet_source_finder, IProject)
+
+        result = finder.find_by_source_location(PyContentLocation(ContentLocation(["parent", "child", "item"])))
+        
+        assert result is not None
+        
+    def test_find_by_source_location_with_cancel(self):
+        dotnet_source_finder = self.create(ISourceContentReferenceFinder[IProject])
+        finder = PySourceContentReferenceFinder(dotnet_source_finder, IProject)
+
+        result = finder.find_by_source_location(PyContentLocation(ContentLocation(["parent", "child", "item"])), CancellationToken(True))
+        
+        assert result is not None
+            
+class TestPyDestinationContentReferenceFinder(AutoFixtureTestBase):
+    _empty_test_data = [
+        (""),
+        (None),
+        ("   ")
+    ]
+
+    def test_find_by_id_with_none_id(self):
+        dotnet_destination_finder = Moq.Mock[IDestinationContentReferenceFinder[IGroup]]()
+        finder = PyDestinationContentReferenceFinder(dotnet_destination_finder.Object, IGroup)
+
+        result = finder.find_by_id(None)
+        
+        assert result is None
+
+        invokedMethodNames = [methodInfo.Method.Name for methodInfo in dotnet_destination_finder.Invocations]
+
+        assert invokedMethodNames == []
+        
+    def test_find_by_id(self):
+        dotnet_destination_finder = self.create(IDestinationContentReferenceFinder[IGroup])
+        finder = PyDestinationContentReferenceFinder(dotnet_destination_finder, IGroup)
+
+        result = finder.find_by_id(UUID('{12345678-0000-0000-0000-000000000000}'))
+        
+        assert result is not None
+        
+    def test_find_by_id_with_cancel(self):
+        dotnet_destination_finder = self.create(IDestinationContentReferenceFinder[IGroup])
+        finder = PyDestinationContentReferenceFinder(dotnet_destination_finder, IGroup)
+
+        result = finder.find_by_id(UUID('{12345678-0000-0000-0000-000000000000}'), CancellationToken(True))
+        
+        assert result is not None
+        
+    def test_find_by_source_id_with_none_id(self):
+        dotnet_destination_finder = Moq.Mock[IDestinationContentReferenceFinder[IGroup]]()
+        finder = PyDestinationContentReferenceFinder(dotnet_destination_finder.Object, IGroup)
+
+        result = finder.find_by_source_id(None)
+        
+        assert result is None
+
+        invokedMethodNames = [methodInfo.Method.Name for methodInfo in dotnet_destination_finder.Invocations]
+
+        assert invokedMethodNames == []
+        
+    def test_find_by_source_id(self):
+        dotnet_destination_finder = self.create(IDestinationContentReferenceFinder[IGroup])
+        finder = PyDestinationContentReferenceFinder(dotnet_destination_finder, IGroup)
+
+        result = finder.find_by_source_id(UUID('{12345678-0000-0000-0000-000000000000}'))
+        
+        assert result is not None
+        
+    def test_find_by_source_id_with_cancel(self):
+        dotnet_destination_finder = self.create(IDestinationContentReferenceFinder[IGroup])
+        finder = PyDestinationContentReferenceFinder(dotnet_destination_finder, IGroup)
+
+        result = finder.find_by_source_id(UUID('{12345678-0000-0000-0000-000000000000}'), CancellationToken(True))
+        
+        assert result is not None
+        
+    def test_find_by_source_location_with_none_location(self):
+        dotnet_destination_finder = Moq.Mock[IDestinationContentReferenceFinder[IProject]]()
+        finder = PyDestinationContentReferenceFinder(dotnet_destination_finder.Object, IProject)
+
+        result = finder.find_by_source_location(None)
+        
+        assert result is None
+
+        invokedMethodNames = [methodInfo.Method.Name for methodInfo in dotnet_destination_finder.Invocations]
+
+        assert invokedMethodNames == []
+        
+    def test_find_by_source_location(self):
+        dotnet_destination_finder = self.create(IDestinationContentReferenceFinder[IProject])
+        finder = PyDestinationContentReferenceFinder(dotnet_destination_finder, IProject)
+
+        result = finder.find_by_source_location(PyContentLocation(ContentLocation(["parent", "child", "item"])))
+        
+        assert result is not None
+        
+    def test_find_by_source_location_with_cancel(self):
+        dotnet_destination_finder = self.create(IDestinationContentReferenceFinder[IProject])
+        finder = PyDestinationContentReferenceFinder(dotnet_destination_finder, IProject)
+
+        result = finder.find_by_source_location(PyContentLocation(ContentLocation(["parent", "child", "item"])), CancellationToken(True))
+        
+        assert result is not None
+        
+    def test_find_by_mapped_location_with_none_location(self):
+        dotnet_destination_finder = Moq.Mock[IDestinationContentReferenceFinder[IUser]]()
+        finder = PyDestinationContentReferenceFinder(dotnet_destination_finder.Object, IUser)
+
+        result = finder.find_by_mapped_location(None)
+        
+        assert result is None
+
+        invokedMethodNames = [methodInfo.Method.Name for methodInfo in dotnet_destination_finder.Invocations]
+
+        assert invokedMethodNames == []
+        
+    def test_find_by_mapped_location(self):
+        dotnet_destination_finder = self.create(IDestinationContentReferenceFinder[IUser])
+        finder = PyDestinationContentReferenceFinder(dotnet_destination_finder, IUser)
+
+        result = finder.find_by_mapped_location(PyContentLocation(ContentLocation(["parent", "child", "item"])))
+        
+        assert result is not None
+        
+    def test_find_by_mapped_location_with_cancel(self):
+        dotnet_destination_finder = self.create(IDestinationContentReferenceFinder[IUser])
+        finder = PyDestinationContentReferenceFinder(dotnet_destination_finder, IUser)
+
+        result = finder.find_by_mapped_location(PyContentLocation(ContentLocation(["parent", "child", "item"])), CancellationToken(True))
+        
+        assert result is not None
+    
+    @pytest.mark.parametrize("empty_value", _empty_test_data)
+    def test_find_by_source_content_url_with_empty_url(self, empty_value):
+        dotnet_destination_finder = Moq.Mock[IDestinationContentReferenceFinder[IUser]]()
+        finder = PyDestinationContentReferenceFinder(dotnet_destination_finder.Object, IUser)
+
+        result = finder.find_by_source_content_url(empty_value)
+        
+        assert result is None
+
+        invokedMethodNames = [methodInfo.Method.Name for methodInfo in dotnet_destination_finder.Invocations]
+
+        assert invokedMethodNames == []
+        
+    def test_find_by_source_content_url(self):
+        dotnet_destination_finder = self.create(IDestinationContentReferenceFinder[IUser])
+        finder = PyDestinationContentReferenceFinder(dotnet_destination_finder, IUser)
+
+        result = finder.find_by_source_content_url("test")
+        
+        assert result is not None
+        
+    def test_find_by_source_content_url_with_cancel(self):
+        dotnet_destination_finder = self.create(IDestinationContentReferenceFinder[IUser])
+        finder = PyDestinationContentReferenceFinder(dotnet_destination_finder, IUser)
+
+        result = finder.find_by_source_content_url("test2", CancellationToken(True))
+        
+        assert result is not None
+        
\ No newline at end of file
diff --git a/src/Python/tests/test_migration_engine_hooks.py b/src/Python/tests/test_migration_engine_hooks.py
new file mode 100644
index 0000000..317b27a
--- /dev/null
+++ b/src/Python/tests/test_migration_engine_hooks.py
@@ -0,0 +1,171 @@
+# Copyright (c) 2024, Salesforce, Inc.
+# SPDX-License-Identifier: Apache-2
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from uuid import UUID
+from typing import TypeVar
+
+T = TypeVar("T")
+
+from tableau_migration.migration_content import PyUser
+from tableau_migration.migration_engine_actions import PyMigrationActionResult
+from tableau_migration.migration_engine_hooks import PyMigrationHookBuilder
+from tableau_migration.migration_engine_hooks_interop import PyContentBatchMigrationCompletedHookBase, PyMigrationActionCompletedHookBase
+from tableau_migration.migration_engine_migrators_batch import PyContentBatchMigrationResult
+from tableau_migration.migration_services import ScopedMigrationServices
+
+from tests.helpers.autofixture import AutoFixtureTestBase
+
+from System import IServiceProvider
+from System.Threading import CancellationToken
+from Tableau.Migration.Content import IUser
+from Tableau.Migration.Engine.Actions import IMigrationActionResult
+from Tableau.Migration.Engine.Hooks import (
+    IContentBatchMigrationCompletedHook, IMigrationActionCompletedHook, 
+    IMigrationHook, MigrationHookBuilder
+)
+from Tableau.Migration.Engine.Migrators.Batch import IContentBatchMigrationResult
+
+class PyActionCompletedHook(PyMigrationActionCompletedHookBase):
+        
+    def execute(self, ctx: PyMigrationActionResult) -> PyMigrationActionResult:
+        return ctx.for_next_action(False)
+
+def action_completed(ctx: PyMigrationActionResult) -> PyMigrationActionResult:
+    return ctx.for_next_action(False)
+
+def action_completed_services(ctx: PyMigrationActionResult, services: ScopedMigrationServices) -> PyMigrationActionResult:
+    return ctx.for_next_action(False)
+
+class TestActionCompletedHookInterop(AutoFixtureTestBase):
+    def test_interop_class(self):
+        hook_builder = PyMigrationHookBuilder(MigrationHookBuilder())
+        
+        result = hook_builder.add(PyActionCompletedHook)
+        assert result is hook_builder
+        
+        hook_factories = hook_builder.build().get_hooks(IMigrationActionCompletedHook)
+        assert len(hook_factories) == 1
+
+        services = self.create(IServiceProvider)
+        ctx = self.create(IMigrationActionResult)
+        
+        hook = hook_factories[0].Create[IMigrationHook[IMigrationActionResult]](services)
+        hook_result = hook.ExecuteAsync(ctx, CancellationToken(False)).GetAwaiter().GetResult()
+
+        assert hook_result.PerformNextAction == False
+
+    def test_interop_callback(self):
+        hook_builder = PyMigrationHookBuilder(MigrationHookBuilder())
+
+        ctx = self.create(IMigrationActionResult)
+
+        result = hook_builder.add(PyMigrationActionResult, action_completed)
+        assert result is hook_builder
+
+        hook_factories = hook_builder.build().get_hooks(IMigrationActionCompletedHook)
+        assert len(hook_factories) == 1
+        
+        services = self.create(IServiceProvider)
+        
+        hook = hook_factories[0].Create[IMigrationHook[IMigrationActionResult]](services)
+        hook_result = hook.ExecuteAsync(ctx, CancellationToken(False)).GetAwaiter().GetResult()
+
+        assert hook_result.PerformNextAction == False
+    
+    def test_interop_callback_services(self):
+        hook_builder = PyMigrationHookBuilder(MigrationHookBuilder())
+
+        ctx = self.create(IMigrationActionResult)
+
+        result = hook_builder.add(PyMigrationActionResult, action_completed_services)
+        assert result is hook_builder
+
+        hook_factories = hook_builder.build().get_hooks(IMigrationActionCompletedHook)
+        assert len(hook_factories) == 1
+        
+        services = self.create(IServiceProvider)
+        
+        hook = hook_factories[0].Create[IMigrationHook[IMigrationActionResult]](services)
+        hook_result = hook.ExecuteAsync(ctx, CancellationToken(False)).GetAwaiter().GetResult()
+
+        assert hook_result.PerformNextAction == False
+
+class PyBatchCompletedHookBase(PyContentBatchMigrationCompletedHookBase[T]):
+        
+    def execute(self, ctx: PyContentBatchMigrationResult[T]) -> PyContentBatchMigrationResult[T]:
+        return ctx.for_next_batch(False)
+
+class PyUserBatchCompletedHook(PyBatchCompletedHookBase[PyUser]):
+    pass
+
+def batch_completed(ctx: PyContentBatchMigrationResult[PyUser]) -> PyContentBatchMigrationResult[PyUser]:
+    return ctx.for_next_batch(False)
+
+def batch_completed_services(ctx: PyContentBatchMigrationResult[PyUser], services: ScopedMigrationServices) -> PyContentBatchMigrationResult[PyUser]:
+    return ctx.for_next_batch(False)
+
+class TestContentBatchCompletedHookInterop(AutoFixtureTestBase):
+    def test_interop_class(self):
+        hook_builder = PyMigrationHookBuilder(MigrationHookBuilder())
+        
+        result = hook_builder.add(PyUserBatchCompletedHook)
+        assert result is hook_builder
+        
+        hook_factories = hook_builder.build().get_hooks(IContentBatchMigrationCompletedHook[IUser])
+        assert len(hook_factories) == 1
+
+        services = self.create(IServiceProvider)
+        ctx = self.create(IContentBatchMigrationResult[IUser])
+        
+        hook = hook_factories[0].Create[IMigrationHook[IContentBatchMigrationResult[IUser]]](services)
+        hook_result = hook.ExecuteAsync(ctx, CancellationToken(False)).GetAwaiter().GetResult()
+
+        assert hook_result.PerformNextBatch == False
+
+    def test_interop_callback(self):
+        hook_builder = PyMigrationHookBuilder(MigrationHookBuilder())
+
+        ctx = self.create(IContentBatchMigrationResult[IUser])
+
+        result = hook_builder.add(PyContentBatchMigrationResult[PyUser], batch_completed)
+        assert result is hook_builder
+
+        hook_factories = hook_builder.build().get_hooks(IContentBatchMigrationCompletedHook[IUser])
+        assert len(hook_factories) == 1
+        
+        services = self.create(IServiceProvider)
+        
+        hook = hook_factories[0].Create[IMigrationHook[IContentBatchMigrationResult[IUser]]](services)
+        hook_result = hook.ExecuteAsync(ctx, CancellationToken(False)).GetAwaiter().GetResult()
+
+        assert hook_result.PerformNextBatch == False
+    
+    def test_interop_callback_services(self):
+        hook_builder = PyMigrationHookBuilder(MigrationHookBuilder())
+
+        ctx = self.create(IContentBatchMigrationResult[IUser])
+
+        result = hook_builder.add(PyContentBatchMigrationResult[PyUser], batch_completed_services)
+        assert result is hook_builder
+
+        hook_factories = hook_builder.build().get_hooks(IContentBatchMigrationCompletedHook[IUser])
+        assert len(hook_factories) == 1
+        
+        services = self.create(IServiceProvider)
+        
+        hook = hook_factories[0].Create[IMigrationHook[IContentBatchMigrationResult[IUser]]](services)
+        hook_result = hook.ExecuteAsync(ctx, CancellationToken(False)).GetAwaiter().GetResult()
+
+        assert hook_result.PerformNextBatch == False
\ No newline at end of file
diff --git a/src/Python/tests/test_migration_engine_hooks_filters.py b/src/Python/tests/test_migration_engine_hooks_filters.py
new file mode 100644
index 0000000..81fcf27
--- /dev/null
+++ b/src/Python/tests/test_migration_engine_hooks_filters.py
@@ -0,0 +1,114 @@
+# Copyright (c) 2024, Salesforce, Inc.
+# SPDX-License-Identifier: Apache-2
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from typing import TypeVar
+from uuid import UUID
+
+from tableau_migration.migration_content import PyUser
+from tableau_migration.migration_engine import PyContentMigrationItem
+from tableau_migration.migration_engine_hooks_filters import PyContentFilterBuilder
+from tableau_migration.migration_engine_hooks_filters_interop import PyContentFilterBase
+from tableau_migration.migration_services import ScopedMigrationServices
+
+from tests.helpers.autofixture import AutoFixtureTestBase
+
+from System import IServiceProvider
+from System.Collections.Generic import IEnumerable
+from System.Threading import CancellationToken
+from Tableau.Migration.Content import IUser
+from Tableau.Migration.Engine import ContentMigrationItem
+from Tableau.Migration.Engine.Hooks import IMigrationHook
+from Tableau.Migration.Engine.Hooks.Filters import ContentFilterBuilder, IContentFilter
+
+T = TypeVar("T")
+
+class PyFilter(PyContentFilterBase[T]):
+        
+    def should_migrate(self, item: PyContentMigrationItem[T]) -> bool:
+        return self.search_id is None or item.source_item.id != self.search_id
+
+class PyUserFilter(PyFilter[PyUser]):
+    pass  
+
+def create_filter_users(search_id: int):
+    def filter_users(item: PyContentMigrationItem[PyUser]) -> bool:
+        return item.source_item.id != search_id
+
+    return filter_users
+
+def create_filter_users_services(search_id: int):
+    def filter_users_service(item: PyContentMigrationItem[PyUser], services: ScopedMigrationServices) -> bool:
+        return item.source_item.id != search_id
+
+    return filter_users_service
+
+class TestFilterInterop(AutoFixtureTestBase):
+    def test_filter_interop_class(self):
+        hook_builder = PyContentFilterBuilder(ContentFilterBuilder())
+        
+        result = hook_builder.add(PyUserFilter)
+        assert result is hook_builder
+        
+        hook_factories = hook_builder.build().get_hooks(IContentFilter[IUser])
+        assert len(hook_factories) == 1
+
+        services = self.create(IServiceProvider)
+        users = self.create_many(ContentMigrationItem[IUser])
+        
+        PyUserFilter.search_id = UUID(list(users)[0].SourceItem.Id.ToString())
+
+        hook = hook_factories[0].Create[IMigrationHook[IEnumerable[ContentMigrationItem[IUser]]]](services)
+        hook_result = hook.ExecuteAsync(users, CancellationToken(False)).GetAwaiter().GetResult()
+
+        assert len(list(users)) - 1 == len(list(hook_result))
+
+    def test_filter_interop_callback(self):
+        hook_builder = PyContentFilterBuilder(ContentFilterBuilder())
+
+        users = self.create_many(ContentMigrationItem[IUser])
+        search_id = UUID(list(users)[0].SourceItem.Id.ToString())
+
+        result = hook_builder.add(PyUser, create_filter_users(search_id))
+        assert result is hook_builder
+
+        hook_factories = hook_builder.build().get_hooks(IContentFilter[IUser])
+        assert len(hook_factories) == 1
+        
+        services = self.create(IServiceProvider)
+        
+        hook = hook_factories[0].Create[IMigrationHook[IEnumerable[ContentMigrationItem[IUser]]]](services)
+        hook_result = hook.ExecuteAsync(users, CancellationToken(False)).GetAwaiter().GetResult()
+
+        assert len(list(users)) - 1 == len(list(hook_result))
+    
+    def test_filter_interop_callback_services(self):
+        hook_builder = PyContentFilterBuilder(ContentFilterBuilder())
+
+        users = self.create_many(ContentMigrationItem[IUser])
+        search_id = UUID(list(users)[0].SourceItem.Id.ToString())
+
+        result = hook_builder.add(PyUser, create_filter_users_services(search_id))
+        assert result is hook_builder
+
+        hook_factories = hook_builder.build().get_hooks(IContentFilter[IUser])
+        assert len(hook_factories) == 1
+        
+        services = self.create(IServiceProvider)
+        
+        hook = hook_factories[0].Create[IMigrationHook[IEnumerable[ContentMigrationItem[IUser]]]](services)
+        hook_result = hook.ExecuteAsync(users, CancellationToken(False)).GetAwaiter().GetResult()
+
+        assert len(list(users)) - 1 == len(list(hook_result))
+        
\ No newline at end of file
diff --git a/src/Python/tests/test_migration_engine_hooks_mappings.py b/src/Python/tests/test_migration_engine_hooks_mappings.py
new file mode 100644
index 0000000..b0c7713
--- /dev/null
+++ b/src/Python/tests/test_migration_engine_hooks_mappings.py
@@ -0,0 +1,195 @@
+# Copyright (c) 2024, Salesforce, Inc.
+# SPDX-License-Identifier: Apache-2
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from typing import TypeVar
+from uuid import UUID
+
+from tableau_migration.migration import PyContentLocation
+from tableau_migration.migration_engine import PyMigrationPlanBuilder
+from tableau_migration.migration_content import PyUser
+from tableau_migration.migration_engine_hooks_mappings import PyContentMappingBuilder, PyContentMappingContext
+from tableau_migration.migration_engine_hooks_mappings_interop import PyContentMappingBase, PyTableauCloudUsernameMappingBase
+from tableau_migration.migration_services import ScopedMigrationServices
+
+from tests.helpers.autofixture import AutoFixtureTestBase
+
+from System import IServiceProvider
+from System.Threading import CancellationToken
+from Tableau.Migration import ContentLocation
+from Tableau.Migration.Content import IUser
+from Tableau.Migration.Engine.Hooks import IMigrationHook
+from Tableau.Migration.Engine.Hooks.Mappings import ContentMappingBuilder, ContentMappingContext, IContentMapping
+
+T = TypeVar("T")
+
+class PyMapping(PyContentMappingBase[T]):
+        
+    def map(self, ctx: PyContentMappingContext[T]) -> PyContentMappingContext[T]:
+        return ctx.map_to(ctx.mapped_location.rename(ctx.mapped_location.name + "2"))
+
+class PyUserMapping(PyMapping[PyUser]):
+    pass  
+
+def map_users(ctx: PyContentMappingContext[PyUser]) -> PyContentMappingContext[PyUser]:
+    return ctx.map_to(ctx.mapped_location.rename(ctx.mapped_location.name + "3"))
+
+def map_users_services(ctx: PyContentMappingContext[PyUser], services: ScopedMigrationServices) -> PyContentMappingContext[PyUser]:
+    return ctx.map_to(ctx.mapped_location.rename(ctx.mapped_location.name + "4"))
+
+class TestMappingInterop(AutoFixtureTestBase):
+    def test_mapping_interop_class(self):
+        hook_builder = PyContentMappingBuilder(ContentMappingBuilder())
+        
+        result = hook_builder.add(PyUserMapping)
+        assert result is hook_builder
+        
+        hook_factories = hook_builder.build().get_hooks(IContentMapping[IUser])
+        assert len(hook_factories) == 1
+
+        services = self.create(IServiceProvider)
+        map_ctx = self.create(ContentMappingContext[IUser])
+        
+        hook = hook_factories[0].Create[IMigrationHook[ContentMappingContext[IUser]]](services)
+        hook_result = hook.ExecuteAsync(map_ctx, CancellationToken(False)).GetAwaiter().GetResult()
+
+        assert hook_result.MappedLocation.Name == map_ctx.MappedLocation.Name + "2"
+
+    def test_mapping_interop_callback(self):
+        hook_builder = PyContentMappingBuilder(ContentMappingBuilder())
+
+        map_ctx = self.create(ContentMappingContext[IUser])
+
+        result = hook_builder.add(PyUser, map_users)
+        assert result is hook_builder
+
+        hook_factories = hook_builder.build().get_hooks(IContentMapping[IUser])
+        assert len(hook_factories) == 1
+        
+        services = self.create(IServiceProvider)
+        
+        hook = hook_factories[0].Create[IMigrationHook[ContentMappingContext[IUser]]](services)
+        hook_result = hook.ExecuteAsync(map_ctx, CancellationToken(False)).GetAwaiter().GetResult()
+
+        assert hook_result.MappedLocation.Name == map_ctx.MappedLocation.Name + "3"
+    
+    def test_mapping_interop_callback_services(self):
+        hook_builder = PyContentMappingBuilder(ContentMappingBuilder())
+
+        map_ctx = self.create(ContentMappingContext[IUser])
+
+        result = hook_builder.add(PyUser, map_users_services)
+        assert result is hook_builder
+
+        hook_factories = hook_builder.build().get_hooks(IContentMapping[IUser])
+        assert len(hook_factories) == 1
+        
+        services = self.create(IServiceProvider)
+        
+        hook = hook_factories[0].Create[IMigrationHook[ContentMappingContext[IUser]]](services)
+        hook_result = hook.ExecuteAsync(map_ctx, CancellationToken(False)).GetAwaiter().GetResult()
+
+        assert hook_result.MappedLocation.Name == map_ctx.MappedLocation.Name + "4"        
+        
+class TestContentMigrationItem(AutoFixtureTestBase):
+    def test_wrapper_init(self):
+        dotnet_content_item = self.create(IUser)
+        loc = ContentLocation.ForUsername("domain", "username")
+        dotnet_ctx = ContentMappingContext[IUser](dotnet_content_item, loc)
+        wrapper = PyContentMappingContext[PyUser](dotnet_ctx)
+
+    def test_content_item(self):
+        user = self.create(IUser)
+        loc = ContentLocation.ForUsername("domain", "username")
+        dotnet_ctx = ContentMappingContext[IUser](user, loc)
+        wrapper = PyContentMappingContext[PyUser](dotnet_ctx)
+        
+        assert wrapper.content_item._dotnet == user
+
+    def test_map_to(self):
+        user = self.create(IUser)
+        loc = ContentLocation.ForUsername("domain", "username")
+        dotnet_ctx = ContentMappingContext[IUser](user, loc)
+        wrapper = PyContentMappingContext[PyUser](dotnet_ctx)
+        
+        loc2 = PyContentLocation(ContentLocation.ForUsername("domain", "username2"))
+        wrapper2 = wrapper.map_to(loc2)
+        
+        assert wrapper2.content_item._dotnet == wrapper.content_item._dotnet
+
+        assert wrapper2.mapped_location.name == "username2"
+        
+class PyUsernameMapping(PyTableauCloudUsernameMappingBase):
+    def map(self, ctx: PyContentMappingContext[PyUser]) -> PyContentMappingContext[PyUser]:
+        return ctx.map_to(ctx.mapped_location.rename(ctx.mapped_location.name + "5"))
+    
+def map_usernames(ctx: PyContentMappingContext[PyUser]) -> PyContentMappingContext[PyUser]:
+    return ctx.map_to(ctx.mapped_location.rename(ctx.mapped_location.name + "5"))
+
+def map_usernames_services(ctx: PyContentMappingContext[PyUser], services: ScopedMigrationServices) -> PyContentMappingContext[PyUser]:
+    return ctx.map_to(ctx.mapped_location.rename(ctx.mapped_location.name + "5"))
+
+class TestTableauCloudUsernameMappingInterop(AutoFixtureTestBase):
+    def test_mapping_interop_class(self):
+        plan_builder = PyMigrationPlanBuilder().for_server_to_cloud()
+
+        result = plan_builder.with_tableau_cloud_usernames(PyUsernameMapping)
+        assert result is plan_builder
+        
+        hook_factories =  plan_builder.build().mappings.get_hooks(IContentMapping[IUser])
+        assert len(hook_factories) == 1
+
+        services = self.create(IServiceProvider)
+        map_ctx = self.create(ContentMappingContext[IUser])
+        
+        hook = hook_factories[0].Create[IMigrationHook[ContentMappingContext[IUser]]](services)
+        hook_result = hook.ExecuteAsync(map_ctx, CancellationToken(False)).GetAwaiter().GetResult()
+
+        assert hook_result.MappedLocation.Name == map_ctx.MappedLocation.Name + "5"
+
+    def test_mapping_interop_callback(self):
+        plan_builder = PyMigrationPlanBuilder().for_server_to_cloud()
+
+        map_ctx = self.create(ContentMappingContext[IUser])
+
+        result = plan_builder.with_tableau_cloud_usernames(map_usernames)
+        assert result is plan_builder
+
+        hook_factories = plan_builder.build().mappings.get_hooks(IContentMapping[IUser])
+        assert len(hook_factories) == 1
+        
+        services = self.create(IServiceProvider)
+        
+        hook = hook_factories[0].Create[IMigrationHook[ContentMappingContext[IUser]]](services)
+        hook_result = hook.ExecuteAsync(map_ctx, CancellationToken(False)).GetAwaiter().GetResult()
+
+        assert hook_result.MappedLocation.Name == map_ctx.MappedLocation.Name + "5"
+    
+    def test_mapping_interop_callback_services(self):
+        plan_builder = PyMigrationPlanBuilder().for_server_to_cloud()
+
+        map_ctx = self.create(ContentMappingContext[IUser])
+
+        result = plan_builder.with_tableau_cloud_usernames(map_usernames_services)
+        assert result is plan_builder
+
+        hook_factories = plan_builder.build().mappings.get_hooks(IContentMapping[IUser])
+        assert len(hook_factories) == 1
+        
+        services = self.create(IServiceProvider)
+        
+        hook = hook_factories[0].Create[IMigrationHook[ContentMappingContext[IUser]]](services)
+        hook_result = hook.ExecuteAsync(map_ctx, CancellationToken(False)).GetAwaiter().GetResult()
+
+        assert hook_result.MappedLocation.Name == map_ctx.MappedLocation.Name + "5"    
\ No newline at end of file
diff --git a/src/Python/tests/test_migration_engine_hooks_postpublish.py b/src/Python/tests/test_migration_engine_hooks_postpublish.py
new file mode 100644
index 0000000..57f6c8c
--- /dev/null
+++ b/src/Python/tests/test_migration_engine_hooks_postpublish.py
@@ -0,0 +1,197 @@
+# Copyright (c) 2024, Salesforce, Inc.
+# SPDX-License-Identifier: Apache-2
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from typing import TypeVar
+from uuid import UUID
+
+from tableau_migration.migration_content import PyUser, PyPublishableWorkbook, PyWorkbookDetails
+from tableau_migration.migration_engine_hooks import PyMigrationHookBuilder
+from tableau_migration.migration_engine_hooks_postpublish import PyBulkPostPublishContext, PyContentItemPostPublishContext
+from tableau_migration.migration_engine_hooks_postpublish_interop import PyBulkPostPublishHookBase, PyContentItemPostPublishHookBase
+from tableau_migration.migration_services import ScopedMigrationServices
+
+from tests.helpers.autofixture import AutoFixtureTestBase
+
+from System import IServiceProvider
+from System.Threading import CancellationToken
+from Tableau.Migration.Content import IUser, IPublishableWorkbook, IWorkbookDetails
+from Tableau.Migration.Engine.Hooks import IMigrationHook, MigrationHookBuilder
+from Tableau.Migration.Engine.Hooks.PostPublish import (
+    BulkPostPublishContext, BulkPostPublishHookBase, 
+    ContentItemPostPublishContext, ContentItemPostPublishHookBase, 
+    IBulkPostPublishHook, IContentItemPostPublishHook
+)
+
+T = TypeVar("T")
+U = TypeVar("U")
+
+class PyItemPostPublishHook(PyContentItemPostPublishHookBase[T, U]):
+        
+    def execute(self, ctx: PyContentItemPostPublishContext[T, U]) -> PyContentItemPostPublishContext[T, U]:
+        return None
+
+class PyWorkbookPostPublishHook(PyItemPostPublishHook[PyPublishableWorkbook, PyWorkbookDetails]):
+    pass  
+
+def workbook_post_publish(ctx: PyContentItemPostPublishContext[PyPublishableWorkbook, PyWorkbookDetails]) -> PyContentItemPostPublishContext[PyPublishableWorkbook, PyWorkbookDetails]:
+    return None
+
+def workbook_post_publish_no_return(ctx: PyContentItemPostPublishContext[PyPublishableWorkbook, PyWorkbookDetails]):
+    pass
+
+def workbook_post_publish_services(ctx: PyContentItemPostPublishContext[PyPublishableWorkbook, PyWorkbookDetails], services: ScopedMigrationServices) -> PyContentItemPostPublishContext[PyPublishableWorkbook, PyWorkbookDetails]:
+    return None
+
+class TestItemPostPublishInterop(AutoFixtureTestBase):
+    def test_item_interop_class(self):
+        hook_builder = PyMigrationHookBuilder(MigrationHookBuilder())
+        
+        result = hook_builder.add(PyWorkbookPostPublishHook)
+        assert result is hook_builder
+        
+        hook_factories = hook_builder.build().get_hooks(IContentItemPostPublishHook[IPublishableWorkbook, IWorkbookDetails])
+        assert len(hook_factories) == 1
+
+        services = self.create(IServiceProvider)
+        ctx = self.create(ContentItemPostPublishContext[IPublishableWorkbook, IWorkbookDetails])
+        
+        hook = hook_factories[0].Create[IMigrationHook[ContentItemPostPublishContext[IPublishableWorkbook, IWorkbookDetails]]](services)
+        hook_result = hook.ExecuteAsync(ctx, CancellationToken(False)).GetAwaiter().GetResult()
+
+        assert hook_result is None
+
+    def test_item_interop_callback(self):
+        hook_builder = PyMigrationHookBuilder(MigrationHookBuilder())
+
+        ctx = self.create(ContentItemPostPublishContext[IPublishableWorkbook, IWorkbookDetails])
+
+        result = hook_builder.add(PyContentItemPostPublishContext[PyPublishableWorkbook, PyWorkbookDetails], workbook_post_publish)
+        assert result is hook_builder
+
+        hook_factories = hook_builder.build().get_hooks(IContentItemPostPublishHook[IPublishableWorkbook, IWorkbookDetails])
+        assert len(hook_factories) == 1
+        
+        services = self.create(IServiceProvider)
+        
+        hook = hook_factories[0].Create[IMigrationHook[ContentItemPostPublishContext[IPublishableWorkbook, IWorkbookDetails]]](services)
+        hook_result = hook.ExecuteAsync(ctx, CancellationToken(False)).GetAwaiter().GetResult()
+
+        assert hook_result is None
+    
+    def test_item_interop_callback_services(self):
+        hook_builder = PyMigrationHookBuilder(MigrationHookBuilder())
+
+        ctx = self.create(ContentItemPostPublishContext[IPublishableWorkbook, IWorkbookDetails])
+
+        result = hook_builder.add(PyContentItemPostPublishContext[PyPublishableWorkbook, PyWorkbookDetails], workbook_post_publish_services)
+        assert result is hook_builder
+
+        hook_factories = hook_builder.build().get_hooks(IContentItemPostPublishHook[IPublishableWorkbook, IWorkbookDetails])
+        assert len(hook_factories) == 1
+        
+        services = self.create(IServiceProvider)
+        
+        hook = hook_factories[0].Create[IMigrationHook[ContentItemPostPublishContext[IPublishableWorkbook, IWorkbookDetails]]](services)
+        hook_result = hook.ExecuteAsync(ctx, CancellationToken(False)).GetAwaiter().GetResult()
+
+        assert hook_result is None
+
+    def test_item_interop_no_return(self):
+        hook_builder = PyMigrationHookBuilder(MigrationHookBuilder())
+
+        ctx = self.create(ContentItemPostPublishContext[IPublishableWorkbook, IWorkbookDetails])
+
+        result = hook_builder.add(PyContentItemPostPublishContext[PyPublishableWorkbook, PyWorkbookDetails], workbook_post_publish_no_return)
+        assert result is hook_builder
+
+        hook_factories = hook_builder.build().get_hooks(IContentItemPostPublishHook[IPublishableWorkbook, IWorkbookDetails])
+        assert len(hook_factories) == 1
+        
+        services = self.create(IServiceProvider)
+        
+        hook = hook_factories[0].Create[IMigrationHook[ContentItemPostPublishContext[IPublishableWorkbook, IWorkbookDetails]]](services)
+        hook_result = hook.ExecuteAsync(ctx, CancellationToken(False)).GetAwaiter().GetResult()
+
+        assert hook_result is None
+        
+class PyBulkPostPublishHook(PyBulkPostPublishHookBase[T]):
+        
+    def execute(self, ctx: PyBulkPostPublishContext[T]) -> PyBulkPostPublishContext[T]:
+        return None
+
+class PyUserPostPublishHook(PyBulkPostPublishHook[PyUser]):
+    pass  
+
+def user_post_publish(ctx: PyBulkPostPublishContext[PyUser]) -> PyBulkPostPublishContext[PyUser]:
+    return None
+
+def user_post_publish_services(ctx: PyBulkPostPublishContext[PyUser], services: ScopedMigrationServices) -> PyBulkPostPublishContext[PyUser]:
+    return None
+
+class TestBulkPostPublishInterop(AutoFixtureTestBase):
+    def test_bulk_interop_class(self):
+        hook_builder = PyMigrationHookBuilder(MigrationHookBuilder())
+        
+        result = hook_builder.add(PyUserPostPublishHook)
+        assert result is hook_builder
+        
+        hook_factories = hook_builder.build().get_hooks(IBulkPostPublishHook[IUser])
+        assert len(hook_factories) == 1
+
+        services = self.create(IServiceProvider)
+        ctx = self.create(BulkPostPublishContext[IUser])
+        
+        hook = hook_factories[0].Create[IMigrationHook[BulkPostPublishContext[IUser]]](services)
+        hook_result = hook.ExecuteAsync(ctx, CancellationToken(False)).GetAwaiter().GetResult()
+
+        assert hook_result is None
+
+    def test_bulk_interop_callback(self):
+        hook_builder = PyMigrationHookBuilder(MigrationHookBuilder())
+
+        ctx = self.create(BulkPostPublishContext[IUser])
+
+        result = hook_builder.add(PyBulkPostPublishContext[PyUser], user_post_publish)
+        assert result is hook_builder
+
+        hook_factories = hook_builder.build().get_hooks(IBulkPostPublishHook[IUser])
+        assert len(hook_factories) == 1
+        
+        services = self.create(IServiceProvider)
+        
+        hook = hook_factories[0].Create[IMigrationHook[BulkPostPublishContext[IUser]]](services)
+        hook_result = hook.ExecuteAsync(ctx, CancellationToken(False)).GetAwaiter().GetResult()
+
+        assert hook_result is None
+    
+    def test_bulk_interop_callback_services(self):
+        hook_builder = PyMigrationHookBuilder(MigrationHookBuilder())
+
+        ctx = self.create(BulkPostPublishContext[IUser])
+
+        result = hook_builder.add(PyBulkPostPublishContext[PyUser], user_post_publish_services)
+        assert result is hook_builder
+
+        hook_factories = hook_builder.build().get_hooks(IBulkPostPublishHook[IUser])
+        assert len(hook_factories) == 1
+        
+        services = self.create(IServiceProvider)
+        
+        hook = hook_factories[0].Create[IMigrationHook[BulkPostPublishContext[IUser]]](services)
+        hook_result = hook.ExecuteAsync(ctx, CancellationToken(False)).GetAwaiter().GetResult()
+
+        assert hook_result is None
+
+        
\ No newline at end of file
diff --git a/src/Python/tests/test_migration_engine_hooks_transformers.py b/src/Python/tests/test_migration_engine_hooks_transformers.py
new file mode 100644
index 0000000..766c145
--- /dev/null
+++ b/src/Python/tests/test_migration_engine_hooks_transformers.py
@@ -0,0 +1,254 @@
+# Copyright (c) 2024, Salesforce, Inc.
+# SPDX-License-Identifier: Apache-2
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from typing import TypeVar
+from uuid import UUID
+from xml.etree import ElementTree
+
+from tableau_migration.migration_content import PyPublishableWorkbook, PyUser
+from tableau_migration.migration_engine_hooks_transformers import PyContentTransformerBuilder
+from tableau_migration.migration_engine_hooks_transformers_interop import PyContentTransformerBase, PyXmlContentTransformerBase
+from tableau_migration.migration_services import ScopedMigrationServices
+
+from tests.helpers.autofixture import AutoFixtureTestBase
+
+from System import IServiceProvider
+from System.IO import MemoryStream, StreamReader
+from System.Threading import CancellationToken
+from System.Xml import XmlWriter
+from System.Xml.Linq import LoadOptions, XDocument, XName
+from Tableau.Migration.Content import IPublishableWorkbook, IUser
+from Tableau.Migration.Engine.Hooks import IMigrationHook
+from Tableau.Migration.Engine.Hooks.Transformers import ContentTransformerBuilder, IContentTransformer, IXmlContentTransformer
+
+T = TypeVar("T")
+
+class PyTransformer(PyContentTransformerBase[T]):
+        
+    def transform(self, ctx: T) -> T:
+        ctx.email = "test1"
+        return ctx
+
+class PyUserTransformer(PyTransformer[PyUser]):
+    pass  
+
+def transform_users(ctx: PyUser) -> PyUser:
+    ctx.email = "test2"
+    return ctx
+
+def transform_users_services(ctx: PyUser, services: ScopedMigrationServices) -> PyUser:
+    ctx.email = "test3"
+    return ctx
+
+class TestTransformerInterop(AutoFixtureTestBase):
+    def test_transformer_interop_class(self):
+        hook_builder = PyContentTransformerBuilder(ContentTransformerBuilder())
+        
+        result = hook_builder.add(PyUserTransformer)
+        assert result is hook_builder
+        
+        hook_factories = hook_builder.build().get_hooks(IContentTransformer[IUser])
+        assert len(hook_factories) == 1
+
+        services = self.create(IServiceProvider)
+        ctx = self.create(IUser)
+        
+        hook = hook_factories[0].Create[IMigrationHook[IUser]](services)
+        hook_result = hook.ExecuteAsync(ctx, CancellationToken(False)).GetAwaiter().GetResult()
+
+        assert hook_result.Email == "test1"
+        assert ctx.Email == "test1"
+
+    def test_transformer_interop_callback(self):
+        hook_builder = PyContentTransformerBuilder(ContentTransformerBuilder())
+
+        ctx = self.create(IUser)
+
+        result = hook_builder.add(PyUser, transform_users)
+        assert result is hook_builder
+
+        hook_factories = hook_builder.build().get_hooks(IContentTransformer[IUser])
+        assert len(hook_factories) == 1
+        
+        services = self.create(IServiceProvider)
+        
+        hook = hook_factories[0].Create[IMigrationHook[IUser]](services)
+        hook_result = hook.ExecuteAsync(ctx, CancellationToken(False)).GetAwaiter().GetResult()
+
+        assert hook_result.Email == "test2"
+        assert ctx.Email == "test2"
+    
+    def test_transformer_interop_callback_services(self):
+        hook_builder = PyContentTransformerBuilder(ContentTransformerBuilder())
+
+        ctx = self.create(IUser)
+
+        result = hook_builder.add(PyUser, transform_users_services)
+        assert result is hook_builder
+
+        hook_factories = hook_builder.build().get_hooks(IContentTransformer[IUser])
+        assert len(hook_factories) == 1
+        
+        services = self.create(IServiceProvider)
+        
+        hook = hook_factories[0].Create[IMigrationHook[IUser]](services)
+        hook_result = hook.ExecuteAsync(ctx, CancellationToken(False)).GetAwaiter().GetResult()
+
+        assert hook_result.Email == "test3"
+        assert ctx.Email == "test3"
+        
+class PyXmlTransformer(PyXmlContentTransformerBase[T]):
+    def transform(self, ctx: T, xml) -> None:
+        pass
+
+_test_twb = """<?xml version='1.0' encoding='utf-8' ?>
+
+<!-- build 20231.24.0312.1557                               -->
+<workbook source-build='2023.1.11 (20231.24.0312.1557)' source-platform='win' version='18.1' xmlns:user='http://www.tableausoftware.com/xml/user'>
+  <user:test />
+</workbook>
+
+"""
+
+_expected_twb = """<?xml version="1.0" encoding="utf-8"?>
+
+<!-- build 20231.24.0312.1557                               -->
+<workbook xmlns:user="http://www.tableausoftware.com/xml/user" source-build="2023.1.11 (20231.24.0312.1557)" source-platform="win" version="18.1">
+  <user:test />
+  <test2 a="b" />
+</workbook>
+
+"""
+
+def _transform_xml_content(xml: ElementTree.Element) -> None:
+    xml.find("user:test", {"user": "http://www.tableausoftware.com/xml/user"}).tail = "\n  "
+    sub = ElementTree.SubElement(xml, "test2", { "a": "b" })
+    sub.tail = "\n"
+
+class PyWorkbookXmlTransformer(PyXmlTransformer[PyPublishableWorkbook]):
+    
+    def needs_xml_transforming(self, ctx: PyPublishableWorkbook) -> bool:
+        return ctx.description == "mark"
+
+    def transform(self, ctx: PyPublishableWorkbook, xml: ElementTree.Element) -> None:
+        ctx.description = xml.get("version")
+        _transform_xml_content(xml)
+        
+def transform_workbook_xml(ctx: PyPublishableWorkbook, xml: ElementTree.Element) -> None:
+    ctx.description = xml.get("version")
+    _transform_xml_content(xml)
+
+def transform_workbook_xml_services(ctx: PyPublishableWorkbook, xml: ElementTree.Element, services: ScopedMigrationServices) -> None:
+    ctx.description = xml.get("version")
+    _transform_xml_content(xml)
+
+class TestXmlTransformerInterop(AutoFixtureTestBase):
+    
+    def _clean_xml_text(self, xml_text: str) -> str:
+        return xml_text.replace("\r", "")
+
+    # Helper method to save XDocument to string that includes the XML declaration.
+    def _save_xml(self, xdoc: XDocument) -> str:
+        stream = MemoryStream()
+        writer = XmlWriter.Create(stream)
+        xdoc.Save(writer)
+        writer.Flush()
+        stream.Position = 0
+        reader = StreamReader(stream)
+        return self._clean_xml_text(reader.ReadToEnd())
+    
+    def test_transformer_interop_class(self):
+        hook_builder = PyContentTransformerBuilder(ContentTransformerBuilder())
+        
+        result = hook_builder.add(PyWorkbookXmlTransformer)
+        assert result is hook_builder
+        
+        hook_factories = hook_builder.build().get_hooks(IContentTransformer[IPublishableWorkbook])
+        assert len(hook_factories) == 1
+
+        services = self.create(IServiceProvider)
+        ctx = self.create(IPublishableWorkbook)
+        xml = XDocument.Parse(_test_twb, LoadOptions.PreserveWhitespace)
+        
+        hook = hook_factories[0].Create[IXmlContentTransformer[IPublishableWorkbook]](services)
+        hook.TransformAsync(ctx, xml, CancellationToken(False)).GetAwaiter().GetResult()
+
+        assert ctx.Description == "18.1"
+
+        saved_xml = self._save_xml(xml)
+        assert saved_xml == self._clean_xml_text(_expected_twb)
+
+    def test_transformer_needs_transforming(self):
+        hook_builder = PyContentTransformerBuilder(ContentTransformerBuilder())
+        
+        result = hook_builder.add(PyWorkbookXmlTransformer)
+        assert result is hook_builder
+        
+        hook_factories = hook_builder.build().get_hooks(IContentTransformer[IPublishableWorkbook])
+        assert len(hook_factories) == 1
+
+        services = self.create(IServiceProvider)
+        ctx = self.create(IPublishableWorkbook)
+        
+        hook = hook_factories[0].Create[IXmlContentTransformer[IPublishableWorkbook]](services)
+        
+        ctx.Description = "notmark"
+
+        assert hook.NeedsXmlTransforming(ctx) == False
+
+        ctx.Description = "mark"
+        
+        assert hook.NeedsXmlTransforming(ctx) == True
+
+    def test_transformer_interop_callback(self):
+        hook_builder = PyContentTransformerBuilder(ContentTransformerBuilder())
+
+        ctx = self.create(IPublishableWorkbook)
+        xml = XDocument.Parse(_test_twb, LoadOptions.PreserveWhitespace)
+
+        result = hook_builder.add(PyPublishableWorkbook, transform_workbook_xml, is_xml = True)
+        assert result is hook_builder
+
+        hook_factories = hook_builder.build().get_hooks(IContentTransformer[IPublishableWorkbook])
+        assert len(hook_factories) == 1
+        
+        services = self.create(IServiceProvider)
+        
+        hook = hook_factories[0].Create[IXmlContentTransformer[IPublishableWorkbook]](services)
+        hook.TransformAsync(ctx, xml, CancellationToken(False)).GetAwaiter().GetResult()
+
+        assert ctx.Description == "18.1"
+        assert self._save_xml(xml) == self._clean_xml_text(_expected_twb)
+    
+    def test_transformer_interop_callback_services(self):
+        hook_builder = PyContentTransformerBuilder(ContentTransformerBuilder())
+
+        ctx = self.create(IPublishableWorkbook)
+        xml = XDocument.Parse(_test_twb, LoadOptions.PreserveWhitespace)
+
+        result = hook_builder.add(PyPublishableWorkbook, transform_workbook_xml_services, is_xml = True)
+        assert result is hook_builder
+
+        hook_factories = hook_builder.build().get_hooks(IContentTransformer[IPublishableWorkbook])
+        assert len(hook_factories) == 1
+        
+        services = self.create(IServiceProvider)
+        
+        hook = hook_factories[0].Create[IXmlContentTransformer[IPublishableWorkbook]](services)
+        hook.TransformAsync(ctx, xml, CancellationToken(False)).GetAwaiter().GetResult()
+
+        assert ctx.Description == "18.1"
+        assert self._save_xml(xml) == self._clean_xml_text(_expected_twb)
+        
\ No newline at end of file
diff --git a/src/Python/tests/test_migration_engine_migrators_batch.py b/src/Python/tests/test_migration_engine_migrators_batch.py
new file mode 100644
index 0000000..daeef4e
--- /dev/null
+++ b/src/Python/tests/test_migration_engine_migrators_batch.py
@@ -0,0 +1,35 @@
+# Copyright (c) 2024, Salesforce, Inc.
+# SPDX-License-Identifier: Apache-2
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import pytest
+import uuid
+
+from tableau_migration.migration_content import PyUser
+from tableau_migration.migration_engine_migrators_batch import PyContentBatchMigrationResult
+from tests.helpers.autofixture import AutoFixtureTestBase
+
+from Tableau.Migration.Content import IUser
+from Tableau.Migration.Engine.Migrators.Batch import IContentBatchMigrationResult
+
+class TestPyContentBatchMigrationResult(AutoFixtureTestBase):
+    
+    def test_item_results(self):
+        dotnet = self.create(IContentBatchMigrationResult[IUser])
+        
+        py = PyContentBatchMigrationResult[PyUser](dotnet)
+        
+        assert len(dotnet.ItemResults) != 0
+        assert len(py.item_results) == len(dotnet.ItemResults)
+        assert py.item_results[0].manifest_entry.source.id == uuid.UUID(dotnet.ItemResults[0].ManifestEntry.Source.Id.ToString())
\ No newline at end of file
diff --git a/src/Python/tests/test_migrations_engine_options.py b/src/Python/tests/test_migration_engine_options.py
similarity index 95%
rename from src/Python/tests/test_migrations_engine_options.py
rename to src/Python/tests/test_migration_engine_options.py
index 26b361b..c7166ce 100644
--- a/src/Python/tests/test_migrations_engine_options.py
+++ b/src/Python/tests/test_migration_engine_options.py
@@ -21,11 +21,13 @@
 import pytest
 from tableau_migration.migration import (
    get_service_provider,
-   get_service )
+   get_service 
+)
 
 from tableau_migration.migration_engine_options import (
     PyMigrationPlanOptionsBuilder,
-    PyMigrationPlanOptionsCollection)
+    PyMigrationPlanOptionsCollection
+)
 
 import System
 
@@ -35,7 +37,8 @@
 
 from Tableau.Migration.Engine.Options import (
     IMigrationPlanOptionsBuilder,
-    IMigrationPlanOptionsCollection)
+    IMigrationPlanOptionsCollection
+)
 
 import Moq
 _dist_path = abspath(Path(__file__).parent.resolve().__str__() + "/../src/tableau_migration")
diff --git a/src/Python/tests/test_migration_services.py b/src/Python/tests/test_migration_services.py
new file mode 100644
index 0000000..a02354f
--- /dev/null
+++ b/src/Python/tests/test_migration_services.py
@@ -0,0 +1,112 @@
+# Copyright (c) 2024, Salesforce, Inc.
+# SPDX-License-Identifier: Apache-2
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import pytest
+
+from System import IServiceProvider
+
+from tableau_migration.migration import (
+    PyMigrationManifest
+)
+from tableau_migration.migration_content import (
+    PyUser,
+    PyGroup,
+    PyProject,
+    PyDataSource,
+    PyWorkbook
+)
+from tableau_migration.migration_engine import (
+    PyMigrationPlan
+)
+
+from tableau_migration.migration_engine_endpoints_search import (
+    PyDestinationContentReferenceFinderFactory,
+    PyDestinationContentReferenceFinder,
+    PySourceContentReferenceFinderFactory,
+    PySourceContentReferenceFinder
+)
+
+from tableau_migration.migration_services import (
+    ScopedMigrationServices
+)
+
+from tests.helpers.autofixture import AutoFixtureTestBase
+
+class TestPySourceContentReferenceFinder(AutoFixtureTestBase):
+    _test_data = [
+        PyUser,
+        PyGroup,
+        PyProject,
+        PyDataSource,
+        PyWorkbook
+    ]
+
+    def test_get_manifest(self):
+        dotnet_provider = self.create(IServiceProvider)
+        scoped_services = ScopedMigrationServices(dotnet_provider)
+
+        result = scoped_services.get_manifest()
+        
+        assert result is not None
+        assert isinstance(result, PyMigrationManifest)
+        
+    def test_get_plan(self):
+        dotnet_provider = self.create(IServiceProvider)
+        scoped_services = ScopedMigrationServices(dotnet_provider)
+
+        result = scoped_services.get_plan()
+        
+        assert result is not None
+        assert isinstance(result, PyMigrationPlan)
+        
+    def test_get_source_finder_factory(self):
+        dotnet_provider = self.create(IServiceProvider)
+        scoped_services = ScopedMigrationServices(dotnet_provider)
+
+        result = scoped_services.get_source_finder_factory()
+        
+        assert result is not None
+        assert isinstance(result, PySourceContentReferenceFinderFactory)
+    
+    @pytest.mark.parametrize("searched_type", _test_data)
+    def test_get_source_finder(self, searched_type):
+        dotnet_provider = self.create(IServiceProvider)
+        scoped_services = ScopedMigrationServices(dotnet_provider)
+
+        result = scoped_services.get_source_finder(searched_type)
+        
+        assert result is not None
+        assert isinstance(result, PySourceContentReferenceFinder)
+        assert result._content_type is searched_type
+        
+    def test_get_destination_finder_factory(self):
+        dotnet_provider = self.create(IServiceProvider)
+        scoped_services = ScopedMigrationServices(dotnet_provider)
+
+        result = scoped_services.get_destination_finder_factory()
+        
+        assert result is not None
+        assert isinstance(result, PyDestinationContentReferenceFinderFactory)
+        
+    @pytest.mark.parametrize("searched_type", _test_data)
+    def test_get_destination_finder(self, searched_type):
+        dotnet_provider = self.create(IServiceProvider)
+        scoped_services = ScopedMigrationServices(dotnet_provider)
+
+        result = scoped_services.get_destination_finder(searched_type)
+        
+        assert result is not None
+        assert isinstance(result, PyDestinationContentReferenceFinder)
+        assert result._content_type is searched_type
diff --git a/src/Python/tests/test_migrations_engine_hooks.py b/src/Python/tests/test_migrations_engine_hooks.py
deleted file mode 100644
index 7dda9ed..0000000
--- a/src/Python/tests/test_migrations_engine_hooks.py
+++ /dev/null
@@ -1,272 +0,0 @@
-# Copyright (c) 2024, Salesforce, Inc.
-# SPDX-License-Identifier: Apache-2
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Make sure the test can find the module
-from tableau_migration.migration import get_service
-from tableau_migration.migration_engine_hooks import PyMigrationHookBuilder
-from System import IServiceProvider, Func, ArgumentException, NotImplementedException
-from System.Threading import CancellationToken
-from Microsoft.Extensions.DependencyInjection import (
-    ServiceCollection,
-    ServiceCollectionContainerBuilderExtensions)
-from Tableau.Migration.Interop.Hooks import ISyncMigrationHook
-from Tableau.Migration.Engine.Hooks import MigrationHookBuilder, IMigrationHook
-
-class ClassImplementation(ISyncMigrationHook[bool]):
-    __namespace__ = "Tableau.Migration.Custom.Hooks"
-    
-    def Execute(self, ctx) -> bool:
-        return not ctx
-
-class SubClassImplementation(ClassImplementation):
-    __namespace__ = "Tableau.Migration.Custom.Hooks"
-    
-    def Execute(self, ctx) -> bool:
-        return not ctx
-
-class SubSubClassImplementation(SubClassImplementation):
-    __namespace__ = "Tableau.Migration.Custom.Hooks"
-    
-    def Execute(self, ctx) -> bool:
-        return not ctx
-
-class RawHook(IMigrationHook[str]):
-    __namespace__ = "Tableau.Migration.Custom.Hooks"
-    
-    def Execute(self, ctx) -> str:
-        return ctx
-
-class WithoutImplementation(ISyncMigrationHook[bool]):
-    __namespace__ = "Tableau.Migration.Custom.Hooks"
-
-class TestMigrationHookBuilderTests():
-    def test_clear_class_hook(self):
-        hook_builder = PyMigrationHookBuilder(MigrationHookBuilder())
-        
-        result = hook_builder.add(ClassImplementation()).clear()
-        
-        assert result is hook_builder
-        assert len(result.build().get_hooks(ISyncMigrationHook[bool])) == 0
-        
-    def test_clear_subclass_hook(self):
-        hook_builder = PyMigrationHookBuilder(MigrationHookBuilder())
-        
-        result = hook_builder.add(SubClassImplementation()).clear()
-        
-        assert result is hook_builder
-        assert len(result.build().get_hooks(ISyncMigrationHook[int])) == 0
-        
-    def test_clear_subsubclass_hook(self):
-        hook_builder = PyMigrationHookBuilder(MigrationHookBuilder())
-        
-        result = hook_builder.add(SubSubClassImplementation()).clear()
-        
-        assert result is hook_builder
-        assert len(result.build().get_hooks(ISyncMigrationHook[int])) == 0
-        
-    def test_add_object(self):
-        hook_builder = PyMigrationHookBuilder(MigrationHookBuilder())
-        
-        result = hook_builder.add(SubSubClassImplementation())
-        
-        assert result is hook_builder
-        
-    def test_add_type_noinitializer(self):
-        hook_builder = PyMigrationHookBuilder(MigrationHookBuilder())
-        
-        result = hook_builder.add(SubSubClassImplementation)
-        
-        assert result is hook_builder
-        
-    def test_add_type_initializer(self):
-        hook_builder = PyMigrationHookBuilder(MigrationHookBuilder())
-        
-        def subclassinitialize(provider: IServiceProvider):
-            return get_service(provider, SubClassImplementation)
-        
-        result = hook_builder.add(SubClassImplementation, Func[IServiceProvider, SubClassImplementation](subclassinitialize))
-        
-        assert result is hook_builder
-        
-    def test_add_callback(self):
-        hook_builder = PyMigrationHookBuilder(MigrationHookBuilder())
-        
-        def classcallback(context: str):
-            return context
-        
-        result = hook_builder.add(ISyncMigrationHook[str], str, Func[str, str](classcallback))
-        
-        assert result is hook_builder
-        
-    def test_add_ignores_raw_hook_interface(self):
-        try:
-            PyMigrationHookBuilder(MigrationHookBuilder()).add(RawHook())
-        except ArgumentException as ae:
-            assert ae.args[0] == "Type Tableau.Migration.Custom.Hooks.RawHook does not implement any migration hook types."
-        else:
-            assert False, "This test must generate an ArgumentException."
-        
-    def test_add_withoutimplementation(self):
-        provider = ServiceCollectionContainerBuilderExtensions.BuildServiceProvider(ServiceCollection())
-        hookFactory = PyMigrationHookBuilder(MigrationHookBuilder()).add(WithoutImplementation()).build().get_hooks(ISyncMigrationHook[bool])
-        assert len(hookFactory) == 1
-        hook = hookFactory[0].Create[IMigrationHook[bool]](provider)
-        try:
-            hook.ExecuteAsync(False, CancellationToken(False))
-        except NotImplementedException as nie:
-            assert nie.args[0] == "Python object does not have a 'Execute' method"
-        else:
-            assert False, "This test must generate an NotImplementedException."
-        finally:
-            provider.Dispose()
-        
-    def test_add_withimplementation(self):
-        provider = ServiceCollectionContainerBuilderExtensions.BuildServiceProvider(ServiceCollection())
-        hookFactory = PyMigrationHookBuilder(MigrationHookBuilder()).add(SubClassImplementation()).build().get_hooks(ISyncMigrationHook[bool])
-        assert len(hookFactory) == 1
-        hook = hookFactory[0].Create[IMigrationHook[bool]](provider)
-        try:
-            result = hook.ExecuteAsync(False, CancellationToken(False))
-            
-            assert result
-        except:
-            assert False, "This test must not generate an Exception."
-        finally:
-            provider.Dispose()
-        
-    def test_build_detects_interface_from_concrete_class(self):
-        collection = PyMigrationHookBuilder(MigrationHookBuilder()).add(ClassImplementation()).build()
-        hooks = collection.get_hooks(ISyncMigrationHook[bool])
-        internalhooks = collection.get_hooks(IMigrationHook[bool])
-        otherhooks = collection.get_hooks(ISyncMigrationHook[int])
-        classhooks = collection.get_hooks(ClassImplementation)
-        subclasshooks = collection.get_hooks(SubClassImplementation)
-        subsubclasshooks = collection.get_hooks(SubSubClassImplementation)
-        
-        # Can't do a direct object comparison, so let's just count the right number is returned
-        assert len(hooks) == 1
-        assert len(internalhooks) == 0
-        assert len(otherhooks) == 0
-        assert len(classhooks) == 0
-        assert len(subclasshooks) == 0
-        assert len(subsubclasshooks) == 0
-        
-    def test_build_detects_interface_from_concrete_subclass(self):
-        collection = PyMigrationHookBuilder(MigrationHookBuilder()).add(SubClassImplementation()).build()
-        hooks = collection.get_hooks(ISyncMigrationHook[bool])
-        internalhooks = collection.get_hooks(IMigrationHook[bool])
-        otherhooks = collection.get_hooks(ISyncMigrationHook[int])
-        classhooks = collection.get_hooks(ClassImplementation)
-        subclasshooks = collection.get_hooks(SubClassImplementation)
-        subsubclasshooks = collection.get_hooks(SubSubClassImplementation)
-
-        # Can't do a direct object comparison, so let's just count the right number is returned
-        assert len(hooks) == 1
-        assert len(internalhooks) == 0
-        assert len(otherhooks) == 0
-        assert len(classhooks) == 0
-        assert len(subclasshooks) == 0
-        assert len(subsubclasshooks) == 0
-        
-    def test_build_detects_interface_from_concrete_subsubclass(self):
-        collection = PyMigrationHookBuilder(MigrationHookBuilder()).add(SubSubClassImplementation()).build()
-        hooks = collection.get_hooks(ISyncMigrationHook[bool])
-        internalhooks = collection.get_hooks(IMigrationHook[bool])
-        otherhooks = collection.get_hooks(ISyncMigrationHook[int])
-        classhooks = collection.get_hooks(ClassImplementation)
-        subclasshooks = collection.get_hooks(SubClassImplementation)
-        subsubclasshooks = collection.get_hooks(SubSubClassImplementation)
-
-        # Can't do a direct object comparison, so let's just count the right number is returned
-        assert len(hooks) == 1
-        assert len(internalhooks) == 0
-        assert len(otherhooks) == 0
-        assert len(classhooks) == 0
-        assert len(subclasshooks) == 0
-        assert len(subsubclasshooks) == 0
-        
-    def test_build_factory_class(self):
-        collection = PyMigrationHookBuilder(MigrationHookBuilder()).add(ClassImplementation).build()
-        hooks = collection.get_hooks(ISyncMigrationHook[bool])
-        internalhooks = collection.get_hooks(IMigrationHook[bool])
-        otherhooks = collection.get_hooks(ISyncMigrationHook[int])
-        classhooks = collection.get_hooks(ClassImplementation)
-        subclasshooks = collection.get_hooks(SubClassImplementation)
-        subsubclasshooks = collection.get_hooks(SubSubClassImplementation)
-
-        # Can't do a direct object comparison, so let's just count the right number is returned
-        assert len(hooks) == 1
-        assert len(internalhooks) == 0
-        assert len(otherhooks) == 0
-        assert len(classhooks) == 0
-        assert len(subclasshooks) == 0
-        assert len(subsubclasshooks) == 0
-        
-    def test_build_factory_subclass_withinitializer(self):
-        def subclassinitialize(provider: IServiceProvider):
-            return get_service(provider, SubClassImplementation)
-        
-        collection = PyMigrationHookBuilder(MigrationHookBuilder()).add(SubClassImplementation, Func[IServiceProvider, SubClassImplementation](subclassinitialize)).build()
-        hooks = collection.get_hooks(ISyncMigrationHook[bool])
-        internalhooks = collection.get_hooks(IMigrationHook[bool])
-        otherhooks = collection.get_hooks(ISyncMigrationHook[int])
-        classhooks = collection.get_hooks(ClassImplementation)
-        subclasshooks = collection.get_hooks(SubClassImplementation)
-        subsubclasshooks = collection.get_hooks(SubSubClassImplementation)
-
-        # Can't do a direct object comparison, so let's just count the right number is returned
-        assert len(hooks) == 1
-        assert len(internalhooks) == 0
-        assert len(otherhooks) == 0
-        assert len(classhooks) == 0
-        assert len(subclasshooks) == 0
-        assert len(subsubclasshooks) == 0
-        
-    def test_build_factory_multipleclasses(self):
-        collection = PyMigrationHookBuilder(MigrationHookBuilder()).add(ClassImplementation).add(SubClassImplementation).add(SubSubClassImplementation).build()
-        hooks = collection.get_hooks(ISyncMigrationHook[bool])
-        internalhooks = collection.get_hooks(IMigrationHook[bool])
-        otherhooks = collection.get_hooks(ISyncMigrationHook[int])
-        classhooks = collection.get_hooks(ClassImplementation)
-        subclasshooks = collection.get_hooks(SubClassImplementation)
-        subsubclasshooks = collection.get_hooks(SubSubClassImplementation)
-
-        # Can't do a direct object comparison, so let's just count the right number is returned
-        assert len(hooks) == 3
-        assert len(internalhooks) == 0
-        assert len(otherhooks) == 0
-        assert len(classhooks) == 0
-        assert len(subclasshooks) == 0
-        assert len(subsubclasshooks) == 0
-        
-    def test_build_callback(self):
-        def classcallback(context: str):
-            return context
-        
-        collection = PyMigrationHookBuilder(MigrationHookBuilder()).add(ISyncMigrationHook[str], str, Func[str, str](classcallback)).build()
-        hooks = collection.get_hooks(ISyncMigrationHook[str])
-        internalhooks = collection.get_hooks(IMigrationHook[str])
-        otherhooks = collection.get_hooks(ISyncMigrationHook[int])
-        classhooks = collection.get_hooks(ClassImplementation)
-        subclasshooks = collection.get_hooks(SubClassImplementation)
-        subsubclasshooks = collection.get_hooks(SubSubClassImplementation)
-
-        # Can't do a direct object comparison, so let's just count the right number is returned
-        assert len(hooks) == 1
-        assert len(internalhooks) == 0
-        assert len(otherhooks) == 0
-        assert len(classhooks) == 0
-        assert len(subclasshooks) == 0
-        assert len(subsubclasshooks) == 0
diff --git a/src/Python/tests/test_migrations_engine_hooks_filters.py b/src/Python/tests/test_migrations_engine_hooks_filters.py
deleted file mode 100644
index 4afc1cc..0000000
--- a/src/Python/tests/test_migrations_engine_hooks_filters.py
+++ /dev/null
@@ -1,243 +0,0 @@
-# Copyright (c) 2024, Salesforce, Inc.
-# SPDX-License-Identifier: Apache-2
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Make sure the test can find the module
-from tableau_migration.migration import get_service
-from tableau_migration.migration_engine_hooks_filters import PyContentFilterBuilder
-from System import IServiceProvider, Func, ArgumentException, NotImplementedException
-from System.Collections.Generic import IEnumerable, List
-from System.Threading import CancellationToken
-from Microsoft.Extensions.DependencyInjection import (
-    ServiceCollection,
-    ServiceCollectionContainerBuilderExtensions)
-from Tableau.Migration.Content import IUser,IProject
-from Tableau.Migration.Engine import ContentMigrationItem
-from Tableau.Migration.Engine.Hooks import IMigrationHook
-from Tableau.Migration.Engine.Hooks.Filters import ContentFilterBuilder,IContentFilter,ContentFilterBase
-from Tableau.Migration.Interop.Hooks.Filters import ISyncContentFilter
-
-class ClassImplementation(ISyncContentFilter[IUser]):
-    __namespace__ = "Tableau.Migration.Custom.Hooks.Filters"
-    
-    def Execute(self, ctx: IEnumerable[ContentMigrationItem[IUser]]) -> IEnumerable[ContentMigrationItem[IUser]]:
-        return ctx
-
-
-class SubClassImplementation(ClassImplementation):
-    __namespace__ = "Tableau.Migration.Custom.Hooks.Filters"
-    
-    def Execute(self, ctx: IEnumerable[ContentMigrationItem[IUser]]) -> IEnumerable[ContentMigrationItem[IUser]]:
-        print("In Execute of SubClassImplementation(ClassImplementation)" )
-        return ctx
-
-
-class RawHook():
-    __namespace__ = "Tableau.Migration.Custom.Hooks.Filters"
-    
-    def ShouldMigrate(self, ctx) -> bool:
-        return True
-
-
-class WithoutImplementation(ISyncContentFilter[IUser]):
-    __namespace__ = "Tableau.Migration.Custom.Hooks.Filters"
-
-
-class TestContentFilterBuilderTests():
-    def test_clear_class_hook(self):
-        hook_builder = PyContentFilterBuilder(ContentFilterBuilder())
-        
-        result = hook_builder.add(IUser,ClassImplementation()).clear()
-        
-        assert result is hook_builder
-        assert len(result.build().get_hooks(ISyncContentFilter[IUser])) == 0
-        
-    def test_clear_subclass_hook(self):
-        hook_builder = PyContentFilterBuilder(ContentFilterBuilder())
-        
-        result = hook_builder.add(IUser,SubClassImplementation()).clear()
-        
-        assert result is hook_builder
-        assert len(result.build().get_hooks(ISyncContentFilter[IUser])) == 0
-
-    def test_clear_raw_hook(self):
-        try:
-            hook_builder = PyContentFilterBuilder(ContentFilterBuilder())
-        
-            result = hook_builder.add(IProject,RawHook()).clear()
-        
-            assert result is hook_builder
-            assert len(result.build().get_hooks(ISyncContentFilter[IUser])) == 0
-        except Exception as e:
-            print(e);
-
-        
-    def test_add_object(self):
-        hook_builder = PyContentFilterBuilder(ContentFilterBuilder())
-        
-        result = hook_builder.add(IUser,SubClassImplementation())
-        
-        assert result is hook_builder
-        
-    def test_add_type_noinitializer(self):
-        hook_builder = PyContentFilterBuilder(ContentFilterBuilder())
-        
-        result = hook_builder.add(ClassImplementation,IUser)
-        
-        assert result is hook_builder
-        
-    def test_add_type_initializer(self):
-        hook_builder = PyContentFilterBuilder(ContentFilterBuilder())
-        
-        def subclassinitialize(provider: IServiceProvider):
-            return get_service(provider, SubClassImplementation)
-        
-        result = hook_builder.add(SubClassImplementation, IUser, Func[IServiceProvider, SubClassImplementation](subclassinitialize))
-        
-        assert result is hook_builder
-        
-    def test_add_callback(self):
-        hook_builder = PyContentFilterBuilder(ContentFilterBuilder())
-        
-        def classcallback(context: IEnumerable[ContentMigrationItem[IProject]]):
-            return context
-        
-        result = hook_builder.add(IProject, Func[IEnumerable[ContentMigrationItem[IProject]], IEnumerable[ContentMigrationItem[IProject]]](classcallback))
-        
-        assert result is hook_builder
-        
-    def test_add_withoutimplementation(self):
-        users = List[ContentMigrationItem[IUser]]();
-        provider = ServiceCollectionContainerBuilderExtensions.BuildServiceProvider(ServiceCollection())
-        hookFactory = PyContentFilterBuilder(ContentFilterBuilder()).add(IUser, WithoutImplementation()).build().get_hooks(IContentFilter[IUser])
-        assert len(hookFactory) == 1
-        hook = hookFactory[0].Create[IMigrationHook[IEnumerable[ContentMigrationItem[IUser]]]](provider)
-        try:
-            hook.ExecuteAsync(users, CancellationToken(False))
-        except NotImplementedException as nie:
-            assert nie.args[0] == "Python object does not have a 'Execute' method"
-        else:
-            assert False, "This test must generate a NotImplementedException."
-        finally:
-            provider.Dispose()
-        
-    def test_add_withimplementation(self):
-        users = List[ContentMigrationItem[IUser]]();
-        provider = ServiceCollectionContainerBuilderExtensions.BuildServiceProvider(ServiceCollection())
-        hookFactory = PyContentFilterBuilder(ContentFilterBuilder()).add(IUser, SubClassImplementation()).build().get_hooks(IContentFilter[IUser])
-        assert len(hookFactory) == 1
-        hook = hookFactory[0].Create[IMigrationHook[IEnumerable[ContentMigrationItem[IUser]]]](provider)
-        try:
-            result = hook.ExecuteAsync(users, CancellationToken(False))
-            print(result)
-        except:
-            assert False, "This test must not generate an Exception."
-        finally:
-            provider.Dispose()
-        
-    def test_build_detects_interface_from_concrete_class(self):
-        collection = PyContentFilterBuilder(ContentFilterBuilder()).add(IUser,ClassImplementation()).build()
-        hooks = collection.get_hooks(IContentFilter[IUser])
-        internalhooks = collection.get_hooks(IMigrationHook[IEnumerable[ContentMigrationItem[IUser]]])
-        otherhooks = collection.get_hooks(IContentFilter[IProject])
-        classhooks = collection.get_hooks(ClassImplementation)
-        subclasshooks = collection.get_hooks(SubClassImplementation)
-        
-        # Can't do a direct object comparison, so let's just count the right number is returned
-        assert len(hooks) == 1
-        assert len(internalhooks) == 0
-        assert len(otherhooks) == 0
-        assert len(classhooks) == 0
-        assert len(subclasshooks) == 0
-        
-    def test_build_detects_interface_from_concrete_subclass(self):
-        collection = PyContentFilterBuilder(ContentFilterBuilder()).add(IUser,SubClassImplementation()).build()
-        hooks = collection.get_hooks(IContentFilter[IUser])
-        internalhooks = collection.get_hooks(IMigrationHook[IEnumerable[ContentMigrationItem[IUser]]])
-        otherhooks = collection.get_hooks(IContentFilter[IProject])
-        classhooks = collection.get_hooks(ClassImplementation)
-        subclasshooks = collection.get_hooks(SubClassImplementation)
-
-        # Can't do a direct object comparison, so let's just count the right number is returned
-        assert len(hooks) == 1
-        assert len(internalhooks) == 0
-        assert len(otherhooks) == 0
-        assert len(classhooks) == 0
-        assert len(subclasshooks) == 0
-        
-    def test_build_factory_class(self):
-        collection = PyContentFilterBuilder(ContentFilterBuilder()).add(ClassImplementation,IUser).build()
-        hooks = collection.get_hooks(IContentFilter[IUser])
-        internalhooks = collection.get_hooks(IMigrationHook[IEnumerable[ContentMigrationItem[IUser]]])
-        otherhooks = collection.get_hooks(IContentFilter[IProject])
-        classhooks = collection.get_hooks(ClassImplementation)
-        subclasshooks = collection.get_hooks(SubClassImplementation)
-
-        # Can't do a direct object comparison, so let's just count the right number is returned
-        assert len(hooks) == 1
-        assert len(internalhooks) == 0
-        assert len(otherhooks) == 0
-        assert len(classhooks) == 0
-        assert len(subclasshooks) == 0
-        
-    def test_build_factory_subclass_withinitializer(self):
-        def subclassinitialize(provider: IServiceProvider):
-            return get_service(provider, SubClassImplementation)
-        
-        collection = PyContentFilterBuilder(ContentFilterBuilder()).add(SubClassImplementation, IUser, Func[IServiceProvider, SubClassImplementation](subclassinitialize)).build()
-        hooks = collection.get_hooks(IContentFilter[IUser])
-        internalhooks = collection.get_hooks(IMigrationHook[IEnumerable[ContentMigrationItem[IUser]]])
-        otherhooks = collection.get_hooks(IContentFilter[IProject])
-        classhooks = collection.get_hooks(ClassImplementation)
-        subclasshooks = collection.get_hooks(SubClassImplementation)
-
-        # Can't do a direct object comparison, so let's just count the right number is returned
-        assert len(hooks) == 1
-        assert len(internalhooks) == 0
-        assert len(otherhooks) == 0
-        assert len(classhooks) == 0
-        assert len(subclasshooks) == 0
-        
-    def test_build_factory_multipleclasses(self):
-        collection = PyContentFilterBuilder(ContentFilterBuilder()).add(ClassImplementation,IUser).add(SubClassImplementation,IUser).build()
-        hooks = collection.get_hooks(IContentFilter[IUser])
-        internalhooks = collection.get_hooks(IMigrationHook[IEnumerable[ContentMigrationItem[IUser]]])
-        otherhooks = collection.get_hooks(IContentFilter[IProject])
-        classhooks = collection.get_hooks(ClassImplementation)
-        subclasshooks = collection.get_hooks(SubClassImplementation)
-
-        # Can't do a direct object comparison, so let's just count the right number is returned
-        assert len(hooks) == 2
-        assert len(internalhooks) == 0
-        assert len(otherhooks) == 0
-        assert len(classhooks) == 0
-        assert len(subclasshooks) == 0
-        
-    def test_build_callback(self):
-        def classcallback(context: IEnumerable[ContentMigrationItem[IProject]]):
-            return context
-        
-        collection = PyContentFilterBuilder(ContentFilterBuilder()).add(IProject, Func[IEnumerable[ContentMigrationItem[IProject]], IEnumerable[ContentMigrationItem[IProject]]](classcallback)).build()
-        hooks = collection.get_hooks(IContentFilter[IProject])
-        internalhooks = collection.get_hooks(IMigrationHook[IEnumerable[ContentMigrationItem[IProject]]])
-        otherhooks = collection.get_hooks(IContentFilter[IUser])
-        classhooks = collection.get_hooks(ClassImplementation)
-        subclasshooks = collection.get_hooks(SubClassImplementation)
-
-        # Can't do a direct object comparison, so let's just count the right number is returned
-        assert len(hooks) == 1
-        assert len(internalhooks) == 0
-        assert len(otherhooks) == 0
-        assert len(classhooks) == 0
-        assert len(subclasshooks) == 0
diff --git a/src/Python/tests/test_migrations_engine_hooks_filters_lifetime.py b/src/Python/tests/test_migrations_engine_hooks_filters_lifetime.py
deleted file mode 100644
index c5a046d..0000000
--- a/src/Python/tests/test_migrations_engine_hooks_filters_lifetime.py
+++ /dev/null
@@ -1,373 +0,0 @@
-# Copyright (c) 2024, Salesforce, Inc.
-# SPDX-License-Identifier: Apache-2
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Make sure the test can find the module
-import pytest
-from tableau_migration.migration import get_service
-from tableau_migration.migration_engine_hooks_filters import PyContentFilterBuilder
-from System import IServiceProvider, Func
-from Microsoft.Extensions.DependencyInjection import (
-    ServiceProviderServiceExtensions,
-    ServiceCollectionServiceExtensions,
-    ServiceCollection,
-    ServiceCollectionContainerBuilderExtensions)
-from System.Collections.Generic import IEnumerable
-from Tableau.Migration.Content import IUser,IProject
-from Tableau.Migration.Engine import ContentMigrationItem
-from Tableau.Migration.Engine.Hooks import IMigrationHook
-from Tableau.Migration.Engine.Hooks.Filters import ContentFilterBuilder,IContentFilter
-from Tableau.Migration.Interop.Hooks.Filters import ISyncContentFilter
-
-class FilterImplementation(ISyncContentFilter[IUser]):
-    __namespace__ = "Tableau.Migration.Custom.Hooks.Filters.Lifetime"
-    
-    def Execute(self, ctx: IEnumerable[ContentMigrationItem[IUser]]) -> IEnumerable[ContentMigrationItem[IUser]]:
-        return ctx
-
-class SubFilterImplementation(FilterImplementation):
-    __namespace__ = "Tableau.Migration.Custom.Hooks.Filters.Lifetime"
-    
-    def Execute(self, ctx: IEnumerable[ContentMigrationItem[IUser]]) -> IEnumerable[ContentMigrationItem[IUser]]:
-        return ctx
-
-class TestContentFilterBuilderLifetimeTests():
-    @pytest.fixture(autouse=True, scope="class")
-    def setup(self):
-        TestContentFilterBuilderLifetimeTests.FilterImplementation = FilterImplementation
-        TestContentFilterBuilderLifetimeTests.SubFilterImplementation = SubFilterImplementation
-            
-        yield
-        
-        del TestContentFilterBuilderLifetimeTests.SubFilterImplementation
-        del TestContentFilterBuilderLifetimeTests.FilterImplementation
-        
-    def test_lifetime_buildandcreate_object(self, skip_by_python_lifetime_env_var):
-        try:
-            # Arrange
-            provider = ServiceCollectionContainerBuilderExtensions.BuildServiceProvider(ServiceCollection())
-            hook = TestContentFilterBuilderLifetimeTests.SubFilterImplementation()
-            hookFactory = PyContentFilterBuilder(ContentFilterBuilder()).add(IUser,hook).build().get_hooks(IContentFilter[IUser])
-        
-            assert len(hookFactory) == 1
-
-            # Act
-            try:
-                scope1 = ServiceProviderServiceExtensions.CreateScope(provider)
-                firstScopeHook1 = hookFactory[0].Create[IContentFilter[IUser]](scope1.ServiceProvider)
-                firstScopeHook2 = hookFactory[0].Create[IContentFilter[IUser]](scope1.ServiceProvider)
-            finally:
-                scope1.Dispose()
-
-            try:
-                scope2 = ServiceProviderServiceExtensions.CreateScope(provider)
-                lastScopeHook = hookFactory[0].Create[IContentFilter[IUser]](scope2.ServiceProvider)
-            finally:
-                scope2.Dispose()
-
-            # Assert
-            assert hook == firstScopeHook1
-            assert hook is not firstScopeHook1
-            assert hook == firstScopeHook2
-            assert hook is not firstScopeHook2
-            assert hook == lastScopeHook
-            assert hook is not lastScopeHook
-        finally:
-            provider.Dispose()
-
-    def test_lifetime_buildandcreate_noinitializersingleton(self, skip_by_python_lifetime_env_var):
-        try:
-            # Arrange
-            servicecollection = ServiceCollection()
-            ServiceCollectionServiceExtensions.AddSingleton[TestContentFilterBuilderLifetimeTests.SubFilterImplementation](servicecollection)
-            provider = ServiceCollectionContainerBuilderExtensions.BuildServiceProvider(servicecollection)
-            hookFactory = PyContentFilterBuilder(ContentFilterBuilder()).add(TestContentFilterBuilderLifetimeTests.SubFilterImplementation,IUser).build().get_hooks(IContentFilter[IUser])
-        
-            assert len(hookFactory) == 1
-
-            # Act
-            try:
-                scope1 = ServiceProviderServiceExtensions.CreateScope(provider)
-                firstScopeHook1 = hookFactory[0].Create[IContentFilter[IUser]](scope1.ServiceProvider)
-                firstScopeHook2 = hookFactory[0].Create[IContentFilter[IUser]](scope1.ServiceProvider)
-            finally:
-                scope1.Dispose()
-
-            try:
-                scope2 = ServiceProviderServiceExtensions.CreateScope(provider)
-                lastScopeHook = hookFactory[0].Create[IContentFilter[IUser]](scope2.ServiceProvider)
-            finally:
-                scope2.Dispose()
-
-            # Assert
-            assert firstScopeHook1 == firstScopeHook2
-            assert firstScopeHook1 is not firstScopeHook2
-            assert firstScopeHook1 == lastScopeHook
-            assert firstScopeHook1 is not lastScopeHook
-        finally:
-            provider.Dispose()
-
-    def test_lifetime_buildandcreate_noinitializerscoped(self, skip_by_python_lifetime_env_var):
-        try:
-            # Arrange
-            servicecollection = ServiceCollection()
-            ServiceCollectionServiceExtensions.AddScoped[TestContentFilterBuilderLifetimeTests.SubFilterImplementation](servicecollection)
-            provider = ServiceCollectionContainerBuilderExtensions.BuildServiceProvider(servicecollection)
-            hookFactory = PyContentFilterBuilder(ContentFilterBuilder()).add(TestContentFilterBuilderLifetimeTests.SubFilterImplementation,IUser).build().get_hooks(IContentFilter[IUser])
-        
-            assert len(hookFactory) == 1
-
-            # Act
-            try:
-                scope1 = ServiceProviderServiceExtensions.CreateScope(provider)
-                firstScopeHook1 = hookFactory[0].Create[IContentFilter[IUser]](scope1.ServiceProvider)
-                firstScopeHook2 = hookFactory[0].Create[IContentFilter[IUser]](scope1.ServiceProvider)
-            finally:
-                scope1.Dispose()
-
-            try:
-                scope2 = ServiceProviderServiceExtensions.CreateScope(provider)
-                lastScopeHook = hookFactory[0].Create[IContentFilter[IUser]](scope2.ServiceProvider)
-            finally:
-                scope2.Dispose()
-
-            # Assert
-            assert firstScopeHook1 == firstScopeHook2
-            assert firstScopeHook1 is not firstScopeHook2
-            assert firstScopeHook1 != lastScopeHook
-        finally:
-            provider.Dispose()
-
-    def test_lifetime_buildandcreate_noinitializertransient(self, skip_by_python_lifetime_env_var):
-        try:
-            # Arrange
-            servicecollection = ServiceCollection()
-            ServiceCollectionServiceExtensions.AddTransient[TestContentFilterBuilderLifetimeTests.SubFilterImplementation](servicecollection)
-            provider = ServiceCollectionContainerBuilderExtensions.BuildServiceProvider(servicecollection)
-            hookFactory = PyContentFilterBuilder(ContentFilterBuilder()).add(TestContentFilterBuilderLifetimeTests.SubFilterImplementation,IUser).build().get_hooks(IContentFilter[IUser])
-        
-            assert len(hookFactory) == 1
-
-            # Act
-            try:
-                scope1 = ServiceProviderServiceExtensions.CreateScope(provider)
-                firstScopeHook1 = hookFactory[0].Create[IContentFilter[IUser]](scope1.ServiceProvider)
-                firstScopeHook2 = hookFactory[0].Create[IContentFilter[IUser]](scope1.ServiceProvider)
-            finally:
-                scope1.Dispose()
-
-            try:
-                scope2 = ServiceProviderServiceExtensions.CreateScope(provider)
-                lastScopeHook = hookFactory[0].Create[IContentFilter[IUser]](scope2.ServiceProvider)
-            finally:
-                scope2.Dispose()
-
-            # Assert
-            assert firstScopeHook1 != firstScopeHook2
-            assert firstScopeHook1 != lastScopeHook
-        finally:
-            provider.Dispose()
-
-    def test_lifetime_buildandcreate_initializerobjectreference(self, skip_by_python_lifetime_env_var):
-        try:
-            # Arrange
-            hook = TestContentFilterBuilderLifetimeTests.SubFilterImplementation()
-            def subsubclassinitialize(provider: IServiceProvider):
-                return hook
-            provider = ServiceCollectionContainerBuilderExtensions.BuildServiceProvider(ServiceCollection())
-            hookFactory = PyContentFilterBuilder(ContentFilterBuilder()).add(TestContentFilterBuilderLifetimeTests.SubFilterImplementation, IUser, Func[IServiceProvider, TestContentFilterBuilderLifetimeTests.SubFilterImplementation](subsubclassinitialize)).build().get_hooks(IContentFilter[IUser])
-        
-            assert len(hookFactory) == 1
-
-            # Act
-            try:
-                scope1 = ServiceProviderServiceExtensions.CreateScope(provider)
-                firstScopeHook1 = hookFactory[0].Create[IContentFilter[IUser]](scope1.ServiceProvider)
-                firstScopeHook2 = hookFactory[0].Create[IContentFilter[IUser]](scope1.ServiceProvider)
-            finally:
-                scope1.Dispose()
-
-            try:
-                scope2 = ServiceProviderServiceExtensions.CreateScope(provider)
-                lastScopeHook = hookFactory[0].Create[IContentFilter[IUser]](scope2.ServiceProvider)
-            finally:
-                scope2.Dispose()
-
-            # Assert
-            assert firstScopeHook1 == firstScopeHook2
-            assert firstScopeHook1 is not firstScopeHook2
-            assert firstScopeHook1 == lastScopeHook
-            assert firstScopeHook1 is not lastScopeHook
-        finally:
-            provider.Dispose()
-
-    def test_lifetime_buildandcreate_initializernewobject(self, skip_by_python_lifetime_env_var):
-        try:
-            # Arrange
-            def subsubclassinitialize(provider: IServiceProvider):
-                return TestContentFilterBuilderLifetimeTests.SubFilterImplementation()
-            provider = ServiceCollectionContainerBuilderExtensions.BuildServiceProvider(ServiceCollection())
-            hookFactory = PyContentFilterBuilder(ContentFilterBuilder()).add(TestContentFilterBuilderLifetimeTests.SubFilterImplementation, IUser, Func[IServiceProvider, TestContentFilterBuilderLifetimeTests.SubFilterImplementation](subsubclassinitialize)).build().get_hooks(IContentFilter[IUser])
-        
-            assert len(hookFactory) == 1
-
-            # Act
-            try:
-                scope1 = ServiceProviderServiceExtensions.CreateScope(provider)
-                firstScopeHook1 = hookFactory[0].Create[IContentFilter[IUser]](scope1.ServiceProvider)
-                firstScopeHook2 = hookFactory[0].Create[IContentFilter[IUser]](scope1.ServiceProvider)
-            finally:
-                scope1.Dispose()
-
-            try:
-                scope2 = ServiceProviderServiceExtensions.CreateScope(provider)
-                lastScopeHook = hookFactory[0].Create[IContentFilter[IUser]](scope2.ServiceProvider)
-            finally:
-                scope2.Dispose()
-
-            # Assert
-            assert firstScopeHook1 != firstScopeHook2
-            assert firstScopeHook1 != lastScopeHook
-        finally:
-            provider.Dispose()
-
-    def test_lifetime_buildandcreate_initializersingleton(self, skip_by_python_lifetime_env_var):
-        try:
-            # Arrange
-            def subsubclassinitialize(provider: IServiceProvider):
-                return get_service(provider,TestContentFilterBuilderLifetimeTests.SubFilterImplementation)
-            servicecollection = ServiceCollection()
-            ServiceCollectionServiceExtensions.AddSingleton[TestContentFilterBuilderLifetimeTests.SubFilterImplementation](servicecollection)
-            provider = ServiceCollectionContainerBuilderExtensions.BuildServiceProvider(servicecollection)
-            hookFactory = PyContentFilterBuilder(ContentFilterBuilder()).add(TestContentFilterBuilderLifetimeTests.SubFilterImplementation, IUser, Func[IServiceProvider, TestContentFilterBuilderLifetimeTests.SubFilterImplementation](subsubclassinitialize)).build().get_hooks(IContentFilter[IUser])
-        
-            assert len(hookFactory) == 1
-
-            # Act
-            try:
-                scope1 = ServiceProviderServiceExtensions.CreateScope(provider)
-                firstScopeHook1 = hookFactory[0].Create[IContentFilter[IUser]](scope1.ServiceProvider)
-                firstScopeHook2 = hookFactory[0].Create[IContentFilter[IUser]](scope1.ServiceProvider)
-            finally:
-                scope1.Dispose()
-
-            try:
-                scope2 = ServiceProviderServiceExtensions.CreateScope(provider)
-                lastScopeHook = hookFactory[0].Create[IContentFilter[IUser]](scope2.ServiceProvider)
-            finally:
-                scope2.Dispose()
-
-            # Assert
-            assert firstScopeHook1 == firstScopeHook2
-            assert firstScopeHook1 is not firstScopeHook2
-            assert firstScopeHook1 == lastScopeHook
-            assert firstScopeHook1 is not lastScopeHook
-        finally:
-            provider.Dispose()
-
-    def test_lifetime_buildandcreate_initializerscoped(self, skip_by_python_lifetime_env_var):
-        try:
-            # Arrange
-            def classinitialize(provider: IServiceProvider):
-                return get_service(provider,TestContentFilterBuilderLifetimeTests.FilterImplementation)
-            servicecollection = ServiceCollection()
-            ServiceCollectionServiceExtensions.AddScoped[TestContentFilterBuilderLifetimeTests.FilterImplementation](servicecollection)
-            provider = ServiceCollectionContainerBuilderExtensions.BuildServiceProvider(servicecollection)
-            hookFactory = PyContentFilterBuilder(ContentFilterBuilder()).add(TestContentFilterBuilderLifetimeTests.FilterImplementation, IUser, Func[IServiceProvider, TestContentFilterBuilderLifetimeTests.FilterImplementation](classinitialize)).build().get_hooks(IContentFilter[IUser])
-        
-            assert len(hookFactory) == 1
-
-            # Act
-            try:
-                scope1 = ServiceProviderServiceExtensions.CreateScope(provider)
-                firstScopeHook1 = hookFactory[0].Create[IContentFilter[IUser]](scope1.ServiceProvider)
-                firstScopeHook2 = hookFactory[0].Create[IContentFilter[IUser]](scope1.ServiceProvider)
-            finally:
-                scope1.Dispose()
-
-            try:
-                scope2 = ServiceProviderServiceExtensions.CreateScope(provider)
-                lastScopeHook = hookFactory[0].Create[IContentFilter[IUser]](scope2.ServiceProvider)
-            finally:
-                scope2.Dispose()
-
-            # Assert
-            assert firstScopeHook1 == firstScopeHook2
-            assert firstScopeHook1 is not firstScopeHook2
-            assert firstScopeHook1 != lastScopeHook
-        finally:
-            provider.Dispose()
-
-    def test_lifetime_buildandcreate_initializertransient(self, skip_by_python_lifetime_env_var):
-        try:
-            # Arrange
-            def subclassinitialize(provider: IServiceProvider):
-                return get_service(provider,TestContentFilterBuilderLifetimeTests.SubFilterImplementation)
-            servicecollection = ServiceCollection()
-            ServiceCollectionServiceExtensions.AddTransient[TestContentFilterBuilderLifetimeTests.SubFilterImplementation](servicecollection)
-            provider = ServiceCollectionContainerBuilderExtensions.BuildServiceProvider(servicecollection)
-            hookFactory = PyContentFilterBuilder(ContentFilterBuilder()).add(TestContentFilterBuilderLifetimeTests.SubFilterImplementation, IUser, Func[IServiceProvider, TestContentFilterBuilderLifetimeTests.SubFilterImplementation](subclassinitialize)).build().get_hooks(IContentFilter[IUser])
-        
-            assert len(hookFactory) == 1
-
-            # Act
-            try:
-                scope1 = ServiceProviderServiceExtensions.CreateScope(provider)
-                firstScopeHook1 = hookFactory[0].Create[IContentFilter[IUser]](scope1.ServiceProvider)
-                firstScopeHook2 = hookFactory[0].Create[IContentFilter[IUser]](scope1.ServiceProvider)
-            finally:
-                scope1.Dispose()
-
-            try:
-                scope2 = ServiceProviderServiceExtensions.CreateScope(provider)
-                lastScopeHook = hookFactory[0].Create[IContentFilter[IUser]](scope2.ServiceProvider)
-            finally:
-                scope2.Dispose()
-
-            # Assert
-            assert firstScopeHook1 != firstScopeHook2
-            assert firstScopeHook1 != lastScopeHook
-        finally:
-            provider.Dispose()
-
-    def test_lifetime_buildandcreate_callback(self, skip_by_python_lifetime_env_var):
-        try:
-            # Arrange
-            def classcallback(context: IEnumerable[ContentMigrationItem[IProject]]):
-                return context
-        
-            provider = ServiceCollectionContainerBuilderExtensions.BuildServiceProvider(ServiceCollection())
-            hookFactory = PyContentFilterBuilder(ContentFilterBuilder()).add(IProject, Func[IEnumerable[ContentMigrationItem[IProject]], IEnumerable[ContentMigrationItem[IProject]]](classcallback)).build().get_hooks(IContentFilter[IProject])
-        
-            assert len(hookFactory) == 1
-
-            # Act
-            try:
-                scope1 = ServiceProviderServiceExtensions.CreateScope(provider)
-                firstScopeHook1 = hookFactory[0].Create[IMigrationHook[IEnumerable[ContentMigrationItem[IProject]]]](scope1.ServiceProvider)
-                firstScopeHook2 = hookFactory[0].Create[IMigrationHook[IEnumerable[ContentMigrationItem[IProject]]]](scope1.ServiceProvider)
-            finally:
-                scope1.Dispose()
-
-            try:
-                scope2 = ServiceProviderServiceExtensions.CreateScope(provider)
-                lastScopeHook = hookFactory[0].Create[IMigrationHook[IEnumerable[ContentMigrationItem[IProject]]]](scope2.ServiceProvider)
-            finally:
-                scope2.Dispose()
-
-            # Assert
-            assert firstScopeHook1 != firstScopeHook2
-            assert firstScopeHook1 != lastScopeHook
-        finally:
-            provider.Dispose()
diff --git a/src/Python/tests/test_migrations_engine_hooks_lifetime.py b/src/Python/tests/test_migrations_engine_hooks_lifetime.py
deleted file mode 100644
index 458bb89..0000000
--- a/src/Python/tests/test_migrations_engine_hooks_lifetime.py
+++ /dev/null
@@ -1,378 +0,0 @@
-# Copyright (c) 2024, Salesforce, Inc.
-# SPDX-License-Identifier: Apache-2
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Make sure the test can find the module
-import pytest
-from tableau_migration.migration import get_service
-from tableau_migration.migration_engine_hooks import PyMigrationHookBuilder
-from System import IServiceProvider, Func
-from Microsoft.Extensions.DependencyInjection import (
-    ServiceProviderServiceExtensions,
-    ServiceCollectionServiceExtensions,
-    ServiceCollection,
-    ServiceCollectionContainerBuilderExtensions)
-from Tableau.Migration.Engine.Hooks import MigrationHookBuilder, IMigrationHook
-from Tableau.Migration.Interop.Hooks import ISyncMigrationHook
-
-class HookImplementation(ISyncMigrationHook[bool]):
-    __namespace__ = "Tableau.Migration.Custom.Hooks.Lifetime"
-    
-    def Execute(self, ctx) -> bool:
-        return ctx
-
-class SubHookImplementation(HookImplementation):
-    __namespace__ = "Tableau.Migration.Custom.Hooks.Lifetime"
-
-    def Execute(self, ctx) -> bool:
-        return ctx
-
-class SubSubHookImplementation(SubHookImplementation):
-    __namespace__ = "Tableau.Migration.Custom.Hooks.Lifetime"
-    
-    def Execute(self, ctx) -> bool:
-        return ctx
-
-class TestMigrationHookBuilderLifetimeTests():
-    @pytest.fixture(autouse=True, scope="class")
-    def setup(self):
-        TestMigrationHookBuilderLifetimeTests.HookImplementation = HookImplementation
-        TestMigrationHookBuilderLifetimeTests.SubHookImplementation = SubHookImplementation
-        TestMigrationHookBuilderLifetimeTests.SubSubHookImplementation = SubSubHookImplementation
-            
-        yield
-        
-        del TestMigrationHookBuilderLifetimeTests.SubSubHookImplementation
-        del TestMigrationHookBuilderLifetimeTests.SubHookImplementation
-        del TestMigrationHookBuilderLifetimeTests.HookImplementation
-        
-    def test_lifetime_buildandcreate_object(self, skip_by_python_lifetime_env_var):
-        try:
-            # Arrange
-            provider = ServiceCollectionContainerBuilderExtensions.BuildServiceProvider(ServiceCollection())
-            hook = TestMigrationHookBuilderLifetimeTests.SubHookImplementation()
-            hookFactory = PyMigrationHookBuilder(MigrationHookBuilder()).add(hook).build().get_hooks(ISyncMigrationHook[bool])
-        
-            assert len(hookFactory) == 1
-
-            # Act
-            try:
-                scope1 = ServiceProviderServiceExtensions.CreateScope(provider)
-                firstScopeHook1 = hookFactory[0].Create[IMigrationHook[bool]](scope1.ServiceProvider)
-                firstScopeHook2 = hookFactory[0].Create[IMigrationHook[bool]](scope1.ServiceProvider)
-            finally:
-                scope1.Dispose()
-
-            try:
-                scope2 = ServiceProviderServiceExtensions.CreateScope(provider)
-                lastScopeHook = hookFactory[0].Create[IMigrationHook[bool]](scope2.ServiceProvider)
-            finally:
-                scope2.Dispose()
-
-            # Assert
-            assert hook == firstScopeHook1
-            assert hook is not firstScopeHook1
-            assert hook == firstScopeHook2
-            assert hook is not firstScopeHook2
-            assert hook == lastScopeHook
-            assert hook is not lastScopeHook
-        finally:
-            provider.Dispose()
-
-    def test_lifetime_buildandcreate_noinitializersingleton(self, skip_by_python_lifetime_env_var):
-        try:
-            # Arrange
-            servicecollection = ServiceCollection()
-            ServiceCollectionServiceExtensions.AddSingleton[TestMigrationHookBuilderLifetimeTests.SubHookImplementation](servicecollection)
-            provider = ServiceCollectionContainerBuilderExtensions.BuildServiceProvider(servicecollection)
-            hookFactory = PyMigrationHookBuilder(MigrationHookBuilder()).add(TestMigrationHookBuilderLifetimeTests.SubHookImplementation).build().get_hooks(ISyncMigrationHook[bool])
-        
-            assert len(hookFactory) == 1
-
-            # Act
-            try:
-                scope1 = ServiceProviderServiceExtensions.CreateScope(provider)
-                firstScopeHook1 = hookFactory[0].Create[IMigrationHook[bool]](scope1.ServiceProvider)
-                firstScopeHook2 = hookFactory[0].Create[IMigrationHook[bool]](scope1.ServiceProvider)
-            finally:
-                scope1.Dispose()
-
-            try:
-                scope2 = ServiceProviderServiceExtensions.CreateScope(provider)
-                lastScopeHook = hookFactory[0].Create[IMigrationHook[bool]](scope2.ServiceProvider)
-            finally:
-                scope2.Dispose()
-
-            # Assert
-            assert firstScopeHook1 == firstScopeHook2
-            assert firstScopeHook1 is not firstScopeHook2
-            assert firstScopeHook1 == lastScopeHook
-            assert firstScopeHook1 is not lastScopeHook
-        finally:
-            provider.Dispose()
-
-    def test_lifetime_buildandcreate_noinitializerscoped(self, skip_by_python_lifetime_env_var):
-        try:
-            # Arrange
-            servicecollection = ServiceCollection()
-            ServiceCollectionServiceExtensions.AddScoped[TestMigrationHookBuilderLifetimeTests.SubHookImplementation](servicecollection)
-            provider = ServiceCollectionContainerBuilderExtensions.BuildServiceProvider(servicecollection)
-            hookFactory = PyMigrationHookBuilder(MigrationHookBuilder()).add(TestMigrationHookBuilderLifetimeTests.SubHookImplementation).build().get_hooks(ISyncMigrationHook[bool])
-        
-            assert len(hookFactory) == 1
-
-            # Act
-            try:
-                scope1 = ServiceProviderServiceExtensions.CreateScope(provider)
-                firstScopeHook1 = hookFactory[0].Create[IMigrationHook[bool]](scope1.ServiceProvider)
-                firstScopeHook2 = hookFactory[0].Create[IMigrationHook[bool]](scope1.ServiceProvider)
-            finally:
-                scope1.Dispose()
-
-            try:
-                scope2 = ServiceProviderServiceExtensions.CreateScope(provider)
-                lastScopeHook = hookFactory[0].Create[IMigrationHook[bool]](scope2.ServiceProvider)
-            finally:
-                scope2.Dispose()
-
-            # Assert
-            assert firstScopeHook1 == firstScopeHook2
-            assert firstScopeHook1 is not firstScopeHook2
-            assert firstScopeHook1 != lastScopeHook
-        finally:
-            provider.Dispose()
-
-    def test_lifetime_buildandcreate_noinitializertransient(self, skip_by_python_lifetime_env_var):
-        try:
-            # Arrange
-            servicecollection = ServiceCollection()
-            ServiceCollectionServiceExtensions.AddTransient[TestMigrationHookBuilderLifetimeTests.SubHookImplementation](servicecollection)
-            provider = ServiceCollectionContainerBuilderExtensions.BuildServiceProvider(servicecollection)
-            hookFactory = PyMigrationHookBuilder(MigrationHookBuilder()).add(TestMigrationHookBuilderLifetimeTests.SubHookImplementation).build().get_hooks(ISyncMigrationHook[bool])
-        
-            assert len(hookFactory) == 1
-
-            # Act
-            try:
-                scope1 = ServiceProviderServiceExtensions.CreateScope(provider)
-                firstScopeHook1 = hookFactory[0].Create[IMigrationHook[bool]](scope1.ServiceProvider)
-                firstScopeHook2 = hookFactory[0].Create[IMigrationHook[bool]](scope1.ServiceProvider)
-            finally:
-                scope1.Dispose()
-
-            try:
-                scope2 = ServiceProviderServiceExtensions.CreateScope(provider)
-                lastScopeHook = hookFactory[0].Create[IMigrationHook[bool]](scope2.ServiceProvider)
-            finally:
-                scope2.Dispose()
-
-            # Assert
-            assert firstScopeHook1 != firstScopeHook2
-            assert firstScopeHook1 != lastScopeHook
-        finally:
-            provider.Dispose()
-        
-
-    def test_lifetime_buildandcreate_initializerobjectreference(self, skip_by_python_lifetime_env_var):
-        try:
-            # Arrange
-            hook = TestMigrationHookBuilderLifetimeTests.SubSubHookImplementation()
-            def subsubclassinitialize(provider: IServiceProvider):
-                return hook
-            provider = ServiceCollectionContainerBuilderExtensions.BuildServiceProvider(ServiceCollection())
-            hookFactory = PyMigrationHookBuilder(MigrationHookBuilder()).add(TestMigrationHookBuilderLifetimeTests.SubSubHookImplementation, Func[IServiceProvider, TestMigrationHookBuilderLifetimeTests.SubSubHookImplementation](subsubclassinitialize)).build().get_hooks(ISyncMigrationHook[bool])
-        
-            assert len(hookFactory) == 1
-
-            # Act
-            try:
-                scope1 = ServiceProviderServiceExtensions.CreateScope(provider)
-                firstScopeHook1 = hookFactory[0].Create[IMigrationHook[bool]](scope1.ServiceProvider)
-                firstScopeHook2 = hookFactory[0].Create[IMigrationHook[bool]](scope1.ServiceProvider)
-            finally:
-                scope1.Dispose()
-
-            try:
-                scope2 = ServiceProviderServiceExtensions.CreateScope(provider)
-                lastScopeHook = hookFactory[0].Create[IMigrationHook[bool]](scope2.ServiceProvider)
-            finally:
-                scope2.Dispose()
-
-            # Assert
-            assert firstScopeHook1 == firstScopeHook2
-            assert firstScopeHook1 is not firstScopeHook2
-            assert firstScopeHook1 == lastScopeHook
-            assert firstScopeHook1 is not lastScopeHook
-        finally:
-            provider.Dispose()
-
-    def test_lifetime_buildandcreate_initializernewobject(self, skip_by_python_lifetime_env_var):
-        try:
-            # Arrange
-            def subsubclassinitialize(provider: IServiceProvider):
-                return TestMigrationHookBuilderLifetimeTests.SubSubHookImplementation()
-            provider = ServiceCollectionContainerBuilderExtensions.BuildServiceProvider(ServiceCollection())
-            hookFactory = PyMigrationHookBuilder(MigrationHookBuilder()).add(TestMigrationHookBuilderLifetimeTests.SubSubHookImplementation, Func[IServiceProvider, TestMigrationHookBuilderLifetimeTests.SubSubHookImplementation](subsubclassinitialize)).build().get_hooks(ISyncMigrationHook[bool])
-        
-            assert len(hookFactory) == 1
-
-            # Act
-            try:
-                scope1 = ServiceProviderServiceExtensions.CreateScope(provider)
-                firstScopeHook1 = hookFactory[0].Create[IMigrationHook[bool]](scope1.ServiceProvider)
-                firstScopeHook2 = hookFactory[0].Create[IMigrationHook[bool]](scope1.ServiceProvider)
-            finally:
-                scope1.Dispose()
-
-            try:
-                scope2 = ServiceProviderServiceExtensions.CreateScope(provider)
-                lastScopeHook = hookFactory[0].Create[IMigrationHook[bool]](scope2.ServiceProvider)
-            finally:
-                scope2.Dispose()
-
-            # Assert
-            assert firstScopeHook1 != firstScopeHook2
-            assert firstScopeHook1 != lastScopeHook
-        finally:
-            provider.Dispose()
-
-    def test_lifetime_buildandcreate_initializersingleton(self, skip_by_python_lifetime_env_var):
-        try:
-            # Arrange
-            def subsubclassinitialize(provider: IServiceProvider):
-                return get_service(provider,TestMigrationHookBuilderLifetimeTests.SubSubHookImplementation)
-            servicecollection = ServiceCollection()
-            ServiceCollectionServiceExtensions.AddSingleton[TestMigrationHookBuilderLifetimeTests.SubSubHookImplementation](servicecollection)
-            provider = ServiceCollectionContainerBuilderExtensions.BuildServiceProvider(servicecollection)
-            hookFactory = PyMigrationHookBuilder(MigrationHookBuilder()).add(TestMigrationHookBuilderLifetimeTests.SubSubHookImplementation, Func[IServiceProvider, TestMigrationHookBuilderLifetimeTests.SubSubHookImplementation](subsubclassinitialize)).build().get_hooks(ISyncMigrationHook[bool])
-        
-            assert len(hookFactory) == 1
-
-            # Act
-            try:
-                scope1 = ServiceProviderServiceExtensions.CreateScope(provider)
-                firstScopeHook1 = hookFactory[0].Create[IMigrationHook[bool]](scope1.ServiceProvider)
-                firstScopeHook2 = hookFactory[0].Create[IMigrationHook[bool]](scope1.ServiceProvider)
-            finally:
-                scope1.Dispose()
-
-            try:
-                scope2 = ServiceProviderServiceExtensions.CreateScope(provider)
-                lastScopeHook = hookFactory[0].Create[IMigrationHook[bool]](scope2.ServiceProvider)
-            finally:
-                scope2.Dispose()
-
-            # Assert
-            assert firstScopeHook1 == firstScopeHook2
-            assert firstScopeHook1 is not firstScopeHook2
-            assert firstScopeHook1 == lastScopeHook
-            assert firstScopeHook1 is not lastScopeHook
-        finally:
-            provider.Dispose()
-
-    def test_lifetime_buildandcreate_initializerscoped(self, skip_by_python_lifetime_env_var):
-        try:
-            # Arrange
-            def subsubclassinitialize(provider: IServiceProvider):
-                return get_service(provider,TestMigrationHookBuilderLifetimeTests.SubSubHookImplementation)
-            servicecollection = ServiceCollection()
-            ServiceCollectionServiceExtensions.AddScoped[TestMigrationHookBuilderLifetimeTests.SubSubHookImplementation](servicecollection)
-            provider = ServiceCollectionContainerBuilderExtensions.BuildServiceProvider(servicecollection)
-            hookFactory = PyMigrationHookBuilder(MigrationHookBuilder()).add(TestMigrationHookBuilderLifetimeTests.SubSubHookImplementation, Func[IServiceProvider, TestMigrationHookBuilderLifetimeTests.SubSubHookImplementation](subsubclassinitialize)).build().get_hooks(ISyncMigrationHook[bool])
-        
-            assert len(hookFactory) == 1
-
-            # Act
-            try:
-                scope1 = ServiceProviderServiceExtensions.CreateScope(provider)
-                firstScopeHook1 = hookFactory[0].Create[IMigrationHook[bool]](scope1.ServiceProvider)
-                firstScopeHook2 = hookFactory[0].Create[IMigrationHook[bool]](scope1.ServiceProvider)
-            finally:
-                scope1.Dispose()
-
-            try:
-                scope2 = ServiceProviderServiceExtensions.CreateScope(provider)
-                lastScopeHook = hookFactory[0].Create[IMigrationHook[bool]](scope2.ServiceProvider)
-            finally:
-                scope2.Dispose()
-
-            # Assert
-            assert firstScopeHook1 == firstScopeHook2
-            assert firstScopeHook1 is not firstScopeHook2
-            assert firstScopeHook1 != lastScopeHook
-        finally:
-            provider.Dispose()    
-
-    def test_lifetime_buildandcreate_initializertransient(self, skip_by_python_lifetime_env_var):
-        try:
-            # Arrange
-            def subsubclassinitialize(provider: IServiceProvider):
-                return get_service(provider,TestMigrationHookBuilderLifetimeTests.SubSubHookImplementation)
-            servicecollection = ServiceCollection()
-            ServiceCollectionServiceExtensions.AddTransient[TestMigrationHookBuilderLifetimeTests.SubSubHookImplementation](servicecollection)
-            provider = ServiceCollectionContainerBuilderExtensions.BuildServiceProvider(servicecollection)
-            hookFactory = PyMigrationHookBuilder(MigrationHookBuilder()).add(TestMigrationHookBuilderLifetimeTests.SubSubHookImplementation, Func[IServiceProvider, TestMigrationHookBuilderLifetimeTests.SubSubHookImplementation](subsubclassinitialize)).build().get_hooks(ISyncMigrationHook[bool])
-        
-            assert len(hookFactory) == 1
-
-            # Act
-            try:
-                scope1 = ServiceProviderServiceExtensions.CreateScope(provider)
-                firstScopeHook1 = hookFactory[0].Create[IMigrationHook[bool]](scope1.ServiceProvider)
-                firstScopeHook2 = hookFactory[0].Create[IMigrationHook[bool]](scope1.ServiceProvider)
-            finally:
-                scope1.Dispose()
-
-            try:
-                scope2 = ServiceProviderServiceExtensions.CreateScope(provider)
-                lastScopeHook = hookFactory[0].Create[IMigrationHook[bool]](scope2.ServiceProvider)
-            finally:
-                scope2.Dispose()
-
-            # Assert
-            assert firstScopeHook1 != firstScopeHook2
-            assert firstScopeHook1 != lastScopeHook
-        finally:
-            provider.Dispose()
-
-    def test_lifetime_buildandcreate_callback(self, skip_by_python_lifetime_env_var):
-        try:
-            # Arrange
-            def classcallback(context: str):
-                return context
-        
-            provider = ServiceCollectionContainerBuilderExtensions.BuildServiceProvider(ServiceCollection())
-            hookFactory = PyMigrationHookBuilder(MigrationHookBuilder()).add(ISyncMigrationHook[str], str, Func[str, str](classcallback)).build().get_hooks(ISyncMigrationHook[str])
-        
-            assert len(hookFactory) == 1
-
-            # Act
-            try:
-                scope1 = ServiceProviderServiceExtensions.CreateScope(provider)
-                firstScopeHook1 = hookFactory[0].Create[IMigrationHook[str]](scope1.ServiceProvider)
-                firstScopeHook2 = hookFactory[0].Create[IMigrationHook[str]](scope1.ServiceProvider)
-            finally:
-                scope1.Dispose()
-
-            try:
-                scope2 = ServiceProviderServiceExtensions.CreateScope(provider)
-                lastScopeHook = hookFactory[0].Create[IMigrationHook[str]](scope2.ServiceProvider)
-            finally:
-                scope2.Dispose()
-
-            # Assert
-            assert firstScopeHook1 != firstScopeHook2
-            assert firstScopeHook1 != lastScopeHook
-        finally:
-            provider.Dispose()
diff --git a/src/Python/tests/test_migrations_engine_hooks_mappings.py b/src/Python/tests/test_migrations_engine_hooks_mappings.py
deleted file mode 100644
index 26cd620..0000000
--- a/src/Python/tests/test_migrations_engine_hooks_mappings.py
+++ /dev/null
@@ -1,188 +0,0 @@
-# Copyright (c) 2024, Salesforce, Inc.
-# SPDX-License-Identifier: Apache-2
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Make sure the test can find the module
-from tableau_migration.migration import get_service
-from tableau_migration.migration_engine_hooks_mappings import PyContentMappingBuilder
-from System import IServiceProvider, Func, ArgumentException
-from Tableau.Migration.Content import IUser, IProject
-from Tableau.Migration.Engine.Hooks import IMigrationHook
-from Tableau.Migration.Engine.Hooks.Mappings import ContentMappingBuilder, IContentMapping, ContentMappingBase, ContentMappingContext
-from Tableau.Migration.Interop.Hooks.Mappings import ISyncContentMapping
-
-class ClassImplementation(ISyncContentMapping[IUser]):
-    __namespace__ = "Tableau.Migration.Custom.Hooks.Mappings"
-    
-    def Execute(self, ctx: ContentMappingContext[IUser]) -> ContentMappingContext[IUser]:
-        return ctx
-
-class SubClassImplementation(ClassImplementation):
-    __namespace__ = "Tableau.Migration.Custom.Hooks.Mappings"
-    
-    def Execute(self, ctx: ContentMappingContext[IUser]) -> ContentMappingContext[IUser]:
-        return ctx
-
-class RawHook(ContentMappingBase[IProject]):
-    __namespace__ = "Tableau.Migration.Custom.Hooks.Mappings"
-    
-    def ShouldMigrate(self, ctx) -> bool:
-        return True
-
-class TestContentMappingBuilderTests():
-    def test_clear_class_hook(self):
-        hook_builder = PyContentMappingBuilder(ContentMappingBuilder())
-        
-        result = hook_builder.add(IUser,ClassImplementation()).clear()
-        
-        assert result is hook_builder
-        assert len(result.build().get_hooks(ISyncContentMapping[IUser])) == 0
-        
-    def test_clear_subclass_hook(self):
-        hook_builder = PyContentMappingBuilder(ContentMappingBuilder())
-        
-        result = hook_builder.add(IUser,SubClassImplementation()).clear()
-        
-        assert result is hook_builder
-        assert len(result.build().get_hooks(ISyncContentMapping[IUser])) == 0
-        
-    def test_add_object(self):
-        hook_builder = PyContentMappingBuilder(ContentMappingBuilder())
-        
-        result = hook_builder.add(IUser,SubClassImplementation())
-        
-        assert result is hook_builder
-        
-    def test_add_type_noinitializer(self):
-        hook_builder = PyContentMappingBuilder(ContentMappingBuilder())
-        
-        result = hook_builder.add(ClassImplementation,IUser)
-        
-        assert result is hook_builder
-        
-    def test_add_type_initializer(self):
-        hook_builder = PyContentMappingBuilder(ContentMappingBuilder())
-        
-        def subclassinitialize(provider: IServiceProvider):
-            return get_service(provider, SubClassImplementation)
-        
-        result = hook_builder.add(SubClassImplementation, IUser, Func[IServiceProvider, SubClassImplementation](subclassinitialize))
-        
-        assert result is hook_builder
-        
-    def test_add_callback(self):
-        hook_builder = PyContentMappingBuilder(ContentMappingBuilder())
-        
-        def classcallback(context: ContentMappingContext[IProject]):
-            return context
-        
-        result = hook_builder.add(IProject, Func[ContentMappingContext[IProject], ContentMappingContext[IProject]](classcallback))
-        
-        assert result is hook_builder
-        
-    def test_build_detects_interface_from_concrete_class(self):
-        collection = PyContentMappingBuilder(ContentMappingBuilder()).add(IUser,ClassImplementation()).build()
-        hooks = collection.get_hooks(IContentMapping[IUser])
-        internalhooks = collection.get_hooks(IMigrationHook[ContentMappingContext[IUser]])
-        otherhooks = collection.get_hooks(IContentMapping[IProject])
-        classhooks = collection.get_hooks(ClassImplementation)
-        subclasshooks = collection.get_hooks(SubClassImplementation)
-        
-        # Can't do a direct object comparison, so let's just count the right number is returned
-        assert len(hooks) == 1
-        assert len(internalhooks) == 0
-        assert len(otherhooks) == 0
-        assert len(classhooks) == 0
-        assert len(subclasshooks) == 0
-        
-    def test_build_detects_interface_from_concrete_subclass(self):
-        collection = PyContentMappingBuilder(ContentMappingBuilder()).add(IUser,SubClassImplementation()).build()
-        hooks = collection.get_hooks(IContentMapping[IUser])
-        internalhooks = collection.get_hooks(IMigrationHook[ContentMappingContext[IUser]])
-        otherhooks = collection.get_hooks(IContentMapping[IProject])
-        classhooks = collection.get_hooks(ClassImplementation)
-        subclasshooks = collection.get_hooks(SubClassImplementation)
-
-        # Can't do a direct object comparison, so let's just count the right number is returned
-        assert len(hooks) == 1
-        assert len(internalhooks) == 0
-        assert len(otherhooks) == 0
-        assert len(classhooks) == 0
-        assert len(subclasshooks) == 0
-        
-    def test_build_factory_class(self):
-        collection = PyContentMappingBuilder(ContentMappingBuilder()).add(ClassImplementation,IUser).build()
-        hooks = collection.get_hooks(IContentMapping[IUser])
-        internalhooks = collection.get_hooks(IMigrationHook[ContentMappingContext[IUser]])
-        otherhooks = collection.get_hooks(IContentMapping[IProject])
-        classhooks = collection.get_hooks(ClassImplementation)
-        subclasshooks = collection.get_hooks(SubClassImplementation)
-
-        # Can't do a direct object comparison, so let's just count the right number is returned
-        assert len(hooks) == 1
-        assert len(internalhooks) == 0
-        assert len(otherhooks) == 0
-        assert len(classhooks) == 0
-        assert len(subclasshooks) == 0
-        
-    def test_build_factory_subclass_withinitializer(self):
-        def subclassinitialize(provider: IServiceProvider):
-            return get_service(provider, SubClassImplementation)
-        
-        collection = PyContentMappingBuilder(ContentMappingBuilder()).add(SubClassImplementation, IUser, Func[IServiceProvider, SubClassImplementation](subclassinitialize)).build()
-        hooks = collection.get_hooks(IContentMapping[IUser])
-        internalhooks = collection.get_hooks(IMigrationHook[ContentMappingContext[IUser]])
-        otherhooks = collection.get_hooks(IContentMapping[IProject])
-        classhooks = collection.get_hooks(ClassImplementation)
-        subclasshooks = collection.get_hooks(SubClassImplementation)
-
-        # Can't do a direct object comparison, so let's just count the right number is returned
-        assert len(hooks) == 1
-        assert len(internalhooks) == 0
-        assert len(otherhooks) == 0
-        assert len(classhooks) == 0
-        assert len(subclasshooks) == 0
-        
-    def test_build_factory_multipleclasses(self):
-        collection = PyContentMappingBuilder(ContentMappingBuilder()).add(ClassImplementation,IUser).add(SubClassImplementation,IUser).build()
-        hooks = collection.get_hooks(IContentMapping[IUser])
-        internalhooks = collection.get_hooks(IMigrationHook[ContentMappingContext[IUser]])
-        otherhooks = collection.get_hooks(IContentMapping[IProject])
-        classhooks = collection.get_hooks(ClassImplementation)
-        subclasshooks = collection.get_hooks(SubClassImplementation)
-
-        # Can't do a direct object comparison, so let's just count the right number is returned
-        assert len(hooks) == 2
-        assert len(internalhooks) == 0
-        assert len(otherhooks) == 0
-        assert len(classhooks) == 0
-        assert len(subclasshooks) == 0
-        
-    def test_build_callback(self):
-        def classcallback(context: ContentMappingContext[IProject]):
-            return context
-        
-        collection = PyContentMappingBuilder(ContentMappingBuilder()).add(IProject, Func[ContentMappingContext[IProject], ContentMappingContext[IProject]](classcallback)).build()
-        hooks = collection.get_hooks(IContentMapping[IProject])
-        internalhooks = collection.get_hooks(IMigrationHook[ContentMappingContext[IProject]])
-        otherhooks = collection.get_hooks(IContentMapping[IUser])
-        classhooks = collection.get_hooks(ClassImplementation)
-        subclasshooks = collection.get_hooks(SubClassImplementation)
-
-        # Can't do a direct object comparison, so let's just count the right number is returned
-        assert len(hooks) == 1
-        assert len(internalhooks) == 0
-        assert len(otherhooks) == 0
-        assert len(classhooks) == 0
-        assert len(subclasshooks) == 0
diff --git a/src/Python/tests/test_migrations_engine_hooks_mappings_lifetime.py b/src/Python/tests/test_migrations_engine_hooks_mappings_lifetime.py
deleted file mode 100644
index a09b5e1..0000000
--- a/src/Python/tests/test_migrations_engine_hooks_mappings_lifetime.py
+++ /dev/null
@@ -1,371 +0,0 @@
-# Copyright (c) 2024, Salesforce, Inc.
-# SPDX-License-Identifier: Apache-2
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Make sure the test can find the module
-import pytest
-from tableau_migration.migration import get_service
-from tableau_migration.migration_engine_hooks_mappings import PyContentMappingBuilder
-from System import IServiceProvider, Func
-from Microsoft.Extensions.DependencyInjection import (
-    ServiceProviderServiceExtensions,
-    ServiceCollectionServiceExtensions,
-    ServiceCollection,
-    ServiceCollectionContainerBuilderExtensions)
-from Tableau.Migration.Content import IUser,IProject
-from Tableau.Migration.Engine.Hooks import IMigrationHook
-from Tableau.Migration.Engine.Hooks.Mappings import ContentMappingBuilder, IContentMapping, ContentMappingContext
-from Tableau.Migration.Interop.Hooks.Mappings import ISyncContentMapping
-
-class MappingImplementation(ISyncContentMapping[IUser]):
-    __namespace__ = "Tableau.Migration.Custom.Hooks.Mappings.Lifetime"
-    
-    def Execute(self, ctx: ContentMappingContext[IUser]) -> ContentMappingContext[IUser]:
-        return ctx
-
-class SubMappingImplementation(MappingImplementation):
-    __namespace__ = "Tableau.Migration.Custom.Hooks.Mappings.Lifetime"
-    
-    def Execute(self, ctx: ContentMappingContext[IUser]) -> ContentMappingContext[IUser]:
-        return ctx
-
-class TestContentMappingBuilderLifetimeTests():
-    @pytest.fixture(autouse=True, scope="class")
-    def setup(self):
-        TestContentMappingBuilderLifetimeTests.MappingImplementation = MappingImplementation
-        TestContentMappingBuilderLifetimeTests.SubMappingImplementation = SubMappingImplementation
-            
-        yield
-        
-        del TestContentMappingBuilderLifetimeTests.SubMappingImplementation
-        del TestContentMappingBuilderLifetimeTests.MappingImplementation
-        
-    def test_lifetime_buildandcreate_object(self, skip_by_python_lifetime_env_var):
-        try:
-            # Arrange
-            provider = ServiceCollectionContainerBuilderExtensions.BuildServiceProvider(ServiceCollection())
-            hook = TestContentMappingBuilderLifetimeTests.SubMappingImplementation()
-            hookFactory = PyContentMappingBuilder(ContentMappingBuilder()).add(IUser,hook).build().get_hooks(IContentMapping[IUser])
-        
-            assert len(hookFactory) == 1
-
-            # Act
-            try:
-                scope1 = ServiceProviderServiceExtensions.CreateScope(provider)
-                firstScopeHook1 = hookFactory[0].Create[IContentMapping[IUser]](scope1.ServiceProvider)
-                firstScopeHook2 = hookFactory[0].Create[IContentMapping[IUser]](scope1.ServiceProvider)
-            finally:
-                scope1.Dispose()
-
-            try:
-                scope2 = ServiceProviderServiceExtensions.CreateScope(provider)
-                lastScopeHook = hookFactory[0].Create[IContentMapping[IUser]](scope2.ServiceProvider)
-            finally:
-                scope2.Dispose()
-
-            # Assert
-            assert hook == firstScopeHook1
-            assert hook is not firstScopeHook1
-            assert hook == firstScopeHook2
-            assert hook is not firstScopeHook2
-            assert hook == lastScopeHook
-            assert hook is not lastScopeHook
-        finally:
-            provider.Dispose()
-
-    def test_lifetime_buildandcreate_noinitializersingleton(self, skip_by_python_lifetime_env_var):
-        try:
-            # Arrange
-            servicecollection = ServiceCollection()
-            ServiceCollectionServiceExtensions.AddSingleton[TestContentMappingBuilderLifetimeTests.SubMappingImplementation](servicecollection)
-            provider = ServiceCollectionContainerBuilderExtensions.BuildServiceProvider(servicecollection)
-            hookFactory = PyContentMappingBuilder(ContentMappingBuilder()).add(TestContentMappingBuilderLifetimeTests.SubMappingImplementation,IUser).build().get_hooks(IContentMapping[IUser])
-        
-            assert len(hookFactory) == 1
-
-            # Act
-            try:
-                scope1 = ServiceProviderServiceExtensions.CreateScope(provider)
-                firstScopeHook1 = hookFactory[0].Create[IContentMapping[IUser]](scope1.ServiceProvider)
-                firstScopeHook2 = hookFactory[0].Create[IContentMapping[IUser]](scope1.ServiceProvider)
-            finally:
-                scope1.Dispose()
-
-            try:
-                scope2 = ServiceProviderServiceExtensions.CreateScope(provider)
-                lastScopeHook = hookFactory[0].Create[IContentMapping[IUser]](scope2.ServiceProvider)
-            finally:
-                scope2.Dispose()
-
-            # Assert
-            assert firstScopeHook1 == firstScopeHook2
-            assert firstScopeHook1 is not firstScopeHook2
-            assert firstScopeHook1 == lastScopeHook
-            assert firstScopeHook1 is not lastScopeHook
-        finally:
-            provider.Dispose()
-
-    def test_lifetime_buildandcreate_noinitializerscoped(self, skip_by_python_lifetime_env_var):
-        try:
-            # Arrange
-            servicecollection = ServiceCollection()
-            ServiceCollectionServiceExtensions.AddScoped[TestContentMappingBuilderLifetimeTests.SubMappingImplementation](servicecollection)
-            provider = ServiceCollectionContainerBuilderExtensions.BuildServiceProvider(servicecollection)
-            hookFactory = PyContentMappingBuilder(ContentMappingBuilder()).add(TestContentMappingBuilderLifetimeTests.SubMappingImplementation,IUser).build().get_hooks(IContentMapping[IUser])
-        
-            assert len(hookFactory) == 1
-
-            # Act
-            try:
-                scope1 = ServiceProviderServiceExtensions.CreateScope(provider)
-                firstScopeHook1 = hookFactory[0].Create[IContentMapping[IUser]](scope1.ServiceProvider)
-                firstScopeHook2 = hookFactory[0].Create[IContentMapping[IUser]](scope1.ServiceProvider)
-            finally:
-                scope1.Dispose()
-
-            try:
-                scope2 = ServiceProviderServiceExtensions.CreateScope(provider)
-                lastScopeHook = hookFactory[0].Create[IContentMapping[IUser]](scope2.ServiceProvider)
-            finally:
-                scope2.Dispose()
-
-            # Assert
-            assert firstScopeHook1 == firstScopeHook2
-            assert firstScopeHook1 is not firstScopeHook2
-            assert firstScopeHook1 != lastScopeHook
-        finally:
-            provider.Dispose()
-
-    def test_lifetime_buildandcreate_noinitializertransient(self, skip_by_python_lifetime_env_var):
-        try:
-            # Arrange
-            servicecollection = ServiceCollection()
-            ServiceCollectionServiceExtensions.AddTransient[TestContentMappingBuilderLifetimeTests.SubMappingImplementation](servicecollection)
-            provider = ServiceCollectionContainerBuilderExtensions.BuildServiceProvider(servicecollection)
-            hookFactory = PyContentMappingBuilder(ContentMappingBuilder()).add(TestContentMappingBuilderLifetimeTests.SubMappingImplementation,IUser).build().get_hooks(IContentMapping[IUser])
-        
-            assert len(hookFactory) == 1
-
-            # Act
-            try:
-                scope1 = ServiceProviderServiceExtensions.CreateScope(provider)
-                firstScopeHook1 = hookFactory[0].Create[IContentMapping[IUser]](scope1.ServiceProvider)
-                firstScopeHook2 = hookFactory[0].Create[IContentMapping[IUser]](scope1.ServiceProvider)
-            finally:
-                scope1.Dispose()
-
-            try:
-                scope2 = ServiceProviderServiceExtensions.CreateScope(provider)
-                lastScopeHook = hookFactory[0].Create[IContentMapping[IUser]](scope2.ServiceProvider)
-            finally:
-                scope2.Dispose()
-
-            # Assert
-            assert firstScopeHook1 != firstScopeHook2
-            assert firstScopeHook1 != lastScopeHook
-        finally:
-            provider.Dispose()
-
-    def test_lifetime_buildandcreate_initializerobjectreference(self, skip_by_python_lifetime_env_var):
-        try:
-            # Arrange
-            hook = TestContentMappingBuilderLifetimeTests.SubMappingImplementation()
-            def subsubclassinitialize(provider: IServiceProvider):
-                return hook
-            provider = ServiceCollectionContainerBuilderExtensions.BuildServiceProvider(ServiceCollection())
-            hookFactory = PyContentMappingBuilder(ContentMappingBuilder()).add(TestContentMappingBuilderLifetimeTests.SubMappingImplementation, IUser, Func[IServiceProvider, TestContentMappingBuilderLifetimeTests.SubMappingImplementation](subsubclassinitialize)).build().get_hooks(IContentMapping[IUser])
-        
-            assert len(hookFactory) == 1
-
-            # Act
-            try:
-                scope1 = ServiceProviderServiceExtensions.CreateScope(provider)
-                firstScopeHook1 = hookFactory[0].Create[IContentMapping[IUser]](scope1.ServiceProvider)
-                firstScopeHook2 = hookFactory[0].Create[IContentMapping[IUser]](scope1.ServiceProvider)
-            finally:
-                scope1.Dispose()
-
-            try:
-                scope2 = ServiceProviderServiceExtensions.CreateScope(provider)
-                lastScopeHook = hookFactory[0].Create[IContentMapping[IUser]](scope2.ServiceProvider)
-            finally:
-                scope2.Dispose()
-
-            # Assert
-            assert firstScopeHook1 == firstScopeHook2
-            assert firstScopeHook1 is not firstScopeHook2
-            assert firstScopeHook1 == lastScopeHook
-            assert firstScopeHook1 is not lastScopeHook
-        finally:
-            provider.Dispose()
-
-    def test_lifetime_buildandcreate_initializernewobject(self, skip_by_python_lifetime_env_var):
-        try:
-            # Arrange
-            def subsubclassinitialize(provider: IServiceProvider):
-                return TestContentMappingBuilderLifetimeTests.SubMappingImplementation()
-            provider = ServiceCollectionContainerBuilderExtensions.BuildServiceProvider(ServiceCollection())
-            hookFactory = PyContentMappingBuilder(ContentMappingBuilder()).add(TestContentMappingBuilderLifetimeTests.SubMappingImplementation, IUser, Func[IServiceProvider, TestContentMappingBuilderLifetimeTests.SubMappingImplementation](subsubclassinitialize)).build().get_hooks(IContentMapping[IUser])
-        
-            assert len(hookFactory) == 1
-
-            # Act
-            try:
-                scope1 = ServiceProviderServiceExtensions.CreateScope(provider)
-                firstScopeHook1 = hookFactory[0].Create[IContentMapping[IUser]](scope1.ServiceProvider)
-                firstScopeHook2 = hookFactory[0].Create[IContentMapping[IUser]](scope1.ServiceProvider)
-            finally:
-                scope1.Dispose()
-
-            try:
-                scope2 = ServiceProviderServiceExtensions.CreateScope(provider)
-                lastScopeHook = hookFactory[0].Create[IContentMapping[IUser]](scope2.ServiceProvider)
-            finally:
-                scope2.Dispose()
-
-            # Assert
-            assert firstScopeHook1 != firstScopeHook2
-            assert firstScopeHook1 != lastScopeHook
-        finally:
-            provider.Dispose()
-
-    def test_lifetime_buildandcreate_initializersingleton(self, skip_by_python_lifetime_env_var):
-        try:
-            # Arrange
-            def subsubclassinitialize(provider: IServiceProvider):
-                return get_service(provider,TestContentMappingBuilderLifetimeTests.SubMappingImplementation)
-            servicecollection = ServiceCollection()
-            ServiceCollectionServiceExtensions.AddSingleton[TestContentMappingBuilderLifetimeTests.SubMappingImplementation](servicecollection)
-            provider = ServiceCollectionContainerBuilderExtensions.BuildServiceProvider(servicecollection)
-            hookFactory = PyContentMappingBuilder(ContentMappingBuilder()).add(TestContentMappingBuilderLifetimeTests.SubMappingImplementation, IUser, Func[IServiceProvider, TestContentMappingBuilderLifetimeTests.SubMappingImplementation](subsubclassinitialize)).build().get_hooks(IContentMapping[IUser])
-        
-            assert len(hookFactory) == 1
-
-            # Act
-            try:
-                scope1 = ServiceProviderServiceExtensions.CreateScope(provider)
-                firstScopeHook1 = hookFactory[0].Create[IContentMapping[IUser]](scope1.ServiceProvider)
-                firstScopeHook2 = hookFactory[0].Create[IContentMapping[IUser]](scope1.ServiceProvider)
-            finally:
-                scope1.Dispose()
-
-            try:
-                scope2 = ServiceProviderServiceExtensions.CreateScope(provider)
-                lastScopeHook = hookFactory[0].Create[IContentMapping[IUser]](scope2.ServiceProvider)
-            finally:
-                scope2.Dispose()
-
-            # Assert
-            assert firstScopeHook1 == firstScopeHook2
-            assert firstScopeHook1 is not firstScopeHook2
-            assert firstScopeHook1 == lastScopeHook
-            assert firstScopeHook1 is not lastScopeHook
-        finally:
-            provider.Dispose()
-
-    def test_lifetime_buildandcreate_initializerscoped(self, skip_by_python_lifetime_env_var):
-        try:
-            # Arrange
-            def classinitialize(provider: IServiceProvider):
-                return get_service(provider,TestContentMappingBuilderLifetimeTests.MappingImplementation)
-            servicecollection = ServiceCollection()
-            ServiceCollectionServiceExtensions.AddScoped[TestContentMappingBuilderLifetimeTests.MappingImplementation](servicecollection)
-            provider = ServiceCollectionContainerBuilderExtensions.BuildServiceProvider(servicecollection)
-            hookFactory = PyContentMappingBuilder(ContentMappingBuilder()).add(TestContentMappingBuilderLifetimeTests.MappingImplementation, IUser, Func[IServiceProvider, TestContentMappingBuilderLifetimeTests.MappingImplementation](classinitialize)).build().get_hooks(IContentMapping[IUser])
-        
-            assert len(hookFactory) == 1
-
-            # Act
-            try:
-                scope1 = ServiceProviderServiceExtensions.CreateScope(provider)
-                firstScopeHook1 = hookFactory[0].Create[IContentMapping[IUser]](scope1.ServiceProvider)
-                firstScopeHook2 = hookFactory[0].Create[IContentMapping[IUser]](scope1.ServiceProvider)
-            finally:
-                scope1.Dispose()
-
-            try:
-                scope2 = ServiceProviderServiceExtensions.CreateScope(provider)
-                lastScopeHook = hookFactory[0].Create[IContentMapping[IUser]](scope2.ServiceProvider)
-            finally:
-                scope2.Dispose()
-
-            # Assert
-            assert firstScopeHook1 == firstScopeHook2
-            assert firstScopeHook1 is not firstScopeHook2
-            assert firstScopeHook1 != lastScopeHook
-        finally:
-            provider.Dispose()
-
-    def test_lifetime_buildandcreate_initializertransient(self, skip_by_python_lifetime_env_var):
-        try:
-            # Arrange
-            def subclassinitialize(provider: IServiceProvider):
-                return get_service(provider,TestContentMappingBuilderLifetimeTests.SubMappingImplementation)
-            servicecollection = ServiceCollection()
-            ServiceCollectionServiceExtensions.AddTransient[TestContentMappingBuilderLifetimeTests.SubMappingImplementation](servicecollection)
-            provider = ServiceCollectionContainerBuilderExtensions.BuildServiceProvider(servicecollection)
-            hookFactory = PyContentMappingBuilder(ContentMappingBuilder()).add(TestContentMappingBuilderLifetimeTests.SubMappingImplementation, IUser, Func[IServiceProvider, TestContentMappingBuilderLifetimeTests.SubMappingImplementation](subclassinitialize)).build().get_hooks(IContentMapping[IUser])
-        
-            assert len(hookFactory) == 1
-
-            # Act
-            try:
-                scope1 = ServiceProviderServiceExtensions.CreateScope(provider)
-                firstScopeHook1 = hookFactory[0].Create[IContentMapping[IUser]](scope1.ServiceProvider)
-                firstScopeHook2 = hookFactory[0].Create[IContentMapping[IUser]](scope1.ServiceProvider)
-            finally:
-                scope1.Dispose()
-
-            try:
-                scope2 = ServiceProviderServiceExtensions.CreateScope(provider)
-                lastScopeHook = hookFactory[0].Create[IContentMapping[IUser]](scope2.ServiceProvider)
-            finally:
-                scope2.Dispose()
-
-            # Assert
-            assert firstScopeHook1 != firstScopeHook2
-            assert firstScopeHook1 != lastScopeHook
-        finally:
-            provider.Dispose()
-
-    def test_lifetime_buildandcreate_callback(self, skip_by_python_lifetime_env_var):
-        try:
-            # Arrange
-            def classcallback(context: ContentMappingContext[IProject]):
-                return context
-        
-            provider = ServiceCollectionContainerBuilderExtensions.BuildServiceProvider(ServiceCollection())
-            hookFactory = PyContentMappingBuilder(ContentMappingBuilder()).add(IProject, Func[ContentMappingContext[IProject], ContentMappingContext[IProject]](classcallback)).build().get_hooks(IContentMapping[IProject])
-        
-            assert len(hookFactory) == 1
-
-            # Act
-            try:
-                scope1 = ServiceProviderServiceExtensions.CreateScope(provider)
-                firstScopeHook1 = hookFactory[0].Create[IMigrationHook[ContentMappingContext[IProject]]](scope1.ServiceProvider)
-                firstScopeHook2 = hookFactory[0].Create[IMigrationHook[ContentMappingContext[IProject]]](scope1.ServiceProvider)
-            finally:
-                scope1.Dispose()
-
-            try:
-                scope2 = ServiceProviderServiceExtensions.CreateScope(provider)
-                lastScopeHook = hookFactory[0].Create[IMigrationHook[ContentMappingContext[IProject]]](scope2.ServiceProvider)
-            finally:
-                scope2.Dispose()
-
-            # Assert
-            assert firstScopeHook1 != firstScopeHook2
-            assert firstScopeHook1 != lastScopeHook
-        finally:
-            provider.Dispose()
diff --git a/src/Python/tests/test_migrations_engine_hooks_transformers.py b/src/Python/tests/test_migrations_engine_hooks_transformers.py
deleted file mode 100644
index e908235..0000000
--- a/src/Python/tests/test_migrations_engine_hooks_transformers.py
+++ /dev/null
@@ -1,258 +0,0 @@
-# Copyright (c) 2024, Salesforce, Inc.
-# SPDX-License-Identifier: Apache-2
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Make sure the test can find the module
-from tableau_migration.migration import get_service
-from tableau_migration.migration_engine_hooks_transformers import PyContentTransformerBuilder
-from System import IServiceProvider, Func, ArgumentException, NotImplementedException
-from System.Threading import CancellationToken
-from Microsoft.Extensions.DependencyInjection import (
-    ServiceCollection,
-    ServiceCollectionContainerBuilderExtensions)
-from Tableau.Migration.Content import IUser, IProject, IWorkbook
-from Tableau.Migration.Engine.Hooks import IMigrationHook
-from Tableau.Migration.Engine.Hooks.Transformers import ContentTransformerBuilder, IContentTransformer, ContentTransformerBase
-from Tableau.Migration.Interop.Hooks.Transformers import ISyncContentTransformer, ISyncXmlContentTransformer
-from Tableau.Migration.Tests import TestFileContentType as PyTestFileContentType # Needed as this class name starts with Test, which means pytest wants to pick it up
-
-class ClassImplementation(ISyncContentTransformer[IUser]):
-    __namespace__ = "Tableau.Migration.Custom.Hooks.Transformers"
-    
-    def Execute(self, ctx: IUser) -> IUser:
-        return ctx
-
-class SubClassImplementation(ClassImplementation):
-    __namespace__ = "Tableau.Migration.Custom.Hooks.Transformers"
-    
-    def Execute(self, ctx: IUser) -> IUser:
-        return ctx
-
-class RawHook(IMigrationHook[float]):
-    __namespace__ = "Tableau.Migration.Custom.Hooks.Transformers"
-
-class WithoutImplementation(ISyncContentTransformer[str]):
-    __namespace__ = "Tableau.Migration.Custom.Hooks.Transformers"
-
-class WithImplementation(ISyncContentTransformer[str]):
-    __namespace__ = "Tableau.Migration.Custom.Hooks.Transformers"
-    
-    def Execute(self, ctx: str) -> str:
-        return ctx
-    
-class TestXmlTransformer(ISyncXmlContentTransformer[PyTestFileContentType]):
-    __namespace__ = "Tableau.Migration.Custom.Hooks.Transformers"
-    __test__ = False # Needed as this class name starts with Test, which means pytest wants to pick it up 
-
-    def __init__(self):
-        self.called = False
-
-    def NeedsXmlTransforming(self, ctx: PyTestFileContentType) -> bool:
-        return True
-    
-    def Execute(self, ctx: PyTestFileContentType, xml) -> None:
-        self.called = True
-
-class TestContentTransformerBuilderTests():
-    def test_clear_class_hook(self):
-        hook_builder = PyContentTransformerBuilder(ContentTransformerBuilder())
-        
-        result = hook_builder.add(IUser,ClassImplementation()).clear()
-        
-        assert result is hook_builder
-        assert len(result.build().get_hooks(ISyncContentTransformer[IUser])) == 0
-        
-    def test_clear_subclass_hook(self):
-        hook_builder = PyContentTransformerBuilder(ContentTransformerBuilder())
-        
-        result = hook_builder.add(IUser,SubClassImplementation()).clear()
-        
-        assert result is hook_builder
-        assert len(result.build().get_hooks(ISyncContentTransformer[IUser])) == 0
-        
-    def test_add_object(self):
-        hook_builder = PyContentTransformerBuilder(ContentTransformerBuilder())
-        
-        result = hook_builder.add(IUser,SubClassImplementation())
-        
-        assert result is hook_builder
-        
-    def test_add_type_noinitializer(self):
-        hook_builder = PyContentTransformerBuilder(ContentTransformerBuilder())
-        
-        result = hook_builder.add(ClassImplementation,IUser)
-        
-        assert result is hook_builder
-        
-    def test_add_type_initializer(self):
-        hook_builder = PyContentTransformerBuilder(ContentTransformerBuilder())
-        
-        def subclassinitialize(provider: IServiceProvider):
-            return get_service(provider, SubClassImplementation)
-        
-        result = hook_builder.add(SubClassImplementation, IUser, Func[IServiceProvider, SubClassImplementation](subclassinitialize))
-        
-        assert result is hook_builder
-        
-    def test_add_callback(self):
-        hook_builder = PyContentTransformerBuilder(ContentTransformerBuilder())
-        
-        def classcallback(context: IProject):
-            return context
-        
-        result = hook_builder.add(IProject, Func[IProject, IProject](classcallback))
-        
-        assert result is hook_builder
-        
-    def test_add_withoutimplementation(self):
-        value = "testvalue";
-        provider = ServiceCollectionContainerBuilderExtensions.BuildServiceProvider(ServiceCollection())
-        hookFactory = PyContentTransformerBuilder(ContentTransformerBuilder()).add(str,WithoutImplementation()).build().get_hooks(IContentTransformer[str])
-        assert len(hookFactory) == 1
-        hook = hookFactory[0].Create[IMigrationHook[str]](provider)
-        try:
-            hook.ExecuteAsync(value, CancellationToken(False))
-        except NotImplementedException as nie:
-            assert nie.args[0] == "Python object does not have a 'Execute' method"
-        else:
-            assert False, "This test must generate a NotImplementedException."
-        finally:
-            provider.Dispose()
-        
-    def test_add_withimplementation(self):
-        value = "testvalue";
-        provider = ServiceCollectionContainerBuilderExtensions.BuildServiceProvider(ServiceCollection())
-        hookFactory = PyContentTransformerBuilder(ContentTransformerBuilder()).add(str,WithImplementation()).build().get_hooks(IContentTransformer[str])
-        assert len(hookFactory) == 1
-        hook = hookFactory[0].Create[IMigrationHook[str]](provider)
-        try:
-            result = hook.ExecuteAsync(value, CancellationToken(False))
-        except:
-            assert False, "This test must not generate an Exception."
-        finally:
-            provider.Dispose()
-        
-    def test_build_detects_interface_from_concrete_class(self):
-        collection = PyContentTransformerBuilder(ContentTransformerBuilder()).add(IUser,ClassImplementation()).build()
-        hooks = collection.get_hooks(IContentTransformer[IUser])
-        internalhooks = collection.get_hooks(IMigrationHook[IUser])
-        otherhooks = collection.get_hooks(IContentTransformer[IProject])
-        classhooks = collection.get_hooks(ClassImplementation)
-        subclasshooks = collection.get_hooks(SubClassImplementation)
-        
-        # Can't do a direct object comparison, so let's just count the right number is returned
-        assert len(hooks) == 1
-        assert len(internalhooks) == 0
-        assert len(otherhooks) == 0
-        assert len(classhooks) == 0
-        assert len(subclasshooks) == 0
-        
-    def test_build_detects_interface_from_concrete_subclass(self):
-        collection = PyContentTransformerBuilder(ContentTransformerBuilder()).add(IUser,SubClassImplementation()).build()
-        hooks = collection.get_hooks(IContentTransformer[IUser])
-        internalhooks = collection.get_hooks(IMigrationHook[IUser])
-        otherhooks = collection.get_hooks(IContentTransformer[IProject])
-        classhooks = collection.get_hooks(ClassImplementation)
-        subclasshooks = collection.get_hooks(SubClassImplementation)
-
-        # Can't do a direct object comparison, so let's just count the right number is returned
-        assert len(hooks) == 1
-        assert len(internalhooks) == 0
-        assert len(otherhooks) == 0
-        assert len(classhooks) == 0
-        assert len(subclasshooks) == 0
-        
-    def test_build_factory_class(self):
-        collection = PyContentTransformerBuilder(ContentTransformerBuilder()).add(ClassImplementation,IUser).build()
-        hooks = collection.get_hooks(IContentTransformer[IUser])
-        internalhooks = collection.get_hooks(IMigrationHook[IUser])
-        otherhooks = collection.get_hooks(IContentTransformer[IProject])
-        classhooks = collection.get_hooks(ClassImplementation)
-        subclasshooks = collection.get_hooks(SubClassImplementation)
-
-        # Can't do a direct object comparison, so let's just count the right number is returned
-        assert len(hooks) == 1
-        assert len(internalhooks) == 0
-        assert len(otherhooks) == 0
-        assert len(classhooks) == 0
-        assert len(subclasshooks) == 0
-        
-    def test_build_factory_subclass_withinitializer(self):
-        def subclassinitialize(provider: IServiceProvider):
-            return get_service(provider, SubClassImplementation)
-        
-        collection = PyContentTransformerBuilder(ContentTransformerBuilder()).add(SubClassImplementation, IUser, Func[IServiceProvider, SubClassImplementation](subclassinitialize)).build()
-        hooks = collection.get_hooks(IContentTransformer[IUser])
-        internalhooks = collection.get_hooks(IMigrationHook[IUser])
-        otherhooks = collection.get_hooks(IContentTransformer[IProject])
-        classhooks = collection.get_hooks(ClassImplementation)
-        subclasshooks = collection.get_hooks(SubClassImplementation)
-
-        # Can't do a direct object comparison, so let's just count the right number is returned
-        assert len(hooks) == 1
-        assert len(internalhooks) == 0
-        assert len(otherhooks) == 0
-        assert len(classhooks) == 0
-        assert len(subclasshooks) == 0
-        
-    def test_build_factory_multipleclasses(self):
-        collection = PyContentTransformerBuilder(ContentTransformerBuilder()).add(ClassImplementation,IUser).add(SubClassImplementation,IUser).build()
-        hooks = collection.get_hooks(IContentTransformer[IUser])
-        internalhooks = collection.get_hooks(IMigrationHook[IUser])
-        otherhooks = collection.get_hooks(IContentTransformer[IProject])
-        classhooks = collection.get_hooks(ClassImplementation)
-        subclasshooks = collection.get_hooks(SubClassImplementation)
-
-        # Can't do a direct object comparison, so let's just count the right number is returned
-        assert len(hooks) == 2
-        assert len(internalhooks) == 0
-        assert len(otherhooks) == 0
-        assert len(classhooks) == 0
-        assert len(subclasshooks) == 0
-        
-    def test_build_callback(self):
-        def classcallback(context: IProject):
-            return context
-        
-        collection = PyContentTransformerBuilder(ContentTransformerBuilder()).add(IProject, Func[IProject, IProject](classcallback)).build()
-        hooks = collection.get_hooks(IContentTransformer[IProject])
-        internalhooks = collection.get_hooks(IMigrationHook[IProject])
-        otherhooks = collection.get_hooks(IContentTransformer[IUser])
-        classhooks = collection.get_hooks(ClassImplementation)
-        subclasshooks = collection.get_hooks(SubClassImplementation)
-
-        # Can't do a direct object comparison, so let's just count the right number is returned
-        assert len(hooks) == 1
-        assert len(internalhooks) == 0
-        assert len(otherhooks) == 0
-        assert len(classhooks) == 0
-        assert len(subclasshooks) == 0
-        
-    def test_xml_execute(self):
-
-        content = PyTestFileContentType()
-
-        provider = ServiceCollectionContainerBuilderExtensions.BuildServiceProvider(ServiceCollection())
-        pyTransformer = TestXmlTransformer()
-        hookFactory = PyContentTransformerBuilder(ContentTransformerBuilder()).add(PyTestFileContentType, pyTransformer).build().get_hooks(IContentTransformer[PyTestFileContentType])
-        assert len(hookFactory) == 1
-        hook = hookFactory[0].Create[IMigrationHook[PyTestFileContentType]](provider)
-        try:
-            result = hook.ExecuteAsync(content, CancellationToken(False)).GetAwaiter().GetResult()
-        except Exception:
-            assert False, "This test must not generate an Exception."
-        finally:
-            provider.Dispose()
-        
-        assert pyTransformer.called
diff --git a/src/Python/tests/test_migrations_engine_hooks_transformers_lifetime.py b/src/Python/tests/test_migrations_engine_hooks_transformers_lifetime.py
deleted file mode 100644
index 002b870..0000000
--- a/src/Python/tests/test_migrations_engine_hooks_transformers_lifetime.py
+++ /dev/null
@@ -1,372 +0,0 @@
-# Copyright (c) 2024, Salesforce, Inc.
-# SPDX-License-Identifier: Apache-2
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Make sure the test can find the module
-import pytest
-from tableau_migration.migration import get_service
-from tableau_migration.migration_engine_hooks_transformers import PyContentTransformerBuilder
-from System import IServiceProvider, Func
-from Microsoft.Extensions.DependencyInjection import (
-    ServiceProviderServiceExtensions,
-    ServiceCollectionServiceExtensions,
-    ServiceCollection,
-    ServiceCollectionContainerBuilderExtensions)
-from Tableau.Migration.Content import IUser, IProject
-from Tableau.Migration.Engine.Hooks import IMigrationHook
-from Tableau.Migration.Engine.Hooks.Transformers import ContentTransformerBuilder, IContentTransformer
-from Tableau.Migration.Interop.Hooks.Transformers import ISyncContentTransformer
-
-class TransformerImplementation(ISyncContentTransformer[IUser]):
-    __namespace__ = "Tableau.Migration.Custom.Hooks.Transformers.Lifetime"
-    
-    def Execute(self, ctx: IUser) -> IUser:
-        return ctx
-
-class SubTransformerImplementation(TransformerImplementation):
-    __namespace__ = "Tableau.Migration.Custom.Hooks.Transformers.Lifetime"
-    
-    def Execute(self, ctx: IUser) -> IUser:
-        return ctx
-
-class TestContentTransformerBuilderLifetimeTests():
-    @pytest.fixture(autouse=True, scope="class")
-    def setup(self):
-        TestContentTransformerBuilderLifetimeTests.TransformerImplementation = TransformerImplementation
-        TestContentTransformerBuilderLifetimeTests.SubTransformerImplementation = SubTransformerImplementation
-            
-        yield
-        
-        del TestContentTransformerBuilderLifetimeTests.SubTransformerImplementation
-        del TestContentTransformerBuilderLifetimeTests.TransformerImplementation
-
-
-    def test_lifetime_buildandcreate_object(self, skip_by_python_lifetime_env_var):
-        try:
-            # Arrange
-            provider = ServiceCollectionContainerBuilderExtensions.BuildServiceProvider(ServiceCollection())
-            hook = TestContentTransformerBuilderLifetimeTests.SubTransformerImplementation()
-            hookFactory = PyContentTransformerBuilder(ContentTransformerBuilder()).add(IUser,hook).build().get_hooks(IContentTransformer[IUser])
-        
-            assert len(hookFactory) == 1
-
-            # Act
-            try:
-                scope1 = ServiceProviderServiceExtensions.CreateScope(provider)
-                firstScopeHook1 = hookFactory[0].Create[IContentTransformer[IUser]](scope1.ServiceProvider)
-                firstScopeHook2 = hookFactory[0].Create[IContentTransformer[IUser]](scope1.ServiceProvider)
-            finally:
-                scope1.Dispose()
-
-            try:
-                scope2 = ServiceProviderServiceExtensions.CreateScope(provider)
-                lastScopeHook = hookFactory[0].Create[IContentTransformer[IUser]](scope2.ServiceProvider)
-            finally:
-                scope2.Dispose()
-
-            # Assert
-            assert hook == firstScopeHook1
-            assert hook is not firstScopeHook1
-            assert hook == firstScopeHook2
-            assert hook is not firstScopeHook2
-            assert hook == lastScopeHook
-            assert hook is not lastScopeHook
-        finally:
-            provider.Dispose()
-
-    def test_lifetime_buildandcreate_noinitializersingleton(self, skip_by_python_lifetime_env_var):
-        try:
-            # Arrange
-            servicecollection = ServiceCollection()
-            ServiceCollectionServiceExtensions.AddSingleton[TestContentTransformerBuilderLifetimeTests.SubTransformerImplementation](servicecollection)
-            provider = ServiceCollectionContainerBuilderExtensions.BuildServiceProvider(servicecollection)
-            hookFactory = PyContentTransformerBuilder(ContentTransformerBuilder()).add(TestContentTransformerBuilderLifetimeTests.SubTransformerImplementation,IUser).build().get_hooks(IContentTransformer[IUser])
-        
-            assert len(hookFactory) == 1
-
-            # Act
-            try:
-                scope1 = ServiceProviderServiceExtensions.CreateScope(provider)
-                firstScopeHook1 = hookFactory[0].Create[IContentTransformer[IUser]](scope1.ServiceProvider)
-                firstScopeHook2 = hookFactory[0].Create[IContentTransformer[IUser]](scope1.ServiceProvider)
-            finally:
-                scope1.Dispose()
-
-            try:
-                scope2 = ServiceProviderServiceExtensions.CreateScope(provider)
-                lastScopeHook = hookFactory[0].Create[IContentTransformer[IUser]](scope2.ServiceProvider)
-            finally:
-                scope2.Dispose()
-
-            # Assert
-            assert firstScopeHook1 == firstScopeHook2
-            assert firstScopeHook1 is not firstScopeHook2
-            assert firstScopeHook1 == lastScopeHook
-            assert firstScopeHook1 is not lastScopeHook
-        finally:
-            provider.Dispose()
-
-    def test_lifetime_buildandcreate_noinitializerscoped(self, skip_by_python_lifetime_env_var):
-        try:
-            # Arrange
-            servicecollection = ServiceCollection()
-            ServiceCollectionServiceExtensions.AddScoped[TestContentTransformerBuilderLifetimeTests.SubTransformerImplementation](servicecollection)
-            provider = ServiceCollectionContainerBuilderExtensions.BuildServiceProvider(servicecollection)
-            hookFactory = PyContentTransformerBuilder(ContentTransformerBuilder()).add(TestContentTransformerBuilderLifetimeTests.SubTransformerImplementation,IUser).build().get_hooks(IContentTransformer[IUser])
-        
-            assert len(hookFactory) == 1
-
-            # Act
-            try:
-                scope1 = ServiceProviderServiceExtensions.CreateScope(provider)
-                firstScopeHook1 = hookFactory[0].Create[IContentTransformer[IUser]](scope1.ServiceProvider)
-                firstScopeHook2 = hookFactory[0].Create[IContentTransformer[IUser]](scope1.ServiceProvider)
-            finally:
-                scope1.Dispose()
-
-            try:
-                scope2 = ServiceProviderServiceExtensions.CreateScope(provider)
-                lastScopeHook = hookFactory[0].Create[IContentTransformer[IUser]](scope2.ServiceProvider)
-            finally:
-                scope2.Dispose()
-
-            # Assert
-            assert firstScopeHook1 == firstScopeHook2
-            assert firstScopeHook1 is not firstScopeHook2
-            assert firstScopeHook1 != lastScopeHook
-        finally:
-            provider.Dispose()
-
-    def test_lifetime_buildandcreate_noinitializertransient(self, skip_by_python_lifetime_env_var):
-        try:
-            # Arrange
-            servicecollection = ServiceCollection()
-            ServiceCollectionServiceExtensions.AddTransient[TestContentTransformerBuilderLifetimeTests.SubTransformerImplementation](servicecollection)
-            provider = ServiceCollectionContainerBuilderExtensions.BuildServiceProvider(servicecollection)
-            hookFactory = PyContentTransformerBuilder(ContentTransformerBuilder()).add(TestContentTransformerBuilderLifetimeTests.SubTransformerImplementation,IUser).build().get_hooks(IContentTransformer[IUser])
-        
-            assert len(hookFactory) == 1
-
-            # Act
-            try:
-                scope1 = ServiceProviderServiceExtensions.CreateScope(provider)
-                firstScopeHook1 = hookFactory[0].Create[IContentTransformer[IUser]](scope1.ServiceProvider)
-                firstScopeHook2 = hookFactory[0].Create[IContentTransformer[IUser]](scope1.ServiceProvider)
-            finally:
-                scope1.Dispose()
-
-            try:
-                scope2 = ServiceProviderServiceExtensions.CreateScope(provider)
-                lastScopeHook = hookFactory[0].Create[IContentTransformer[IUser]](scope2.ServiceProvider)
-            finally:
-                scope2.Dispose()
-
-            # Assert
-            assert firstScopeHook1 != firstScopeHook2
-            assert firstScopeHook1 != lastScopeHook
-        finally:
-            provider.Dispose()
-
-    def test_lifetime_buildandcreate_initializerobjectreference(self, skip_by_python_lifetime_env_var):
-        try:
-            # Arrange
-            hook = TestContentTransformerBuilderLifetimeTests.SubTransformerImplementation()
-            def subsubclassinitialize(provider: IServiceProvider):
-                return hook
-            provider = ServiceCollectionContainerBuilderExtensions.BuildServiceProvider(ServiceCollection())
-            hookFactory = PyContentTransformerBuilder(ContentTransformerBuilder()).add(TestContentTransformerBuilderLifetimeTests.SubTransformerImplementation, IUser, Func[IServiceProvider, TestContentTransformerBuilderLifetimeTests.SubTransformerImplementation](subsubclassinitialize)).build().get_hooks(IContentTransformer[IUser])
-        
-            assert len(hookFactory) == 1
-
-            # Act
-            try:
-                scope1 = ServiceProviderServiceExtensions.CreateScope(provider)
-                firstScopeHook1 = hookFactory[0].Create[IContentTransformer[IUser]](scope1.ServiceProvider)
-                firstScopeHook2 = hookFactory[0].Create[IContentTransformer[IUser]](scope1.ServiceProvider)
-            finally:
-                scope1.Dispose()
-
-            try:
-                scope2 = ServiceProviderServiceExtensions.CreateScope(provider)
-                lastScopeHook = hookFactory[0].Create[IContentTransformer[IUser]](scope2.ServiceProvider)
-            finally:
-                scope2.Dispose()
-
-            # Assert
-            assert firstScopeHook1 == firstScopeHook2
-            assert firstScopeHook1 is not firstScopeHook2
-            assert firstScopeHook1 == lastScopeHook
-            assert firstScopeHook1 is not lastScopeHook
-        finally:
-            provider.Dispose()
-
-    def test_lifetime_buildandcreate_initializernewobject(self, skip_by_python_lifetime_env_var):
-        try:
-            # Arrange
-            def subsubclassinitialize(provider: IServiceProvider):
-                return TestContentTransformerBuilderLifetimeTests.SubTransformerImplementation()
-            provider = ServiceCollectionContainerBuilderExtensions.BuildServiceProvider(ServiceCollection())
-            hookFactory = PyContentTransformerBuilder(ContentTransformerBuilder()).add(TestContentTransformerBuilderLifetimeTests.SubTransformerImplementation, IUser, Func[IServiceProvider, TestContentTransformerBuilderLifetimeTests.SubTransformerImplementation](subsubclassinitialize)).build().get_hooks(IContentTransformer[IUser])
-        
-            assert len(hookFactory) == 1
-
-            # Act
-            try:
-                scope1 = ServiceProviderServiceExtensions.CreateScope(provider)
-                firstScopeHook1 = hookFactory[0].Create[IContentTransformer[IUser]](scope1.ServiceProvider)
-                firstScopeHook2 = hookFactory[0].Create[IContentTransformer[IUser]](scope1.ServiceProvider)
-            finally:
-                scope1.Dispose()
-
-            try:
-                scope2 = ServiceProviderServiceExtensions.CreateScope(provider)
-                lastScopeHook = hookFactory[0].Create[IContentTransformer[IUser]](scope2.ServiceProvider)
-            finally:
-                scope2.Dispose()
-
-            # Assert
-            assert firstScopeHook1 != firstScopeHook2
-            assert firstScopeHook1 != lastScopeHook
-        finally:
-            provider.Dispose()
-
-    def test_lifetime_buildandcreate_initializersingleton(self, skip_by_python_lifetime_env_var):
-        try:
-            # Arrange
-            def subsubclassinitialize(provider: IServiceProvider):
-                return get_service(provider,TestContentTransformerBuilderLifetimeTests.SubTransformerImplementation)
-            servicecollection = ServiceCollection()
-            ServiceCollectionServiceExtensions.AddSingleton[TestContentTransformerBuilderLifetimeTests.SubTransformerImplementation](servicecollection)
-            provider = ServiceCollectionContainerBuilderExtensions.BuildServiceProvider(servicecollection)
-            hookFactory = PyContentTransformerBuilder(ContentTransformerBuilder()).add(TestContentTransformerBuilderLifetimeTests.SubTransformerImplementation, IUser, Func[IServiceProvider, TestContentTransformerBuilderLifetimeTests.SubTransformerImplementation](subsubclassinitialize)).build().get_hooks(IContentTransformer[IUser])
-        
-            assert len(hookFactory) == 1
-
-            # Act
-            try:
-                scope1 = ServiceProviderServiceExtensions.CreateScope(provider)
-                firstScopeHook1 = hookFactory[0].Create[IContentTransformer[IUser]](scope1.ServiceProvider)
-                firstScopeHook2 = hookFactory[0].Create[IContentTransformer[IUser]](scope1.ServiceProvider)
-            finally:
-                scope1.Dispose()
-
-            try:
-                scope2 = ServiceProviderServiceExtensions.CreateScope(provider)
-                lastScopeHook = hookFactory[0].Create[IContentTransformer[IUser]](scope2.ServiceProvider)
-            finally:
-                scope2.Dispose()
-
-            # Assert
-            assert firstScopeHook1 == firstScopeHook2
-            assert firstScopeHook1 is not firstScopeHook2
-            assert firstScopeHook1 == lastScopeHook
-            assert firstScopeHook1 is not lastScopeHook
-        finally:
-            provider.Dispose()
-
-    def test_lifetime_buildandcreate_initializerscoped(self, skip_by_python_lifetime_env_var):
-        try:
-            # Arrange
-            def classinitialize(provider: IServiceProvider):
-                return get_service(provider,TestContentTransformerBuilderLifetimeTests.TransformerImplementation)
-            servicecollection = ServiceCollection()
-            ServiceCollectionServiceExtensions.AddScoped[TestContentTransformerBuilderLifetimeTests.TransformerImplementation](servicecollection)
-            provider = ServiceCollectionContainerBuilderExtensions.BuildServiceProvider(servicecollection)
-            hookFactory = PyContentTransformerBuilder(ContentTransformerBuilder()).add(TestContentTransformerBuilderLifetimeTests.TransformerImplementation, IUser, Func[IServiceProvider, TestContentTransformerBuilderLifetimeTests.TransformerImplementation](classinitialize)).build().get_hooks(IContentTransformer[IUser])
-        
-            assert len(hookFactory) == 1
-
-            # Act
-            try:
-                scope1 = ServiceProviderServiceExtensions.CreateScope(provider)
-                firstScopeHook1 = hookFactory[0].Create[IContentTransformer[IUser]](scope1.ServiceProvider)
-                firstScopeHook2 = hookFactory[0].Create[IContentTransformer[IUser]](scope1.ServiceProvider)
-            finally:
-                scope1.Dispose()
-
-            try:
-                scope2 = ServiceProviderServiceExtensions.CreateScope(provider)
-                lastScopeHook = hookFactory[0].Create[IContentTransformer[IUser]](scope2.ServiceProvider)
-            finally:
-                scope2.Dispose()
-
-            # Assert
-            assert firstScopeHook1 == firstScopeHook2
-            assert firstScopeHook1 is not firstScopeHook2
-            assert firstScopeHook1 != lastScopeHook
-        finally:
-            provider.Dispose()
-
-    def test_lifetime_buildandcreate_initializertransient(self, skip_by_python_lifetime_env_var):
-        try:
-            # Arrange
-            def subclassinitialize(provider: IServiceProvider):
-                return get_service(provider,TestContentTransformerBuilderLifetimeTests.SubTransformerImplementation)
-            servicecollection = ServiceCollection()
-            ServiceCollectionServiceExtensions.AddTransient[TestContentTransformerBuilderLifetimeTests.SubTransformerImplementation](servicecollection)
-            provider = ServiceCollectionContainerBuilderExtensions.BuildServiceProvider(servicecollection)
-            hookFactory = PyContentTransformerBuilder(ContentTransformerBuilder()).add(TestContentTransformerBuilderLifetimeTests.SubTransformerImplementation, IUser, Func[IServiceProvider, TestContentTransformerBuilderLifetimeTests.SubTransformerImplementation](subclassinitialize)).build().get_hooks(IContentTransformer[IUser])
-        
-            assert len(hookFactory) == 1
-
-            # Act
-            try:
-                scope1 = ServiceProviderServiceExtensions.CreateScope(provider)
-                firstScopeHook1 = hookFactory[0].Create[IContentTransformer[IUser]](scope1.ServiceProvider)
-                firstScopeHook2 = hookFactory[0].Create[IContentTransformer[IUser]](scope1.ServiceProvider)
-            finally:
-                scope1.Dispose()
-
-            try:
-                scope2 = ServiceProviderServiceExtensions.CreateScope(provider)
-                lastScopeHook = hookFactory[0].Create[IContentTransformer[IUser]](scope2.ServiceProvider)
-            finally:
-                scope2.Dispose()
-
-            # Assert
-            assert firstScopeHook1 != firstScopeHook2
-            assert firstScopeHook1 != lastScopeHook
-        finally:
-            provider.Dispose()
-
-    def test_lifetime_buildandcreate_callback(self, skip_by_python_lifetime_env_var):
-        try:
-            # Arrange
-            def classcallback(context: IProject):
-                return context
-        
-            provider = ServiceCollectionContainerBuilderExtensions.BuildServiceProvider(ServiceCollection())
-            hookFactory = PyContentTransformerBuilder(ContentTransformerBuilder()).add(IProject, Func[IProject, IProject](classcallback)).build().get_hooks(IContentTransformer[IProject])
-        
-            assert len(hookFactory) == 1
-
-            # Act
-            try:
-                scope1 = ServiceProviderServiceExtensions.CreateScope(provider)
-                firstScopeHook1 = hookFactory[0].Create[IMigrationHook[IProject]](scope1.ServiceProvider)
-                firstScopeHook2 = hookFactory[0].Create[IMigrationHook[IProject]](scope1.ServiceProvider)
-            finally:
-                scope1.Dispose()
-
-            try:
-                scope2 = ServiceProviderServiceExtensions.CreateScope(provider)
-                lastScopeHook = hookFactory[0].Create[IMigrationHook[IProject]](scope2.ServiceProvider)
-            finally:
-                scope2.Dispose()
-
-            # Assert
-            assert firstScopeHook1 != firstScopeHook2
-            assert firstScopeHook1 != lastScopeHook
-        finally:
-            provider.Dispose()
diff --git a/src/Python/tests/test_other.py b/src/Python/tests/test_other.py
index c5a9b3a..4632898 100644
--- a/src/Python/tests/test_other.py
+++ b/src/Python/tests/test_other.py
@@ -15,7 +15,11 @@
 
 import os
 import logging
-import tableau_migration
+from tableau_migration import _logger_names
+from tableau_migration.migration import (
+    get_service_provider,
+    get_service
+)
 
 from tableau_migration.migration_engine import (
     PyMigrationPlanBuilder)
@@ -46,9 +50,9 @@ def test_logging(self):
         PyMigrationPlanBuilder()
         
         # tableau_migration module keeps track of instaniated loggers. Verify that we have at least one
-        assert len(tableau_migration._logger_names) > 0
+        assert len(_logger_names) > 0
         
-        for name in tableau_migration._logger_names:
+        for name in _logger_names:
             # Given that we have a name, we should have a logger
             assert logging.getLogger(name)            
 
@@ -62,8 +66,8 @@ def test_config(self):
         process starts and hence the env variables take and that way an int can be set to a env var.
         '''
 
-        services = tableau_migration.migration.get_service_provider()
-        config_reader = tableau_migration.migration.get_service(services, IConfigReader)
+        services = get_service_provider()
+        config_reader = get_service(services, IConfigReader)
 
         batch_size = config_reader.Get[IUser]().BatchSize
 
diff --git a/src/Tableau.Migration.PythonGenerator/Config/Hints/GeneratorHints.cs b/src/Tableau.Migration.PythonGenerator/Config/Hints/GeneratorHints.cs
new file mode 100644
index 0000000..b71af0e
--- /dev/null
+++ b/src/Tableau.Migration.PythonGenerator/Config/Hints/GeneratorHints.cs
@@ -0,0 +1,40 @@
+//
+//  Copyright (c) 2024, Salesforce, Inc.
+//  SPDX-License-Identifier: Apache-2
+//  
+//  Licensed under the Apache License, Version 2.0 (the "License") 
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//  
+//  http://www.apache.org/licenses/LICENSE-2.0
+//  
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+using System;
+using System.Linq;
+using Microsoft.CodeAnalysis;
+
+namespace Tableau.Migration.PythonGenerator.Config.Hints
+{
+    internal sealed class GeneratorHints
+    {
+        public NamespaceHints[] Namespaces { get; set; } = Array.Empty<NamespaceHints>();
+
+        public TypeHints? ForType(ITypeSymbol type)
+        {
+            var ns = type.ContainingNamespace.ToDisplayString();
+            var nsHint = Namespaces.FirstOrDefault(nh => string.Equals(nh.Namespace, ns, StringComparison.Ordinal));
+            if(nsHint is null)
+            {
+                return null;
+            }
+
+            return nsHint.Types.FirstOrDefault(th => string.Equals(th.Type, type.Name, StringComparison.Ordinal));
+        }
+    }
+}
diff --git a/src/Tableau.Migration.PythonGenerator/Config/Hints/NamespaceHints.cs b/src/Tableau.Migration.PythonGenerator/Config/Hints/NamespaceHints.cs
new file mode 100644
index 0000000..12632e7
--- /dev/null
+++ b/src/Tableau.Migration.PythonGenerator/Config/Hints/NamespaceHints.cs
@@ -0,0 +1,28 @@
+//
+//  Copyright (c) 2024, Salesforce, Inc.
+//  SPDX-License-Identifier: Apache-2
+//  
+//  Licensed under the Apache License, Version 2.0 (the "License") 
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//  
+//  http://www.apache.org/licenses/LICENSE-2.0
+//  
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+using System;
+
+namespace Tableau.Migration.PythonGenerator.Config.Hints
+{
+    internal sealed class NamespaceHints
+    {
+        public string Namespace { get; set; } = string.Empty;
+
+        public TypeHints[] Types { get; set; } = Array.Empty<TypeHints>();
+    }
+}
diff --git a/src/Tableau.Migration.PythonGenerator/Config/Hints/TypeHints.cs b/src/Tableau.Migration.PythonGenerator/Config/Hints/TypeHints.cs
new file mode 100644
index 0000000..b47e276
--- /dev/null
+++ b/src/Tableau.Migration.PythonGenerator/Config/Hints/TypeHints.cs
@@ -0,0 +1,28 @@
+//
+//  Copyright (c) 2024, Salesforce, Inc.
+//  SPDX-License-Identifier: Apache-2
+//  
+//  Licensed under the Apache License, Version 2.0 (the "License") 
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//  
+//  http://www.apache.org/licenses/LICENSE-2.0
+//  
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+using System;
+
+namespace Tableau.Migration.PythonGenerator.Config.Hints
+{
+    internal sealed class TypeHints
+    {
+        public string Type { get; set; } = string.Empty;
+
+        public string[] ExcludeMembers { get; set; } = Array.Empty<string>();
+    }
+}
diff --git a/src/Tableau.Migration.PythonGenerator/Config/PythonGeneratorOptions.cs b/src/Tableau.Migration.PythonGenerator/Config/PythonGeneratorOptions.cs
new file mode 100644
index 0000000..ce97794
--- /dev/null
+++ b/src/Tableau.Migration.PythonGenerator/Config/PythonGeneratorOptions.cs
@@ -0,0 +1,30 @@
+//
+//  Copyright (c) 2024, Salesforce, Inc.
+//  SPDX-License-Identifier: Apache-2
+//  
+//  Licensed under the Apache License, Version 2.0 (the "License") 
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//  
+//  http://www.apache.org/licenses/LICENSE-2.0
+//  
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+using Tableau.Migration.PythonGenerator.Config.Hints;
+
+namespace Tableau.Migration.PythonGenerator.Config
+{
+    internal sealed class PythonGeneratorOptions
+    {
+        public string ImportPath { get; set; } = string.Empty;
+
+        public string OutputPath { get; set; } = string.Empty;
+
+        public GeneratorHints Hints { get; set; } = new();
+    }
+}
diff --git a/src/Tableau.Migration.PythonGenerator/ConversionMode.cs b/src/Tableau.Migration.PythonGenerator/ConversionMode.cs
new file mode 100644
index 0000000..e069ad4
--- /dev/null
+++ b/src/Tableau.Migration.PythonGenerator/ConversionMode.cs
@@ -0,0 +1,38 @@
+//
+//  Copyright (c) 2024, Salesforce, Inc.
+//  SPDX-License-Identifier: Apache-2
+//  
+//  Licensed under the Apache License, Version 2.0 (the "License") 
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//  
+//  http://www.apache.org/licenses/LICENSE-2.0
+//  
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+namespace Tableau.Migration.PythonGenerator
+{
+    internal enum ConversionMode
+    {
+        Direct = 0,
+
+        Wrap,
+
+        WrapSerialized,
+
+        WrapGeneric,
+
+        Enum,
+
+        WrapImmutableCollection,
+
+        WrapMutableCollection,
+
+        WrapArray
+    }
+}
diff --git a/src/Tableau.Migration.PythonGenerator/Generators/IPythonDocstringGenerator.cs b/src/Tableau.Migration.PythonGenerator/Generators/IPythonDocstringGenerator.cs
new file mode 100644
index 0000000..efbfb61
--- /dev/null
+++ b/src/Tableau.Migration.PythonGenerator/Generators/IPythonDocstringGenerator.cs
@@ -0,0 +1,26 @@
+//
+//  Copyright (c) 2024, Salesforce, Inc.
+//  SPDX-License-Identifier: Apache-2
+//  
+//  Licensed under the Apache License, Version 2.0 (the "License") 
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//  
+//  http://www.apache.org/licenses/LICENSE-2.0
+//  
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+using Microsoft.CodeAnalysis;
+
+namespace Tableau.Migration.PythonGenerator.Generators
+{
+    internal interface IPythonDocstringGenerator
+    {
+        PythonDocstring? Generate(ISymbol dotNetSymbol, bool ignoreArgs = false);
+    }
+}
diff --git a/src/Tableau.Migration.PythonGenerator/Generators/IPythonEnumValueGenerator.cs b/src/Tableau.Migration.PythonGenerator/Generators/IPythonEnumValueGenerator.cs
new file mode 100644
index 0000000..2949148
--- /dev/null
+++ b/src/Tableau.Migration.PythonGenerator/Generators/IPythonEnumValueGenerator.cs
@@ -0,0 +1,27 @@
+//
+//  Copyright (c) 2024, Salesforce, Inc.
+//  SPDX-License-Identifier: Apache-2
+//  
+//  Licensed under the Apache License, Version 2.0 (the "License") 
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//  
+//  http://www.apache.org/licenses/LICENSE-2.0
+//  
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+using System.Collections.Immutable;
+using Microsoft.CodeAnalysis;
+
+namespace Tableau.Migration.PythonGenerator.Generators
+{
+    internal interface IPythonEnumValueGenerator
+    {
+        ImmutableArray<PythonEnumValue> GenerateEnumValues(INamedTypeSymbol dotNetType);
+    }
+}
diff --git a/src/Tableau.Migration.PythonGenerator/Generators/IPythonGenerator.cs b/src/Tableau.Migration.PythonGenerator/Generators/IPythonGenerator.cs
new file mode 100644
index 0000000..84a864f
--- /dev/null
+++ b/src/Tableau.Migration.PythonGenerator/Generators/IPythonGenerator.cs
@@ -0,0 +1,27 @@
+//
+//  Copyright (c) 2024, Salesforce, Inc.
+//  SPDX-License-Identifier: Apache-2
+//  
+//  Licensed under the Apache License, Version 2.0 (the "License") 
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//  
+//  http://www.apache.org/licenses/LICENSE-2.0
+//  
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+using System.Collections.Generic;
+using Microsoft.CodeAnalysis;
+
+namespace Tableau.Migration.PythonGenerator.Generators
+{
+    internal interface IPythonGenerator
+    {
+        PythonTypeCache Generate(IEnumerable<INamedTypeSymbol> dotNetTypes);
+    }
+}
diff --git a/src/Tableau.Migration.PythonGenerator/Generators/IPythonMethodGenerator.cs b/src/Tableau.Migration.PythonGenerator/Generators/IPythonMethodGenerator.cs
new file mode 100644
index 0000000..9000d52
--- /dev/null
+++ b/src/Tableau.Migration.PythonGenerator/Generators/IPythonMethodGenerator.cs
@@ -0,0 +1,27 @@
+//
+//  Copyright (c) 2024, Salesforce, Inc.
+//  SPDX-License-Identifier: Apache-2
+//  
+//  Licensed under the Apache License, Version 2.0 (the "License") 
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//  
+//  http://www.apache.org/licenses/LICENSE-2.0
+//  
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+using System.Collections.Immutable;
+using Microsoft.CodeAnalysis;
+
+namespace Tableau.Migration.PythonGenerator.Generators
+{
+    internal interface IPythonMethodGenerator
+    {
+        ImmutableArray<PythonMethod> GenerateMethods(INamedTypeSymbol dotNetType);
+    }
+}
diff --git a/src/Tableau.Migration.PythonGenerator/Generators/IPythonPropertyGenerator.cs b/src/Tableau.Migration.PythonGenerator/Generators/IPythonPropertyGenerator.cs
new file mode 100644
index 0000000..76cb66d
--- /dev/null
+++ b/src/Tableau.Migration.PythonGenerator/Generators/IPythonPropertyGenerator.cs
@@ -0,0 +1,27 @@
+//
+//  Copyright (c) 2024, Salesforce, Inc.
+//  SPDX-License-Identifier: Apache-2
+//  
+//  Licensed under the Apache License, Version 2.0 (the "License") 
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//  
+//  http://www.apache.org/licenses/LICENSE-2.0
+//  
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+using System.Collections.Immutable;
+using Microsoft.CodeAnalysis;
+
+namespace Tableau.Migration.PythonGenerator.Generators
+{
+    internal interface IPythonPropertyGenerator
+    {
+        ImmutableArray<PythonProperty> GenerateProperties(INamedTypeSymbol dotNetType);
+    }
+}
diff --git a/src/Tableau.Migration.PythonGenerator/Generators/IPythonTypeGenerator.cs b/src/Tableau.Migration.PythonGenerator/Generators/IPythonTypeGenerator.cs
new file mode 100644
index 0000000..f8ef6c1
--- /dev/null
+++ b/src/Tableau.Migration.PythonGenerator/Generators/IPythonTypeGenerator.cs
@@ -0,0 +1,27 @@
+//
+//  Copyright (c) 2024, Salesforce, Inc.
+//  SPDX-License-Identifier: Apache-2
+//  
+//  Licensed under the Apache License, Version 2.0 (the "License") 
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//  
+//  http://www.apache.org/licenses/LICENSE-2.0
+//  
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+using System.Collections.Immutable;
+using Microsoft.CodeAnalysis;
+
+namespace Tableau.Migration.PythonGenerator.Generators
+{
+    internal interface IPythonTypeGenerator
+    {
+        PythonType Generate(ImmutableHashSet<string> dotNetTypeNames, INamedTypeSymbol dotNetType);
+    }
+}
diff --git a/src/Tableau.Migration.PythonGenerator/Generators/PythonDocstringGenerator.cs b/src/Tableau.Migration.PythonGenerator/Generators/PythonDocstringGenerator.cs
new file mode 100644
index 0000000..1a6ef05
--- /dev/null
+++ b/src/Tableau.Migration.PythonGenerator/Generators/PythonDocstringGenerator.cs
@@ -0,0 +1,111 @@
+//
+//  Copyright (c) 2024, Salesforce, Inc.
+//  SPDX-License-Identifier: Apache-2
+//  
+//  Licensed under the Apache License, Version 2.0 (the "License") 
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//  
+//  http://www.apache.org/licenses/LICENSE-2.0
+//  
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+using System.Collections.Immutable;
+using System.Diagnostics.CodeAnalysis;
+using System.Text.RegularExpressions;
+using System.Xml;
+using Microsoft.CodeAnalysis;
+
+namespace Tableau.Migration.PythonGenerator.Generators
+{
+    internal sealed class PythonDocstringGenerator : IPythonDocstringGenerator
+    {
+        [return: NotNullIfNotNull(nameof(s))]
+        private static string? CleanText(string? s)
+        {
+            if (s is null)
+            {
+                return null;
+            }
+
+            var result = Regex.Replace(s.Trim().ReplaceLineEndings(""), @"\s+", " ");
+
+            if (result.Contains("<see"))
+            {
+                result = Regex.Replace(result, @"\<see\s+cref=\""(?:\w+\:)(?:.+[.])+(?<type>\w+)(?:`\d)*\""\s+/\>", "$1");
+                result = Regex.Replace(result, @"\<see\s+href=\""(?<address>.*)\""\s*\>(?<text>.+)\</see\>", "$1");
+            }
+
+            if (result.Contains("<paramref"))
+            {
+                result = Regex.Replace(result, @"\<paramref\s+name=\""(?<type>\w+)\""\s+/\>", "$1");
+            }
+
+            if (result.Contains("para>"))
+            {
+                result = Regex.Replace(result, @"\<(/*)para\>", string.Empty);
+            }
+
+            return result.Trim();
+        }
+
+        private static PythonDocstring FromXml(string xmlDoc, bool ignoreArgs)
+        {
+            var xml = new XmlDocument();
+            xml.LoadXml(xmlDoc);
+
+            string summary = string.Empty;
+            var summaryEls = xml.DocumentElement?.GetElementsByTagName("summary");
+            if (summaryEls is not null && summaryEls.Count > 0)
+            {
+                summary = CleanText(summaryEls[0]?.InnerXml) ?? string.Empty;
+            }
+
+            string? returnDoc = null;
+            var returnsEls = xml.DocumentElement?.GetElementsByTagName("returns");
+            if (returnsEls is not null && returnsEls.Count > 0)
+            {
+                returnDoc = CleanText(returnsEls[0]?.InnerXml);
+            }
+
+            var args = ImmutableArray.CreateBuilder<PythonArgDocstring>();
+
+            if(!ignoreArgs)
+            {
+                var argEls = xml.DocumentElement?.GetElementsByTagName("param");
+                if (argEls is not null && argEls.Count > 0)
+                {
+                    for (int i = 0; i < argEls.Count; i++)
+                    {
+                        var arg = argEls[i];
+                        var name = arg?.Attributes?["name"]?.Value?.ToSnakeCase();
+                        if (arg is null || name is null)
+                        {
+                            continue;
+                        }
+
+                        args.Add(new(name, CleanText(arg.InnerXml)));
+                    }
+                }
+            }
+
+            return new(summary, args.ToImmutable(), returnDoc);
+        }
+
+        public PythonDocstring? Generate(ISymbol dotNetSymbol, bool ignoreArgs = false)
+        {
+            var xml = dotNetSymbol.GetDocumentationCommentXml();
+            if (string.IsNullOrEmpty(xml))
+            {
+                return null;
+            }
+
+            return FromXml(xml, ignoreArgs);
+        }
+    }
+}
diff --git a/src/Tableau.Migration.PythonGenerator/Generators/PythonEnumValueGenerator.cs b/src/Tableau.Migration.PythonGenerator/Generators/PythonEnumValueGenerator.cs
new file mode 100644
index 0000000..916a4e7
--- /dev/null
+++ b/src/Tableau.Migration.PythonGenerator/Generators/PythonEnumValueGenerator.cs
@@ -0,0 +1,65 @@
+//
+//  Copyright (c) 2024, Salesforce, Inc.
+//  SPDX-License-Identifier: Apache-2
+//  
+//  Licensed under the Apache License, Version 2.0 (the "License") 
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//  
+//  http://www.apache.org/licenses/LICENSE-2.0
+//  
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+using System.Collections.Immutable;
+using Microsoft.CodeAnalysis;
+using Microsoft.Extensions.Options;
+using Tableau.Migration.PythonGenerator.Config;
+
+namespace Tableau.Migration.PythonGenerator.Generators
+{
+    internal sealed class PythonEnumValueGenerator : PythonMemberGenerator, IPythonEnumValueGenerator
+    {
+        private readonly IPythonDocstringGenerator _docGenerator;
+
+        public PythonEnumValueGenerator(IPythonDocstringGenerator docGenerator,
+            IOptions<PythonGeneratorOptions> options) 
+            : base(options)
+        {
+            _docGenerator = docGenerator;
+        }
+
+        public ImmutableArray<PythonEnumValue> GenerateEnumValues(INamedTypeSymbol dotNetType)
+        {
+            if(!dotNetType.IsAnyEnum())
+            {
+                return ImmutableArray<PythonEnumValue>.Empty;
+            }
+
+            var results = ImmutableArray.CreateBuilder<PythonEnumValue>();
+
+            foreach (var dotNetMember in dotNetType.GetMembers())
+            {
+                if (!(dotNetMember is IFieldSymbol dotNetField) ||
+                    !dotNetField.IsConst ||
+                    IgnoreMember(dotNetType, dotNetField))
+                {
+                    continue;
+                }
+
+                var value = dotNetField.ConstantValue!;
+                var docs = _docGenerator.Generate(dotNetField);
+
+                var pyValue = new PythonEnumValue(dotNetField.Name.ToConstantCase(), value, docs);
+
+                results.Add(pyValue);
+            }
+
+            return results.ToImmutable();
+        }
+    }
+}
diff --git a/src/Tableau.Migration.PythonGenerator/Generators/PythonGenerator.cs b/src/Tableau.Migration.PythonGenerator/Generators/PythonGenerator.cs
new file mode 100644
index 0000000..687aaa6
--- /dev/null
+++ b/src/Tableau.Migration.PythonGenerator/Generators/PythonGenerator.cs
@@ -0,0 +1,49 @@
+//
+//  Copyright (c) 2024, Salesforce, Inc.
+//  SPDX-License-Identifier: Apache-2
+//  
+//  Licensed under the Apache License, Version 2.0 (the "License") 
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//  
+//  http://www.apache.org/licenses/LICENSE-2.0
+//  
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Linq;
+using Microsoft.CodeAnalysis;
+
+namespace Tableau.Migration.PythonGenerator.Generators
+{
+    internal sealed class PythonGenerator : IPythonGenerator
+    {
+        private readonly IPythonTypeGenerator _typeGenerator;
+
+        public PythonGenerator(IPythonTypeGenerator typeGenerator)
+        {
+            _typeGenerator = typeGenerator;
+        }
+
+        public PythonTypeCache Generate(IEnumerable<INamedTypeSymbol> dotNetTypes)
+        {
+            var dotNetTypeNames = dotNetTypes.Select(t => t.ToDisplayString()).ToImmutableHashSet();
+
+            var pyTypes = new List<PythonType>(dotNetTypes.Count());
+
+            foreach(var dotnetType in dotNetTypes)
+            {
+                var pyType = _typeGenerator.Generate(dotNetTypeNames,dotnetType);
+                pyTypes.Add(pyType);
+            }
+
+            return new PythonTypeCache(pyTypes);
+        }
+    }
+}
diff --git a/src/Tableau.Migration.PythonGenerator/Generators/PythonMemberGenerator.cs b/src/Tableau.Migration.PythonGenerator/Generators/PythonMemberGenerator.cs
new file mode 100644
index 0000000..1eef6e5
--- /dev/null
+++ b/src/Tableau.Migration.PythonGenerator/Generators/PythonMemberGenerator.cs
@@ -0,0 +1,195 @@
+//
+//  Copyright (c) 2024, Salesforce, Inc.
+//  SPDX-License-Identifier: Apache-2
+//  
+//  Licensed under the Apache License, Version 2.0 (the "License") 
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//  
+//  http://www.apache.org/licenses/LICENSE-2.0
+//  
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Linq;
+using Microsoft.CodeAnalysis;
+using Microsoft.Extensions.Options;
+using Tableau.Migration.PythonGenerator.Config;
+using Dotnet = Tableau.Migration.PythonGenerator.Keywords.Dotnet;
+using Py = Tableau.Migration.PythonGenerator.Keywords.Python;
+
+namespace Tableau.Migration.PythonGenerator.Generators
+{
+    internal abstract class PythonMemberGenerator
+    {
+        private static readonly PythonTypeReference BOOL = new(Py.Types.BOOL, ImportModule: null, ConversionMode.Direct);
+        private static readonly PythonTypeReference INT = new(Py.Types.INT, ImportModule: null, ConversionMode.Direct);
+        private static readonly PythonTypeReference STRING = new(Py.Types.STR, ImportModule: null, ConversionMode.Direct);
+        private static readonly PythonTypeReference UUID = new(
+            Py.Types.UUID,
+            ImportModule: Py.Modules.UUID,
+            ConversionMode.WrapSerialized,
+            DotNetParseFunction: "Guid.Parse",
+            ExtraImports: ImmutableArray.Create(
+                new PythonTypeReference(Dotnet.Types.GUID, ImportModule: Dotnet.Namespaces.SYSTEM, ConversionMode.Direct)));
+
+        internal static readonly PythonTypeReference LIST_REFERENCE = new PythonTypeReference(
+            Dotnet.Types.LIST,
+            ImportModule: Dotnet.Namespaces.SYSTEM_COLLECTIONS_GENERIC,
+            ConversionMode: ConversionMode.Direct,
+            ImportAlias: Dotnet.TypeAliases.LIST);
+
+        internal static readonly PythonTypeReference HASH_SET_REFERENCE = new PythonTypeReference(
+            Dotnet.Types.HASH_SET,
+            ImportModule: Dotnet.Namespaces.SYSTEM_COLLECTIONS_GENERIC,
+            ConversionMode: ConversionMode.Direct,
+            ImportAlias: Dotnet.TypeAliases.HASH_SET);
+
+        private static readonly PythonTypeReference STRING_REFERENCE = new PythonTypeReference(
+            Dotnet.Types.STRING,
+            ImportModule: Dotnet.Namespaces.SYSTEM,
+            ConversionMode: ConversionMode.Direct,
+            ImportAlias: Dotnet.TypeAliases.STRING);
+
+        private static readonly PythonTypeReference EXCEPTION = new(
+            Dotnet.Namespaces.SYSTEM_EXCEPTION,
+            Dotnet.Namespaces.SYSTEM,
+            ConversionMode.Direct);
+
+        private readonly PythonGeneratorOptions _options;
+
+        protected PythonMemberGenerator(IOptions<PythonGeneratorOptions> options)
+        {
+            _options = options.Value;
+        }
+
+        protected bool IgnoreMember(ITypeSymbol type, ISymbol member)
+        {
+            var typeHints = _options.Hints.ForType(type);
+            if (typeHints is null)
+            {
+                return false;
+            }
+
+            return typeHints.ExcludeMembers.Any(m => string.Equals(m, member.Name, StringComparison.Ordinal));
+        }
+
+        protected ImmutableArray<PythonTypeReference>? GetGenericTypes(ITypeSymbol t)
+        {
+            if (t is INamedTypeSymbol nt)
+            {
+                return nt.TypeArguments.Select(ToPythonType).ToImmutableArray();
+            }
+
+            if (t is IArrayTypeSymbol at)
+            {
+                var pyType = ToPythonType(at.ElementType);
+                return ImmutableArray.Create(pyType);
+            }
+
+            return null;
+        }
+
+        protected ImmutableArray<ITypeSymbol>? GetDotnetGenericTypes(ITypeSymbol t)
+        {
+            if (t is INamedTypeSymbol nt)
+            {
+                return nt.TypeArguments;
+            }
+
+            if (t is IArrayTypeSymbol at)
+            {
+                return ImmutableArray.Create(at.ElementType);
+            }
+            return null;
+        }
+
+        protected PythonTypeReference ToPythonType(ITypeSymbol t)
+        {
+            if (t.Kind is SymbolKind.TypeParameter)
+            {
+                return PythonTypeReference.ForGenericType(t);
+            }
+
+            switch (t.Name)
+            {
+                case "bool":
+                case nameof(Boolean):
+                    return BOOL;
+                case nameof(Exception):
+                    return EXCEPTION;
+                case nameof(Guid):
+                    return UUID;
+                case nameof(IList<int>):
+                    return new(
+                        Py.Types.LIST_WRAPPED,
+                        ImportModule: Py.Modules.TYPING,
+                        ConversionMode.WrapMutableCollection,
+                        GenericTypes: GetGenericTypes(t),
+                        ExtraImports: ImmutableArray.Create(LIST_REFERENCE),
+                        DotnetTypes: GetDotnetGenericTypes(t));
+                case nameof(HashSet<int>):
+                    return new(
+                        Py.Types.SET,
+                        ImportModule: Py.Modules.TYPING,
+                        ConversionMode.WrapMutableCollection,
+                        GenericTypes: GetGenericTypes(t),
+                        ExtraImports: ImmutableArray.Create(HASH_SET_REFERENCE),
+                        DotnetTypes: GetDotnetGenericTypes(t));
+                case nameof(ISet<int>):
+                    return new(
+                        Py.Types.SEQUENCE,
+                        ImportModule: Py.Modules.TYPING,
+                        ConversionMode.WrapMutableCollection,
+                        GenericTypes: GetGenericTypes(t),
+                        ExtraImports: ImmutableArray.Create(LIST_REFERENCE, STRING_REFERENCE, HASH_SET_REFERENCE),
+                        DotnetTypes: GetDotnetGenericTypes(t));
+
+                case nameof(ImmutableArray<int>):
+                case nameof(IImmutableList<int>):
+                case nameof(IReadOnlyList<int>):
+                case nameof(IEnumerable<int>):
+                    return new(
+                        Py.Types.SEQUENCE,
+                        ImportModule: Py.Modules.TYPING,
+                        ConversionMode.WrapImmutableCollection,
+                        WrapType: "list",
+                        GenericTypes: GetGenericTypes(t));
+                case Dotnet.Types.INT:
+                case nameof(Int32):
+                case Dotnet.Types.LONG:
+                case nameof(Int64):
+                    return INT;
+                case nameof(Nullable):
+                    return GetGenericTypes(t)!.Value.Single();
+                case Dotnet.Types.STRING_SIMPLIFIED:
+                case nameof(String):
+                    return STRING;
+                default:
+                    if (t is IArrayTypeSymbol symbol)
+                    {
+                        return new(
+                            Py.Types.SEQUENCE,
+                            ImportModule: Py.Modules.TYPING,
+                            ConversionMode.WrapArray,
+                            WrapType: "list",
+                            GenericTypes: GetGenericTypes(t),
+                            ExtraImports: ImmutableArray.Create(LIST_REFERENCE),
+                            DotnetTypes: GetDotnetGenericTypes(t));
+                    }
+                    else
+                    {
+                        return PythonTypeReference.ForDotNetType(t);
+                    }
+            }
+        }
+
+    }
+}
diff --git a/src/Tableau.Migration.PythonGenerator/Generators/PythonMethodGenerator.cs b/src/Tableau.Migration.PythonGenerator/Generators/PythonMethodGenerator.cs
new file mode 100644
index 0000000..014c9ee
--- /dev/null
+++ b/src/Tableau.Migration.PythonGenerator/Generators/PythonMethodGenerator.cs
@@ -0,0 +1,99 @@
+//
+//  Copyright (c) 2024, Salesforce, Inc.
+//  SPDX-License-Identifier: Apache-2
+//  
+//  Licensed under the Apache License, Version 2.0 (the "License") 
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//  
+//  http://www.apache.org/licenses/LICENSE-2.0
+//  
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+using System;
+using System.Collections.Immutable;
+using Microsoft.CodeAnalysis;
+using Microsoft.Extensions.Options;
+using Tableau.Migration.PythonGenerator.Config;
+
+namespace Tableau.Migration.PythonGenerator.Generators
+{
+    internal class PythonMethodGenerator : PythonMemberGenerator, IPythonMethodGenerator
+    {
+        private static readonly ImmutableHashSet<string> IGNORED_METHODS = new[]
+        {
+            nameof(object.Equals),
+            nameof(object.GetHashCode),
+            nameof(object.ToString),
+            nameof(IComparable.CompareTo),
+            "Deconstruct",
+            "PrintMembers",
+            "<Clone>$"
+        }.ToImmutableHashSet();
+
+        private readonly IPythonDocstringGenerator _docGenerator;
+
+        public PythonMethodGenerator(IPythonDocstringGenerator docGenerator,
+            IOptions<PythonGeneratorOptions> options)
+            : base(options)
+        {
+            _docGenerator = docGenerator;
+        }
+
+        private PythonTypeReference? GetPythonReturnType(IMethodSymbol dotNetMethod)
+        {
+            if(dotNetMethod.ReturnsVoid)
+            {
+                return null;
+            }
+
+            return ToPythonType(dotNetMethod.ReturnType);
+        }
+
+        private ImmutableArray<PythonMethodArgument> GenerateArguments(IMethodSymbol dotNetMethod)
+        {
+            var results = ImmutableArray.CreateBuilder<PythonMethodArgument>();
+
+            foreach(var dotNetParam in dotNetMethod.Parameters)
+            {
+                var pyArgument = new PythonMethodArgument(dotNetParam.Name.ToSnakeCase(), ToPythonType(dotNetParam.Type));
+                results.Add(pyArgument);
+            }
+
+            return results.ToImmutable();
+        }
+
+        public ImmutableArray<PythonMethod> GenerateMethods(INamedTypeSymbol dotNetType)
+        {
+            var results = ImmutableArray.CreateBuilder<PythonMethod>();
+
+            foreach (var dotNetMember in dotNetType.GetMembers())
+            {
+                if (!(dotNetMember is IMethodSymbol dotNetMethod) || IgnoreMember(dotNetType, dotNetMethod))
+                {
+                    continue;
+                }
+
+                if(dotNetMethod.MethodKind is not MethodKind.Ordinary || IGNORED_METHODS.Contains(dotNetMethod.Name))
+                {
+                    continue;
+                }
+
+                var docs = _docGenerator.Generate(dotNetMethod);
+                var returnType = GetPythonReturnType(dotNetMethod);
+                var arguments = GenerateArguments(dotNetMethod);
+
+                var pyMethod = new PythonMethod(dotNetMethod.Name.ToSnakeCase(), returnType, arguments, dotNetMethod.IsStatic, docs, dotNetMethod);
+
+                results.Add(pyMethod);
+            }
+
+            return results.ToImmutable();
+        }
+    }
+}
diff --git a/src/Tableau.Migration.PythonGenerator/Generators/PythonPropertyGenerator.cs b/src/Tableau.Migration.PythonGenerator/Generators/PythonPropertyGenerator.cs
new file mode 100644
index 0000000..4ba1133
--- /dev/null
+++ b/src/Tableau.Migration.PythonGenerator/Generators/PythonPropertyGenerator.cs
@@ -0,0 +1,70 @@
+//
+//  Copyright (c) 2024, Salesforce, Inc.
+//  SPDX-License-Identifier: Apache-2
+//  
+//  Licensed under the Apache License, Version 2.0 (the "License") 
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//  
+//  http://www.apache.org/licenses/LICENSE-2.0
+//  
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+using System;
+using System.Collections.Immutable;
+using Microsoft.CodeAnalysis;
+using Microsoft.Extensions.Options;
+using Tableau.Migration.PythonGenerator.Config;
+
+namespace Tableau.Migration.PythonGenerator.Generators
+{
+    internal sealed class PythonPropertyGenerator : PythonMemberGenerator, IPythonPropertyGenerator
+    {
+        private static readonly ImmutableHashSet<string> IGNORED_PROPERTIES = new[]
+        {
+            "EqualityContract"
+        }.ToImmutableHashSet();
+
+        private readonly IPythonDocstringGenerator _docGenerator;
+
+        public PythonPropertyGenerator(IPythonDocstringGenerator docGenerator,
+            IOptions<PythonGeneratorOptions> options)
+            : base(options)
+        {
+            _docGenerator = docGenerator;
+        }
+
+        public ImmutableArray<PythonProperty> GenerateProperties(INamedTypeSymbol dotNetType)
+        {
+            var results = ImmutableArray.CreateBuilder<PythonProperty>();
+
+            foreach (var dotNetMember in dotNetType.GetMembers())
+            {
+                if(dotNetMember.IsStatic || 
+                    !(dotNetMember is IPropertySymbol dotNetProperty) || 
+                    IgnoreMember(dotNetType, dotNetProperty) ||
+                    IGNORED_PROPERTIES.Contains(dotNetProperty.Name))
+                {
+                    continue;
+                }
+
+                var type = ToPythonType(dotNetProperty.Type);
+                var docs = _docGenerator.Generate(dotNetProperty);
+
+                var pyProperty = new PythonProperty(dotNetProperty.Name.ToSnakeCase(), type, 
+                    !dotNetProperty.IsWriteOnly,
+                    !(dotNetProperty.IsReadOnly || (dotNetProperty.SetMethod is not null && dotNetProperty.SetMethod.IsInitOnly)),
+                    docs, dotNetProperty);
+
+                results.Add(pyProperty);
+            }
+
+            return results.ToImmutable();
+        }
+    }
+}
diff --git a/src/Tableau.Migration.PythonGenerator/Generators/PythonTypeGenerator.cs b/src/Tableau.Migration.PythonGenerator/Generators/PythonTypeGenerator.cs
new file mode 100644
index 0000000..3282bea
--- /dev/null
+++ b/src/Tableau.Migration.PythonGenerator/Generators/PythonTypeGenerator.cs
@@ -0,0 +1,137 @@
+//
+//  Copyright (c) 2024, Salesforce, Inc.
+//  SPDX-License-Identifier: Apache-2
+//  
+//  Licensed under the Apache License, Version 2.0 (the "License") 
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//  
+//  http://www.apache.org/licenses/LICENSE-2.0
+//  
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Linq;
+using Microsoft.CodeAnalysis;
+
+namespace Tableau.Migration.PythonGenerator.Generators
+{
+    internal sealed class PythonTypeGenerator : IPythonTypeGenerator
+    {
+        private readonly IPythonPropertyGenerator _propertyGenerator;
+        private readonly IPythonMethodGenerator _methodGenerator;
+        private readonly IPythonEnumValueGenerator _enumValueGenerator;
+        private readonly IPythonDocstringGenerator _docGenerator;
+
+        public PythonTypeGenerator(IPythonPropertyGenerator propertyGenerator, 
+            IPythonMethodGenerator methodGenerator,
+            IPythonEnumValueGenerator enumValueGenerator,
+            IPythonDocstringGenerator docGenerator)
+        {
+            _propertyGenerator = propertyGenerator;
+            _methodGenerator = methodGenerator;
+            _enumValueGenerator = enumValueGenerator;
+            _docGenerator = docGenerator;
+        }
+
+        private bool HasInterface(INamedTypeSymbol type, INamedTypeSymbol test)
+        {
+            foreach (var childInterface in type.AllInterfaces)
+            {
+                if(string.Equals(childInterface.ToDisplayString(), test.ToDisplayString(), System.StringComparison.Ordinal))
+                {
+                    return true;
+                }
+
+                if (HasInterface(childInterface, test))
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        private (ImmutableArray<PythonTypeReference> InheritedTypes, ImmutableArray<INamedTypeSymbol> ExcludedInterfaces) 
+            GenerateInheritedTypes(ImmutableHashSet<string> dotNetTypeNames, INamedTypeSymbol dotNetType)
+        {
+            var inheritedTypes = ImmutableArray.CreateBuilder<PythonTypeReference>();
+
+            if(dotNetType.TypeArguments.Any())
+            {
+                var genericTypes = dotNetType.TypeArguments
+                    .Select(PythonTypeReference.ForGenericType)
+                    .ToImmutableArray();
+
+                var extraImports = ImmutableArray.Create(
+                    new PythonTypeReference("TypeVar", "typing", ConversionMode.Direct),
+                    new PythonTypeReference("_generic_wrapper", "tableau_migration.migration", ConversionMode.Direct)
+                );
+
+                inheritedTypes.Add(new("Generic", "typing", ConversionMode.Direct, genericTypes, ExtraImports: extraImports));
+            }
+
+            if(dotNetType.IsOrdinalEnum())
+            {
+                inheritedTypes.Add(new("IntEnum", "enum", ConversionMode.Direct));
+            }
+            else if(dotNetType.IsStringEnum())
+            {
+                inheritedTypes.Add(new("StrEnum", "migration_enum", ConversionMode.Direct));
+            }
+
+            var interfaces = new List<INamedTypeSymbol>();
+            var excludedInterfaces = ImmutableArray.CreateBuilder<INamedTypeSymbol>();
+
+            foreach (var interfaceType in dotNetType.AllInterfaces)
+            {
+                if(dotNetTypeNames.Contains(interfaceType.ToDisplayString()))
+                {
+                    interfaces.Add(interfaceType);
+                }
+                else
+                {
+                    excludedInterfaces.Add(interfaceType);
+                }
+            }
+
+            // Remove interfaces implemented by other inherited interfaces,
+            // to reduce multi-inheritance complexity.
+            foreach(var interfaceType in interfaces.ToImmutableArray())
+            {
+                if(interfaces.Any(i => HasInterface(i, interfaceType)))
+                {
+                    interfaces.Remove(interfaceType);
+                }
+            }
+
+            inheritedTypes.AddRange(interfaces.Select(PythonTypeReference.ForDotNetType));
+
+            return (inheritedTypes.ToImmutable(), excludedInterfaces.ToImmutable());
+        }
+
+        public PythonType Generate(ImmutableHashSet<string> dotNetTypeNames, INamedTypeSymbol dotNetType)
+        {
+            (var inheritedTypes, var excludedInterfaces) = GenerateInheritedTypes(dotNetTypeNames, dotNetType);
+
+            var properties = _propertyGenerator.GenerateProperties(dotNetType);
+            var methods = _methodGenerator.GenerateMethods(dotNetType);
+            var enumValues = _enumValueGenerator.GenerateEnumValues(dotNetType);
+
+            // arg docs at the type level would be for record properties.
+            var docs = _docGenerator.Generate(dotNetType, ignoreArgs: true);
+
+            var typeRef = PythonTypeReference.ForDotNetType(dotNetType);
+
+            return new(typeRef.Name, typeRef.ImportModule!, inheritedTypes, 
+                properties, methods, enumValues, 
+                docs, dotNetType, excludedInterfaces);
+        }
+    }
+}
diff --git a/src/Tableau.Migration.PythonGenerator/INamedTypeSymbolExtensions.cs b/src/Tableau.Migration.PythonGenerator/INamedTypeSymbolExtensions.cs
new file mode 100644
index 0000000..900bf85
--- /dev/null
+++ b/src/Tableau.Migration.PythonGenerator/INamedTypeSymbolExtensions.cs
@@ -0,0 +1,34 @@
+//
+//  Copyright (c) 2024, Salesforce, Inc.
+//  SPDX-License-Identifier: Apache-2
+//  
+//  Licensed under the Apache License, Version 2.0 (the "License") 
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//  
+//  http://www.apache.org/licenses/LICENSE-2.0
+//  
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+using System;
+using Microsoft.CodeAnalysis;
+
+namespace Tableau.Migration.PythonGenerator
+{
+    public static class INamedTypeSymbolExtensions
+    {
+        public static bool IsOrdinalEnum(this INamedTypeSymbol t)
+            => t.EnumUnderlyingType is not null || string.Equals(t.BaseType?.Name, nameof(Enum), StringComparison.Ordinal);
+
+        public static bool IsStringEnum(this INamedTypeSymbol t)
+            => string.Equals(t.BaseType?.Name, nameof(StringEnum<object>), StringComparison.Ordinal);
+
+        public static bool IsAnyEnum(this INamedTypeSymbol t)
+            => t.IsOrdinalEnum() || t.IsStringEnum();
+    }
+}
diff --git a/src/Tableau.Migration.PythonGenerator/ITypeSymbolExtensions.cs b/src/Tableau.Migration.PythonGenerator/ITypeSymbolExtensions.cs
new file mode 100644
index 0000000..546076d
--- /dev/null
+++ b/src/Tableau.Migration.PythonGenerator/ITypeSymbolExtensions.cs
@@ -0,0 +1,38 @@
+//
+//  Copyright (c) 2024, Salesforce, Inc.
+//  SPDX-License-Identifier: Apache-2
+//  
+//  Licensed under the Apache License, Version 2.0 (the "License") 
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//  
+//  http://www.apache.org/licenses/LICENSE-2.0
+//  
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+using Microsoft.CodeAnalysis;
+
+namespace Tableau.Migration.PythonGenerator
+{
+    internal static class ITypeSymbolExtensions
+    {
+        public static string ToPythonModuleName(this ITypeSymbol ts)
+        {
+            var containingNs = ts.ContainingNamespace;
+            if (containingNs == null)
+            {
+                return ts.Name;
+            }
+
+            return "tableau_migration." + containingNs.ToDisplayString()
+                .Replace("Tableau.", "")
+                .Replace(".", "_")
+                .ToLower();
+        }
+    }
+}
diff --git a/src/Tableau.Migration.PythonGenerator/IndentingStringBuilder.cs b/src/Tableau.Migration.PythonGenerator/IndentingStringBuilder.cs
new file mode 100644
index 0000000..a96c8f5
--- /dev/null
+++ b/src/Tableau.Migration.PythonGenerator/IndentingStringBuilder.cs
@@ -0,0 +1,70 @@
+//
+//  Copyright (c) 2024, Salesforce, Inc.
+//  SPDX-License-Identifier: Apache-2
+//  
+//  Licensed under the Apache License, Version 2.0 (the "License") 
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//  
+//  http://www.apache.org/licenses/LICENSE-2.0
+//  
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+using System;
+using System.Text;
+
+namespace Tableau.Migration.PythonGenerator
+{
+    internal sealed class IndentingStringBuilder : IDisposable
+    {
+        private readonly string _newLine;
+        private readonly uint _indentLevel;
+
+        private const string INDENT = "    ";
+
+        public StringBuilder NonIndentingBuilder { get; }
+
+        public IndentingStringBuilder(StringBuilder builder, uint indentLevel = 0)
+            : this(builder, Environment.NewLine, indentLevel)
+        { }
+
+        public IndentingStringBuilder(StringBuilder builder, string newLine, uint indentLevel = 0)
+        {
+            NonIndentingBuilder = builder;
+            _newLine = newLine;
+            _indentLevel = indentLevel;
+        }
+
+        private void Indent()
+        {
+            for(uint i = 0; i < _indentLevel; i++)
+            {
+                NonIndentingBuilder.Append(INDENT);
+            }
+        }
+
+        public IndentingStringBuilder AppendLine(string? text = null)
+        {
+            Indent();
+            NonIndentingBuilder.Append(text);
+            NonIndentingBuilder.Append(_newLine);
+            return this;
+        }
+
+        public IndentingStringBuilder AppendLineAndIndent(string text)
+        {
+            AppendLine(text);
+            return new IndentingStringBuilder(NonIndentingBuilder, _indentLevel + 1);
+        }
+
+        public override string ToString() => NonIndentingBuilder.ToString();
+
+        public void Dispose()
+        { }
+    }
+}
diff --git a/src/Tableau.Migration.PythonGenerator/Keywords/Dotnet/Namespaces.cs b/src/Tableau.Migration.PythonGenerator/Keywords/Dotnet/Namespaces.cs
new file mode 100644
index 0000000..1527331
--- /dev/null
+++ b/src/Tableau.Migration.PythonGenerator/Keywords/Dotnet/Namespaces.cs
@@ -0,0 +1,27 @@
+//
+//  Copyright (c) 2024, Salesforce, Inc.
+//  SPDX-License-Identifier: Apache-2
+//  
+//  Licensed under the Apache License, Version 2.0 (the "License") 
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//  
+//  http://www.apache.org/licenses/LICENSE-2.0
+//  
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+namespace Tableau.Migration.PythonGenerator.Keywords.Dotnet
+{
+    internal class Namespaces
+    {
+        public const string SYSTEM = "System";
+        public const string TABLEAU_MIGRATION = "Tableau.Migration";
+        public const string SYSTEM_COLLECTIONS_GENERIC = "System.Collections.Generic";
+        public const string SYSTEM_EXCEPTION = "System.Exception";
+    }
+}
diff --git a/src/Tableau.Migration.PythonGenerator/Keywords/Dotnet/TypeAliases.cs b/src/Tableau.Migration.PythonGenerator/Keywords/Dotnet/TypeAliases.cs
new file mode 100644
index 0000000..0ad80b1
--- /dev/null
+++ b/src/Tableau.Migration.PythonGenerator/Keywords/Dotnet/TypeAliases.cs
@@ -0,0 +1,26 @@
+//
+//  Copyright (c) 2024, Salesforce, Inc.
+//  SPDX-License-Identifier: Apache-2
+//  
+//  Licensed under the Apache License, Version 2.0 (the "License") 
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//  
+//  http://www.apache.org/licenses/LICENSE-2.0
+//  
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+namespace Tableau.Migration.PythonGenerator.Keywords.Dotnet
+{
+    internal class TypeAliases
+    {
+        public const string LIST = "DotnetList";
+        public const string HASH_SET = "DotnetHashSet";
+        public const string STRING = "String";
+    }
+}
diff --git a/src/Tableau.Migration.PythonGenerator/Keywords/Dotnet/Types.cs b/src/Tableau.Migration.PythonGenerator/Keywords/Dotnet/Types.cs
new file mode 100644
index 0000000..74a6d4f
--- /dev/null
+++ b/src/Tableau.Migration.PythonGenerator/Keywords/Dotnet/Types.cs
@@ -0,0 +1,33 @@
+//
+//  Copyright (c) 2024, Salesforce, Inc.
+//  SPDX-License-Identifier: Apache-2
+//  
+//  Licensed under the Apache License, Version 2.0 (the "License") 
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//  
+//  http://www.apache.org/licenses/LICENSE-2.0
+//  
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+namespace Tableau.Migration.PythonGenerator.Keywords.Dotnet
+{
+    internal class Types
+    {
+        public const string NULLABLE = "Nullable";
+        public const string LIST = "List";
+        public const string BOOLEAN = "Boolean";
+        public const string HASH_SET = "HashSet";
+        public const string STRING = "String";
+        public const string STRING_SIMPLIFIED = "string";
+        public const string GUID = "Guid";
+        public const string LONG = "long";
+        public const string INT = "int";
+
+    }
+}
diff --git a/src/Tableau.Migration.PythonGenerator/Keywords/Python/Modules.cs b/src/Tableau.Migration.PythonGenerator/Keywords/Python/Modules.cs
new file mode 100644
index 0000000..4af5266
--- /dev/null
+++ b/src/Tableau.Migration.PythonGenerator/Keywords/Python/Modules.cs
@@ -0,0 +1,27 @@
+//
+//  Copyright (c) 2024, Salesforce, Inc.
+//  SPDX-License-Identifier: Apache-2
+//  
+//  Licensed under the Apache License, Version 2.0 (the "License") 
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//  
+//  http://www.apache.org/licenses/LICENSE-2.0
+//  
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+namespace Tableau.Migration.PythonGenerator.Keywords.Python
+{
+    internal static class Modules
+    {
+
+        public const string AUTOFIXTURE = "tests.helpers.autofixture";
+        public const string UUID = "uuid";
+        public const string TYPING = "typing";
+    }
+}
\ No newline at end of file
diff --git a/src/Tableau.Migration.PythonGenerator/Keywords/Python/Types.cs b/src/Tableau.Migration.PythonGenerator/Keywords/Python/Types.cs
new file mode 100644
index 0000000..202de7b
--- /dev/null
+++ b/src/Tableau.Migration.PythonGenerator/Keywords/Python/Types.cs
@@ -0,0 +1,31 @@
+//
+//  Copyright (c) 2024, Salesforce, Inc.
+//  SPDX-License-Identifier: Apache-2
+//  
+//  Licensed under the Apache License, Version 2.0 (the "License") 
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//  
+//  http://www.apache.org/licenses/LICENSE-2.0
+//  
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+namespace Tableau.Migration.PythonGenerator.Keywords.Python
+{
+    internal static class Types
+    {
+        public const string AUTOFIXTURE_TESTBASE = "AutoFixtureTestBase";
+        public const string UUID = "UUID";
+        public const string SEQUENCE = "Sequence";
+        public const string SET = "Set";
+        public const string LIST_WRAPPED = "List";
+        public const string BOOL = "bool";
+        public const string STR = "str";
+        public const string INT = "int";
+    }
+}
\ No newline at end of file
diff --git a/src/Tableau.Migration.PythonGenerator/Program.cs b/src/Tableau.Migration.PythonGenerator/Program.cs
new file mode 100644
index 0000000..c074996
--- /dev/null
+++ b/src/Tableau.Migration.PythonGenerator/Program.cs
@@ -0,0 +1,59 @@
+//
+//  Copyright (c) 2024, Salesforce, Inc.
+//  SPDX-License-Identifier: Apache-2
+//  
+//  Licensed under the Apache License, Version 2.0 (the "License") 
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//  
+//  http://www.apache.org/licenses/LICENSE-2.0
+//  
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using Tableau.Migration.PythonGenerator.Config;
+using Tableau.Migration.PythonGenerator.Generators;
+using Tableau.Migration.PythonGenerator.Writers;
+
+namespace Tableau.Migration.PythonGenerator
+{
+    public static class Program
+    {
+        public static async Task Main(string[] args)
+        {
+            using var host = Host.CreateDefaultBuilder(args)
+                .ConfigureServices((ctx, services) =>
+                {
+                    services
+                        .Configure<PythonGeneratorOptions>(ctx.Configuration)
+                        .AddSingleton<IPythonGenerator, Generators.PythonGenerator>()
+                        .AddSingleton<IPythonTypeGenerator, PythonTypeGenerator>()
+                        .AddSingleton<IPythonDocstringGenerator, PythonDocstringGenerator>()
+                        .AddSingleton<IPythonPropertyGenerator, PythonPropertyGenerator>()
+                        .AddSingleton<IPythonMethodGenerator, PythonMethodGenerator>()
+                        .AddSingleton<IPythonEnumValueGenerator, PythonEnumValueGenerator>()
+                        .AddSingleton<IPythonWriter, PythonWriter>()
+                        .AddSingleton<IPythonTypeWriter, PythonTypeWriter>()
+                        .AddSingleton<IPythonDocstringWriter, PythonDocstringWriter>()
+                        .AddSingleton<IPythonPropertyWriter, PythonPropertyWriter>()
+                        .AddSingleton<IPythonMethodWriter, PythonMethodWriter>()
+                        .AddSingleton<IPythonEnumValueWriter, PythonEnumValueWriter>()
+                        .AddSingleton<IPythonTestWriter, PythonTestWriter>()
+                        .AddSingleton<IPythonClassTestWriter, PythonClassTestWriter>()
+                        .AddSingleton<IPythonPropertyTestWriter, PythonPropertyTestWriter>()
+                        .AddSingleton<IPythonConstructorTestWriter, PythonConstructorTestWriter>()
+                        .AddHostedService<PythonGeneratorService>();
+                })
+                .Build();
+
+            await host.RunAsync();
+        }
+    }
+}
diff --git a/src/Tableau.Migration.PythonGenerator/PythonArgDocstring.cs b/src/Tableau.Migration.PythonGenerator/PythonArgDocstring.cs
new file mode 100644
index 0000000..49eb0d7
--- /dev/null
+++ b/src/Tableau.Migration.PythonGenerator/PythonArgDocstring.cs
@@ -0,0 +1,22 @@
+//
+//  Copyright (c) 2024, Salesforce, Inc.
+//  SPDX-License-Identifier: Apache-2
+//  
+//  Licensed under the Apache License, Version 2.0 (the "License") 
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//  
+//  http://www.apache.org/licenses/LICENSE-2.0
+//  
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+namespace Tableau.Migration.PythonGenerator
+{
+    internal sealed record PythonArgDocstring(string Name, string Documentation)
+    { }
+}
diff --git a/src/Tableau.Migration.PythonGenerator/PythonDocstring.cs b/src/Tableau.Migration.PythonGenerator/PythonDocstring.cs
new file mode 100644
index 0000000..2603786
--- /dev/null
+++ b/src/Tableau.Migration.PythonGenerator/PythonDocstring.cs
@@ -0,0 +1,49 @@
+//
+//  Copyright (c) 2024, Salesforce, Inc.
+//  SPDX-License-Identifier: Apache-2
+//  
+//  Licensed under the Apache License, Version 2.0 (the "License") 
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//  
+//  http://www.apache.org/licenses/LICENSE-2.0
+//  
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+using System.Collections.Immutable;
+using System.Linq;
+
+namespace Tableau.Migration.PythonGenerator
+{
+    internal sealed record PythonDocstring(string Summary, ImmutableArray<PythonArgDocstring> Args, string? Returns = null)
+    {
+        /// <summary>
+        /// Gets whether or not the docstring has "extra info,"
+        /// i.e. more than just a summary.
+        /// </summary>
+        public bool HasExtraInfo => HasReturns || HasArgs;
+
+        /// <summary>
+        /// Gets whether or not the docstring has a string for a return value.
+        /// </summary>
+        public bool HasReturns => !string.IsNullOrWhiteSpace(Returns);
+
+        /// <summary>
+        /// Gets whether or not the docstring has a strings for a arguments.
+        /// </summary>
+        public bool HasArgs => Args.Any();
+
+        public PythonDocstring(string summary)
+            : this(summary, ImmutableArray<PythonArgDocstring>.Empty)
+        { }
+
+        public PythonDocstring(string summary, string returns, params (string ArgName, string ArgValue)[] args)
+            : this(summary, args.Select(a => new PythonArgDocstring(a.ArgName, a.ArgValue)).ToImmutableArray(), returns)
+        { }
+    }
+}
diff --git a/src/Tableau.Migration.PythonGenerator/PythonEnumValue.cs b/src/Tableau.Migration.PythonGenerator/PythonEnumValue.cs
new file mode 100644
index 0000000..5885760
--- /dev/null
+++ b/src/Tableau.Migration.PythonGenerator/PythonEnumValue.cs
@@ -0,0 +1,22 @@
+//
+//  Copyright (c) 2024, Salesforce, Inc.
+//  SPDX-License-Identifier: Apache-2
+//  
+//  Licensed under the Apache License, Version 2.0 (the "License") 
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//  
+//  http://www.apache.org/licenses/LICENSE-2.0
+//  
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+namespace Tableau.Migration.PythonGenerator
+{
+    internal sealed record PythonEnumValue(string Name, object Value, PythonDocstring? Documentation)
+    { }
+}
diff --git a/src/Tableau.Migration.PythonGenerator/PythonGenerationList.cs b/src/Tableau.Migration.PythonGenerator/PythonGenerationList.cs
new file mode 100644
index 0000000..5e65cdd
--- /dev/null
+++ b/src/Tableau.Migration.PythonGenerator/PythonGenerationList.cs
@@ -0,0 +1,125 @@
+//
+//  Copyright (c) 2024, Salesforce, Inc.
+//  SPDX-License-Identifier: Apache-2
+//  
+//  Licensed under the Apache License, Version 2.0 (the "License") 
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//  
+//  http://www.apache.org/licenses/LICENSE-2.0
+//  
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Linq;
+using Microsoft.CodeAnalysis;
+using Tableau.Migration.Api.Rest.Models;
+using Tableau.Migration.Api.Rest.Models.Types;
+using Tableau.Migration.Content;
+using Tableau.Migration.Content.Permissions;
+using Tableau.Migration.Engine;
+using Tableau.Migration.Engine.Actions;
+using Tableau.Migration.Engine.Hooks.Mappings;
+using Tableau.Migration.Engine.Hooks.PostPublish;
+using Tableau.Migration.Engine.Manifest;
+using Tableau.Migration.Engine.Migrators;
+using Tableau.Migration.Engine.Migrators.Batch;
+
+namespace Tableau.Migration.PythonGenerator
+{
+    internal static class PythonGenerationList
+    {
+        private static readonly ImmutableHashSet<string> TYPES_TO_GENERATE = ToTypeNameHash(
+            typeof(ContentLocation),
+            typeof(IContentReference),
+            typeof(IResult),
+            typeof(MigrationCompletionStatus),
+
+            typeof(MigrationManifestEntryStatus),
+            typeof(IMigrationManifestEntry),
+            typeof(IMigrationManifestEntryEditor),
+
+            typeof(IConnectionsContent),
+            typeof(IContainerContent),
+            typeof(IWithDomain),
+            typeof(IUsernameContent),
+            typeof(IUser),
+            typeof(IGroup),
+            typeof(IDescriptionContent),
+            typeof(IProject),
+            typeof(IExtractContent),
+            typeof(IPublishedContent),
+            typeof(IDataSource),
+            typeof(IWorkbook),
+            typeof(IConnection),
+            typeof(IDataSourceDetails),
+            typeof(IView),
+            typeof(ITag),
+            typeof(IPublishableDataSource),
+            typeof(IPublishableWorkbook),
+            typeof(IGroupUser),
+            typeof(IWorkbookDetails),
+            typeof(ILabel),
+
+            typeof(ContentMigrationItem<>),
+            typeof(ContentItemPostPublishContext<,>),
+            typeof(ContentMappingContext<>),
+            typeof(BulkPostPublishContext<>),
+            typeof(IContentItemMigrationResult<>),
+            typeof(IContentBatchMigrationResult<>),
+            typeof(IMigrationActionResult),
+            typeof(IPublishableGroup),
+            typeof(IWithTags),
+            typeof(IWithOwner),
+
+            typeof(AdministratorLevels),
+            typeof(ContentPermissions),
+            typeof(ExtractEncryptionModes),
+            typeof(LabelCategories),
+            typeof(LicenseLevels),
+            typeof(PermissionsCapabilityModes),
+            typeof(PermissionsCapabilityNames),
+            typeof(SiteRoles),
+            typeof(AuthenticationTypes),
+            typeof(DataSourceFileTypes),
+            typeof(WorkbookFileTypes),
+            typeof(GranteeType),
+            typeof(IGranteeCapability),
+            typeof(IPermissions),
+            typeof(ICapability)
+        );
+
+        private static ImmutableHashSet<string> ToTypeNameHash(params Type[] types)
+            => types.Select(t => t.FullName!).ToImmutableHashSet();
+
+        private static IEnumerable<INamedTypeSymbol> FindTypesToGenerateForNamespace(INamespaceSymbol ns)
+        {
+            foreach (var type in ns.GetTypeMembers())
+            {
+                var typeName = $"{type.ContainingNamespace.ToDisplayString()}.{type.MetadataName}";
+                if (TYPES_TO_GENERATE.Contains(typeName))
+                {
+                    yield return type;
+                }
+            }
+
+            foreach (var childNamespace in ns.GetNamespaceMembers())
+            {
+                foreach (var type in FindTypesToGenerateForNamespace(childNamespace))
+                {
+                    yield return type;
+                }
+            }
+        }
+
+        internal static ImmutableArray<INamedTypeSymbol> FindTypesToGenerate(INamespaceSymbol rootNamespace)
+            => [.. FindTypesToGenerateForNamespace(rootNamespace)];
+    }
+}
\ No newline at end of file
diff --git a/src/Tableau.Migration.PythonGenerator/PythonGeneratorService.cs b/src/Tableau.Migration.PythonGenerator/PythonGeneratorService.cs
new file mode 100644
index 0000000..5615ea9
--- /dev/null
+++ b/src/Tableau.Migration.PythonGenerator/PythonGeneratorService.cs
@@ -0,0 +1,75 @@
+//
+//  Copyright (c) 2024, Salesforce, Inc.
+//  SPDX-License-Identifier: Apache-2
+//  
+//  Licensed under the Apache License, Version 2.0 (the "License") 
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//  
+//  http://www.apache.org/licenses/LICENSE-2.0
+//  
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+using System;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Options;
+using Tableau.Migration.PythonGenerator.Config;
+using Tableau.Migration.PythonGenerator.Generators;
+using Tableau.Migration.PythonGenerator.Writers;
+
+namespace Tableau.Migration.PythonGenerator
+{
+    internal sealed class PythonGeneratorService : IHostedService
+    {
+        private readonly IHostApplicationLifetime _appLifetime;
+        private readonly PythonGeneratorOptions _options;
+        private readonly IPythonGenerator _pyGenerator;
+        private readonly IPythonWriter _pyWriter;
+
+        public PythonGeneratorService(IHostApplicationLifetime appLifeTime,
+            IOptions<PythonGeneratorOptions> options,
+            IPythonGenerator pyGenerator,
+            IPythonWriter pyWriter)
+        {
+            _appLifetime = appLifeTime;
+            _options = options.Value;
+            _pyGenerator = pyGenerator;
+            _pyWriter = pyWriter;
+        }
+
+        public async Task StartAsync(CancellationToken cancel)
+        {
+            Console.WriteLine("Generating Python Wrappers...");
+            Console.WriteLine("Import Path:" + _options.ImportPath);
+            Console.WriteLine("Output Path:" + _options.OutputPath);
+
+            var compilation = CSharpCompilation.Create(typeof(ContentLocation).Assembly.GetName().Name)
+                .AddReferences(MetadataReference.CreateFromFile(Path.Combine(_options.ImportPath, "Tableau.Migration.dll"),
+                    documentation: XmlDocumentationProvider.CreateFromFile(Path.Combine(_options.ImportPath, "Tableau.Migration.xml"))));
+
+            var module = compilation.SourceModule.ReferencedAssemblySymbols.Single().Modules.Single();
+            var rootNamespace = module.GlobalNamespace.GetNamespaceMembers().Single().GetNamespaceMembers().Single();
+
+            var dotNetTypes = PythonGenerationList.FindTypesToGenerate(rootNamespace);
+
+            var pyTypes = _pyGenerator.Generate(dotNetTypes);
+
+            await _pyWriter.WriteAsync(pyTypes, cancel);
+
+            _appLifetime.StopApplication();
+        }
+
+        public Task StopAsync(CancellationToken cancel) => Task.CompletedTask;
+    }
+}
diff --git a/src/Tableau.Migration.PythonGenerator/PythonMethod.cs b/src/Tableau.Migration.PythonGenerator/PythonMethod.cs
new file mode 100644
index 0000000..968d2c4
--- /dev/null
+++ b/src/Tableau.Migration.PythonGenerator/PythonMethod.cs
@@ -0,0 +1,26 @@
+//
+//  Copyright (c) 2024, Salesforce, Inc.
+//  SPDX-License-Identifier: Apache-2
+//  
+//  Licensed under the Apache License, Version 2.0 (the "License") 
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//  
+//  http://www.apache.org/licenses/LICENSE-2.0
+//  
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+using System.Collections.Immutable;
+using Microsoft.CodeAnalysis;
+
+namespace Tableau.Migration.PythonGenerator
+{
+    internal sealed record PythonMethod(string Name, PythonTypeReference? ReturnType, ImmutableArray<PythonMethodArgument> Arguments,
+        bool IsStatic, PythonDocstring? Documentation, IMethodSymbol DotNetMethod)
+    { }
+}
diff --git a/src/Tableau.Migration.PythonGenerator/PythonMethodArgument.cs b/src/Tableau.Migration.PythonGenerator/PythonMethodArgument.cs
new file mode 100644
index 0000000..a0972d8
--- /dev/null
+++ b/src/Tableau.Migration.PythonGenerator/PythonMethodArgument.cs
@@ -0,0 +1,22 @@
+//
+//  Copyright (c) 2024, Salesforce, Inc.
+//  SPDX-License-Identifier: Apache-2
+//  
+//  Licensed under the Apache License, Version 2.0 (the "License") 
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//  
+//  http://www.apache.org/licenses/LICENSE-2.0
+//  
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+namespace Tableau.Migration.PythonGenerator
+{
+    internal sealed record PythonMethodArgument(string Name, PythonTypeReference Type)
+    { }
+}
diff --git a/src/Tableau.Migration/Engine/Migrators/IContentMigrationHook.cs b/src/Tableau.Migration.PythonGenerator/PythonProperty.cs
similarity index 69%
rename from src/Tableau.Migration/Engine/Migrators/IContentMigrationHook.cs
rename to src/Tableau.Migration.PythonGenerator/PythonProperty.cs
index 1e5858d..0d076fb 100644
--- a/src/Tableau.Migration/Engine/Migrators/IContentMigrationHook.cs
+++ b/src/Tableau.Migration.PythonGenerator/PythonProperty.cs
@@ -15,13 +15,11 @@
 //  limitations under the License.
 //
 
-using Tableau.Migration.Engine.Hooks;
+using Microsoft.CodeAnalysis;
 
-namespace Tableau.Migration.Engine.Migrators
+namespace Tableau.Migration.PythonGenerator
 {
-    /// <summary>
-    /// Interface representing a hook called for a single content item.
-    /// </summary>
-    public interface IContentMigrationHook<TContent> : IMigrationHook<IContentItemMigrationResult<TContent>>
+    internal sealed record PythonProperty(string Name, PythonTypeReference Type, bool Getter, bool Setter, 
+        PythonDocstring? Documentation, IPropertySymbol DotNetProperty)
     { }
 }
diff --git a/src/Tableau.Migration.PythonGenerator/PythonType.cs b/src/Tableau.Migration.PythonGenerator/PythonType.cs
new file mode 100644
index 0000000..28b4f04
--- /dev/null
+++ b/src/Tableau.Migration.PythonGenerator/PythonType.cs
@@ -0,0 +1,95 @@
+//
+//  Copyright (c) 2024, Salesforce, Inc.
+//  SPDX-License-Identifier: Apache-2
+//  
+//  Licensed under the Apache License, Version 2.0 (the "License") 
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//  
+//  http://www.apache.org/licenses/LICENSE-2.0
+//  
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Linq;
+using Microsoft.CodeAnalysis;
+
+namespace Tableau.Migration.PythonGenerator
+{
+    internal sealed record PythonType(string Name, string Module,
+        ImmutableArray<PythonTypeReference> InheritedTypes,
+        ImmutableArray<PythonProperty> Properties, ImmutableArray<PythonMethod> Methods, ImmutableArray<PythonEnumValue> EnumValues,
+        PythonDocstring? Documentation, INamedTypeSymbol DotNetType, ImmutableArray<INamedTypeSymbol> ExcludedInterfaces)
+        : IEquatable<PythonTypeReference>
+    {
+        public IEnumerable<PythonTypeReference> GetAllTypeReferences()
+        {
+            //Top-level Dotnet type ref
+            if(!DotNetType.IsAnyEnum())
+            {
+                yield return new PythonTypeReference(DotNetType.Name, ImportModule: DotNetType.ContainingNamespace.ToDisplayString(), ConversionMode.Wrap);
+            }
+
+            foreach(var t in InheritedTypes)
+            {
+                yield return t;
+            }
+
+            foreach(var m in GetMemberTypeReferences())
+            {
+                yield return m;
+            }
+        }
+
+        public IEnumerable<PythonTypeReference> GetMemberTypeReferences()
+        {
+            foreach (var p in Properties)
+            {
+                yield return p.Type;
+            }
+
+            foreach (var m in Methods)
+            {
+                if (m.ReturnType is not null)
+                {
+                    yield return m.ReturnType;
+                }
+
+                foreach (var arg in m.Arguments)
+                {
+                    yield return arg.Type;
+                }
+            }
+        }
+
+        public bool Equals(PythonTypeReference? other)
+        {
+            if(other is null)
+            {
+                return false;
+            }
+
+            if(!string.Equals(Name, other.Name, System.StringComparison.Ordinal))
+            {
+                return false;
+            }
+
+            if (!string.Equals(Module, other.ImportModule, System.StringComparison.Ordinal))
+            {
+                return false;
+            }
+
+            return true;
+        }
+
+        public bool HasSelfTypeReference()
+            => GetMemberTypeReferences().Any(Equals);
+    }
+}
diff --git a/src/Tableau.Migration.PythonGenerator/PythonTypeCache.cs b/src/Tableau.Migration.PythonGenerator/PythonTypeCache.cs
new file mode 100644
index 0000000..1402cfb
--- /dev/null
+++ b/src/Tableau.Migration.PythonGenerator/PythonTypeCache.cs
@@ -0,0 +1,36 @@
+//
+//  Copyright (c) 2024, Salesforce, Inc.
+//  SPDX-License-Identifier: Apache-2
+//  
+//  Licensed under the Apache License, Version 2.0 (the "License") 
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//  
+//  http://www.apache.org/licenses/LICENSE-2.0
+//  
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Linq;
+
+namespace Tableau.Migration.PythonGenerator
+{
+    internal sealed class PythonTypeCache
+    {
+        public ImmutableArray<PythonType> Types { get; }
+
+        public PythonTypeCache(IEnumerable<PythonType> types)
+        {
+            Types = types.ToImmutableArray();
+        }
+
+        public PythonType? Find(PythonTypeReference r)
+            => Types.FirstOrDefault(t => t.Equals(r));
+    }
+}
diff --git a/src/Tableau.Migration.PythonGenerator/PythonTypeReference.cs b/src/Tableau.Migration.PythonGenerator/PythonTypeReference.cs
new file mode 100644
index 0000000..a3c52a5
--- /dev/null
+++ b/src/Tableau.Migration.PythonGenerator/PythonTypeReference.cs
@@ -0,0 +1,86 @@
+//
+//  Copyright (c) 2024, Salesforce, Inc.
+//  SPDX-License-Identifier: Apache-2
+//  
+//  Licensed under the Apache License, Version 2.0 (the "License") 
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//  
+//  http://www.apache.org/licenses/LICENSE-2.0
+//  
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Linq;
+using Microsoft.CodeAnalysis;
+
+namespace Tableau.Migration.PythonGenerator
+{
+    internal sealed record PythonTypeReference(string Name, string? ImportModule,
+        ConversionMode ConversionMode, ImmutableArray<PythonTypeReference>? GenericTypes = null,
+        string? WrapType = null, string? DotNetParseFunction = null,
+        ImmutableArray<PythonTypeReference>? ExtraImports = null,
+        ImmutableArray<ITypeSymbol>? DotnetTypes = null,
+        string? ImportAlias = null
+        )
+    {
+        public string GenericDefinitionName
+            => GenericTypes is null ? Name : $"{Name}[{string.Join(", ", GenericTypes.Value.Select(g => g.GenericDefinitionName))}]";
+
+        public bool IsExplicitReference => Name.Contains(".");
+
+        private static string ToPythonTypeName(ITypeSymbol dotNetType)
+        {
+            var typeName = dotNetType.Name;
+            if (typeName.StartsWith("I"))
+                typeName = typeName.Substring(1);
+
+            return "Py" + typeName;
+        }
+
+        public IEnumerable<PythonTypeReference> UnwrapGenerics()
+        {
+            yield return this;
+
+            if (GenericTypes is not null)
+            {
+                foreach (var generic in GenericTypes)
+                {
+                    yield return generic;
+                }
+            }
+        }
+
+        public static PythonTypeReference ForGenericType(ITypeSymbol genericType)
+            => new PythonTypeReference(genericType.Name, null, ConversionMode.WrapGeneric);
+
+        public static PythonTypeReference ForDotNetType(ITypeSymbol dotNetType)
+        {
+            var typeName = ToPythonTypeName(dotNetType);
+
+            var mode = ConversionMode.Wrap;
+
+            ImmutableArray<PythonTypeReference>? genericTypes = null;
+            if (dotNetType is INamedTypeSymbol namedType)
+            {
+                if (namedType.TypeArguments.Any())
+                {
+                    genericTypes = namedType.TypeArguments.Select(ForGenericType).ToImmutableArray();
+                }
+
+                if (namedType.IsOrdinalEnum())
+                {
+                    mode = ConversionMode.Enum;
+                }
+            }
+
+            return new(typeName, dotNetType.ToPythonModuleName(), mode, genericTypes);
+        }
+    }
+}
diff --git a/src/Tableau.Migration.PythonGenerator/README.md b/src/Tableau.Migration.PythonGenerator/README.md
new file mode 100644
index 0000000..bf8f88d
--- /dev/null
+++ b/src/Tableau.Migration.PythonGenerator/README.md
@@ -0,0 +1,24 @@
+# Migration SDK Python Generator
+
+## About
+
+The Migration SDK Python generator creates wrapper code for a selection of C# types.
+A custom generator is used due to the bespoke nature of the Python wrappers.
+The generated code is designed to work with a subset of types and allow for manual wrapping of types that are difficult to wrap or pre-date the generator.
+
+## Usage
+
+The generator automatically runs when built, and is designed to output as part of local and scripted builds.
+To add a new type to generate wrappers for, update the list in [`PythonGenerationList.cs`](PythonGenerationList.cs)
+
+### Hints
+
+The [`appsettings.json`](appsettings.json) file contains hints for the generator on a per-namespace/per-type basis:
+
+- `excludedMembers` type hint: An array of strings for member names (methods or properties) not not generate wrappers for.
+
+## Limitations
+
+The current generator has the following limitations that would need to be addressed to generate code for types making use of these features:
+
+- Overloaded methods
diff --git a/src/Tableau.Migration.PythonGenerator/StringExtensions.cs b/src/Tableau.Migration.PythonGenerator/StringExtensions.cs
new file mode 100644
index 0000000..895cf70
--- /dev/null
+++ b/src/Tableau.Migration.PythonGenerator/StringExtensions.cs
@@ -0,0 +1,55 @@
+//
+//  Copyright (c) 2024, Salesforce, Inc.
+//  SPDX-License-Identifier: Apache-2
+//  
+//  Licensed under the Apache License, Version 2.0 (the "License") 
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//  
+//  http://www.apache.org/licenses/LICENSE-2.0
+//  
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+using System.Diagnostics.CodeAnalysis;
+using System.Text;
+
+namespace Tableau.Migration.PythonGenerator
+{
+    internal static class StringExtensions
+    {
+        [return: NotNullIfNotNull(nameof(s))]
+        public static string? ToSnakeCase(this string? s)
+        {
+            if(string.IsNullOrEmpty(s))
+            {
+                return s;
+            }
+
+            var sb = new StringBuilder();
+            sb.Append(char.ToLowerInvariant(s[0]));
+            for (int i = 1; i < s.Length; ++i)
+            {
+                char c = s[i];
+                if (char.IsUpper(c))
+                {
+                    sb.Append('_');
+                    sb.Append(char.ToLowerInvariant(c));
+                }
+                else
+                {
+                    sb.Append(c);
+                }
+            }
+            return sb.ToString();
+        }
+
+        [return: NotNullIfNotNull(nameof(s))]
+        public static string? ToConstantCase(this string? s)
+            => ToSnakeCase(s)?.ToUpper();
+    }
+}
diff --git a/src/Tableau.Migration.PythonGenerator/Tableau.Migration.PythonGenerator.csproj b/src/Tableau.Migration.PythonGenerator/Tableau.Migration.PythonGenerator.csproj
new file mode 100644
index 0000000..d26d1ba
--- /dev/null
+++ b/src/Tableau.Migration.PythonGenerator/Tableau.Migration.PythonGenerator.csproj
@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk">
+    <PropertyGroup>
+	    <Title>Tableau Migration SDK Python Wrapper Generator</Title>
+        <OutputType>Exe</OutputType>
+        <TargetFramework>net8.0</TargetFramework>
+		<!-- Don't warn on ConfigureAwait on console application -->
+		<NoWarn>CA2007</NoWarn>
+    </PropertyGroup>
+	<ItemGroup>
+		<ProjectReference Include="../Tableau.Migration/Tableau.Migration.csproj" />
+	</ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0" />
+		<PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.8.0" />
+		<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
+	</ItemGroup>
+	<Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition="$(MIG_SDK_GENERATE_PYTHON.ToLower()) != 'false'">
+		<Exec Command="$(OutputPath)$(AssemblyName) --ImportPath=&quot;$(OutputPath.TrimEnd('\'))&quot; --OutputPath=&quot;$(ProjectDir)..\Python\src\tableau_migration&quot;" />
+	</Target>
+</Project>
diff --git a/src/Tableau.Migration.PythonGenerator/Writers/GeneratedPythonSegment.cs b/src/Tableau.Migration.PythonGenerator/Writers/GeneratedPythonSegment.cs
new file mode 100644
index 0000000..c773211
--- /dev/null
+++ b/src/Tableau.Migration.PythonGenerator/Writers/GeneratedPythonSegment.cs
@@ -0,0 +1,104 @@
+//
+//  Copyright (c) 2024, Salesforce, Inc.
+//  SPDX-License-Identifier: Apache-2
+//  
+//  Licensed under the Apache License, Version 2.0 (the "License") 
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//  
+//  http://www.apache.org/licenses/LICENSE-2.0
+//  
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+using System;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Tableau.Migration.PythonGenerator.Writers
+{
+    internal sealed class GeneratedPythonSegment : IAsyncDisposable
+    {
+        private const string BEGIN_REGION = "# region _generated";
+        private const string END_REGION = "# endregion";
+
+        private readonly string _path;
+        private readonly string? _tailContent;
+
+        public IndentingStringBuilder StringBuilder { get; }
+
+        private GeneratedPythonSegment(string path, IndentingStringBuilder stringBuilder, string? tailContent) 
+        {
+            _path = path;
+            StringBuilder = stringBuilder;
+            _tailContent = tailContent;
+        }
+
+        private static async ValueTask<(IndentingStringBuilder StringBuilder, string? TailContent)> InitializeAsync(Stream stream, CancellationToken cancel)
+        {
+            using var reader = new StreamReader(stream, leaveOpen: true);
+            var text = await reader.ReadToEndAsync(cancel);
+
+            var newLine = text.Contains("\r") ? "\r\n" : "\n";
+
+            IndentingStringBuilder sb = new(new(), newLine);
+            string? tailContent = null;
+
+            var regionStartIndex = text.IndexOf(BEGIN_REGION);
+            if(regionStartIndex == -1)
+            {
+                sb.NonIndentingBuilder.Append(text);
+            }
+            else
+            {
+                if(regionStartIndex > 0)
+                {
+                    sb.NonIndentingBuilder.Append(text.Substring(0, regionStartIndex));
+                }
+
+                var regionEndIndex = text.IndexOf(END_REGION, regionStartIndex);
+                if(regionEndIndex != -1)
+                {
+                    var tailIndex = regionEndIndex + END_REGION.Length;
+                    if(tailIndex < text.Length - 1)
+                    {
+                        tailContent = text.Substring(tailIndex).TrimStart();
+                    }
+                }
+            }
+
+            sb.AppendLine(BEGIN_REGION);
+            sb.AppendLine();
+
+            return (sb, tailContent);
+        }
+
+        public static async ValueTask<GeneratedPythonSegment> OpenAsync(string path, CancellationToken cancel)
+        {
+            await using var stream = File.Open(path, FileMode.OpenOrCreate, FileAccess.Read);
+
+            var init = await InitializeAsync(stream, cancel);
+
+            return new GeneratedPythonSegment(path, init.StringBuilder, init.TailContent);
+        }
+
+        public async ValueTask DisposeAsync()
+        {
+            StringBuilder.AppendLine();
+            StringBuilder.AppendLine(END_REGION);
+
+            if (_tailContent is not null)
+            {
+                StringBuilder.AppendLine();
+                StringBuilder.NonIndentingBuilder.Append(_tailContent);
+            }
+
+            await File.WriteAllTextAsync(_path, StringBuilder.ToString());
+        }
+    }
+}
diff --git a/src/Tableau.Migration.PythonGenerator/Writers/IPythonClassTestWriter.cs b/src/Tableau.Migration.PythonGenerator/Writers/IPythonClassTestWriter.cs
new file mode 100644
index 0000000..4f5a790
--- /dev/null
+++ b/src/Tableau.Migration.PythonGenerator/Writers/IPythonClassTestWriter.cs
@@ -0,0 +1,24 @@
+//
+//  Copyright (c) 2024, Salesforce, Inc.
+//  SPDX-License-Identifier: Apache-2
+//  
+//  Licensed under the Apache License, Version 2.0 (the "License") 
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//  
+//  http://www.apache.org/licenses/LICENSE-2.0
+//  
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+namespace Tableau.Migration.PythonGenerator.Writers
+{
+    internal interface IPythonClassTestWriter
+    {
+        void Write(IndentingStringBuilder builder, PythonType type);
+    }
+}
diff --git a/src/Tableau.Migration.PythonGenerator/Writers/IPythonConstructorTestWriter.cs b/src/Tableau.Migration.PythonGenerator/Writers/IPythonConstructorTestWriter.cs
new file mode 100644
index 0000000..faf1fdc
--- /dev/null
+++ b/src/Tableau.Migration.PythonGenerator/Writers/IPythonConstructorTestWriter.cs
@@ -0,0 +1,24 @@
+//
+//  Copyright (c) 2024, Salesforce, Inc.
+//  SPDX-License-Identifier: Apache-2
+//  
+//  Licensed under the Apache License, Version 2.0 (the "License") 
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//  
+//  http://www.apache.org/licenses/LICENSE-2.0
+//  
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+namespace Tableau.Migration.PythonGenerator.Writers
+{
+    internal interface IPythonConstructorTestWriter
+    {
+        void Write(IndentingStringBuilder builder, PythonType type);
+    }
+}
\ No newline at end of file
diff --git a/src/Tableau.Migration.PythonGenerator/Writers/IPythonDocstringWriter.cs b/src/Tableau.Migration.PythonGenerator/Writers/IPythonDocstringWriter.cs
new file mode 100644
index 0000000..89dd296
--- /dev/null
+++ b/src/Tableau.Migration.PythonGenerator/Writers/IPythonDocstringWriter.cs
@@ -0,0 +1,24 @@
+//
+//  Copyright (c) 2024, Salesforce, Inc.
+//  SPDX-License-Identifier: Apache-2
+//  
+//  Licensed under the Apache License, Version 2.0 (the "License") 
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//  
+//  http://www.apache.org/licenses/LICENSE-2.0
+//  
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+namespace Tableau.Migration.PythonGenerator.Writers
+{
+    internal interface IPythonDocstringWriter
+    {
+        void Write(IndentingStringBuilder builder, PythonDocstring? documentation);
+    }
+}
diff --git a/src/Tableau.Migration.PythonGenerator/Writers/IPythonEnumValueWriter.cs b/src/Tableau.Migration.PythonGenerator/Writers/IPythonEnumValueWriter.cs
new file mode 100644
index 0000000..6ad1e09
--- /dev/null
+++ b/src/Tableau.Migration.PythonGenerator/Writers/IPythonEnumValueWriter.cs
@@ -0,0 +1,24 @@
+//
+//  Copyright (c) 2024, Salesforce, Inc.
+//  SPDX-License-Identifier: Apache-2
+//  
+//  Licensed under the Apache License, Version 2.0 (the "License") 
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//  
+//  http://www.apache.org/licenses/LICENSE-2.0
+//  
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+namespace Tableau.Migration.PythonGenerator.Writers
+{
+    internal interface IPythonEnumValueWriter
+    {
+        void Write(IndentingStringBuilder builder, PythonType type, PythonEnumValue enumValue);
+    }
+}
diff --git a/src/Tableau.Migration.PythonGenerator/Writers/IPythonMethodWriter.cs b/src/Tableau.Migration.PythonGenerator/Writers/IPythonMethodWriter.cs
new file mode 100644
index 0000000..af0c3fe
--- /dev/null
+++ b/src/Tableau.Migration.PythonGenerator/Writers/IPythonMethodWriter.cs
@@ -0,0 +1,24 @@
+//
+//  Copyright (c) 2024, Salesforce, Inc.
+//  SPDX-License-Identifier: Apache-2
+//  
+//  Licensed under the Apache License, Version 2.0 (the "License") 
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//  
+//  http://www.apache.org/licenses/LICENSE-2.0
+//  
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+namespace Tableau.Migration.PythonGenerator.Writers
+{
+    internal interface IPythonMethodWriter
+    {
+        void Write(IndentingStringBuilder builder, PythonType type, PythonMethod method);
+    }
+}
diff --git a/src/Tableau.Migration.PythonGenerator/Writers/IPythonPropertyTestWriter.cs b/src/Tableau.Migration.PythonGenerator/Writers/IPythonPropertyTestWriter.cs
new file mode 100644
index 0000000..1a3969d
--- /dev/null
+++ b/src/Tableau.Migration.PythonGenerator/Writers/IPythonPropertyTestWriter.cs
@@ -0,0 +1,24 @@
+//
+//  Copyright (c) 2024, Salesforce, Inc.
+//  SPDX-License-Identifier: Apache-2
+//  
+//  Licensed under the Apache License, Version 2.0 (the "License") 
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//  
+//  http://www.apache.org/licenses/LICENSE-2.0
+//  
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+namespace Tableau.Migration.PythonGenerator.Writers
+{
+    internal interface IPythonPropertyTestWriter
+    {
+        void Write(IndentingStringBuilder builder, PythonType type, PythonProperty property);
+    }
+}
diff --git a/src/Tableau.Migration.PythonGenerator/Writers/IPythonPropertyWriter.cs b/src/Tableau.Migration.PythonGenerator/Writers/IPythonPropertyWriter.cs
new file mode 100644
index 0000000..ae80c79
--- /dev/null
+++ b/src/Tableau.Migration.PythonGenerator/Writers/IPythonPropertyWriter.cs
@@ -0,0 +1,24 @@
+//
+//  Copyright (c) 2024, Salesforce, Inc.
+//  SPDX-License-Identifier: Apache-2
+//  
+//  Licensed under the Apache License, Version 2.0 (the "License") 
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//  
+//  http://www.apache.org/licenses/LICENSE-2.0
+//  
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+namespace Tableau.Migration.PythonGenerator.Writers
+{
+    internal interface IPythonPropertyWriter
+    {
+        void Write(IndentingStringBuilder builder, PythonType type, PythonProperty property);
+    }
+}
diff --git a/src/Tableau.Migration.PythonGenerator/Writers/IPythonTestWriter.cs b/src/Tableau.Migration.PythonGenerator/Writers/IPythonTestWriter.cs
new file mode 100644
index 0000000..f0d3bdb
--- /dev/null
+++ b/src/Tableau.Migration.PythonGenerator/Writers/IPythonTestWriter.cs
@@ -0,0 +1,27 @@
+//
+//  Copyright (c) 2024, Salesforce, Inc.
+//  SPDX-License-Identifier: Apache-2
+//  
+//  Licensed under the Apache License, Version 2.0 (the "License") 
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//  
+//  http://www.apache.org/licenses/LICENSE-2.0
+//  
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+using System.Threading.Tasks;
+using System.Threading;
+
+namespace Tableau.Migration.PythonGenerator.Writers
+{
+    internal interface IPythonTestWriter
+    {
+        ValueTask WriteAsync(PythonTypeCache pyTypeCache, CancellationToken cancel);
+    }
+}
diff --git a/src/Tableau.Migration.PythonGenerator/Writers/IPythonTypeWriter.cs b/src/Tableau.Migration.PythonGenerator/Writers/IPythonTypeWriter.cs
new file mode 100644
index 0000000..57e726c
--- /dev/null
+++ b/src/Tableau.Migration.PythonGenerator/Writers/IPythonTypeWriter.cs
@@ -0,0 +1,24 @@
+//
+//  Copyright (c) 2024, Salesforce, Inc.
+//  SPDX-License-Identifier: Apache-2
+//  
+//  Licensed under the Apache License, Version 2.0 (the "License") 
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//  
+//  http://www.apache.org/licenses/LICENSE-2.0
+//  
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+namespace Tableau.Migration.PythonGenerator.Writers
+{
+    internal interface IPythonTypeWriter
+    {
+        void Write(IndentingStringBuilder builder, PythonType type);
+    }
+}
diff --git a/src/Tableau.Migration.PythonGenerator/Writers/IPythonWriter.cs b/src/Tableau.Migration.PythonGenerator/Writers/IPythonWriter.cs
new file mode 100644
index 0000000..238b4b7
--- /dev/null
+++ b/src/Tableau.Migration.PythonGenerator/Writers/IPythonWriter.cs
@@ -0,0 +1,27 @@
+//
+//  Copyright (c) 2024, Salesforce, Inc.
+//  SPDX-License-Identifier: Apache-2
+//  
+//  Licensed under the Apache License, Version 2.0 (the "License") 
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//  
+//  http://www.apache.org/licenses/LICENSE-2.0
+//  
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Tableau.Migration.PythonGenerator.Writers
+{
+    internal interface IPythonWriter
+    {
+        ValueTask WriteAsync(PythonTypeCache pyTypeCache, CancellationToken cancel);
+    }
+}
diff --git a/src/Tableau.Migration.PythonGenerator/Writers/Imports/ImportedModule.cs b/src/Tableau.Migration.PythonGenerator/Writers/Imports/ImportedModule.cs
new file mode 100644
index 0000000..ff928c5
--- /dev/null
+++ b/src/Tableau.Migration.PythonGenerator/Writers/Imports/ImportedModule.cs
@@ -0,0 +1,38 @@
+//
+//  Copyright (c) 2024, Salesforce, Inc.
+//  SPDX-License-Identifier: Apache-2
+//  
+//  Licensed under the Apache License, Version 2.0 (the "License") 
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//  
+//  http://www.apache.org/licenses/LICENSE-2.0
+//  
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+using System.Collections.Generic;
+
+namespace Tableau.Migration.PythonGenerator.Writers.Imports
+{
+    internal class ImportedModule
+    {
+        public ImportedModule(string name, HashSet<ImportedType> types)
+        {
+            Name = name;
+            Types = types;
+        }
+        public ImportedModule(string name, ImportedType type)
+        {
+            Name = name;
+            Types = [type];
+        }
+        public string Name { get; set; }
+
+        public HashSet<ImportedType> Types { get; set; }
+    }
+}
diff --git a/src/Tableau.Migration.PythonGenerator/Writers/Imports/ImportedType.cs b/src/Tableau.Migration.PythonGenerator/Writers/Imports/ImportedType.cs
new file mode 100644
index 0000000..cda7619
--- /dev/null
+++ b/src/Tableau.Migration.PythonGenerator/Writers/Imports/ImportedType.cs
@@ -0,0 +1,51 @@
+//
+//  Copyright (c) 2024, Salesforce, Inc.
+//  SPDX-License-Identifier: Apache-2
+//  
+//  Licensed under the Apache License, Version 2.0 (the "License") 
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//  
+//  http://www.apache.org/licenses/LICENSE-2.0
+//  
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+using System;
+
+namespace Tableau.Migration.PythonGenerator.Writers.Imports
+{
+    internal class ImportedType
+    {
+        public ImportedType(string name, string? alias = null)
+        {
+            Name = name;
+            Alias = alias;
+        }
+
+        public string Name { get; set; }
+
+        public string? Alias { get; set; }
+
+        public string GetNameWithAlias()
+        {
+            return string.IsNullOrEmpty(Alias) ? Name : $"{Name} as {Alias}";
+        }
+
+        public override bool Equals(object? obj)
+        {
+            return obj is ImportedType importedType &&
+                   Name == importedType.Name &&
+                   Alias == importedType.Alias;
+        }
+
+        public override int GetHashCode()
+        {
+            return HashCode.Combine(Name, Alias);
+        }
+    }
+}
diff --git a/src/Tableau.Migration.PythonGenerator/Writers/PythonClassTestWriter.cs b/src/Tableau.Migration.PythonGenerator/Writers/PythonClassTestWriter.cs
new file mode 100644
index 0000000..82053a0
--- /dev/null
+++ b/src/Tableau.Migration.PythonGenerator/Writers/PythonClassTestWriter.cs
@@ -0,0 +1,56 @@
+//
+//  Copyright (c) 2024, Salesforce, Inc.
+//  SPDX-License-Identifier: Apache-2
+//  
+//  Licensed under the Apache License, Version 2.0 (the "License") 
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//  
+//  http://www.apache.org/licenses/LICENSE-2.0
+//  
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+using System.Linq;
+
+namespace Tableau.Migration.PythonGenerator.Writers
+{
+    internal class PythonClassTestWriter : IPythonClassTestWriter
+    {
+        private readonly IPythonPropertyTestWriter _propertyTestWriter;        
+        private readonly IPythonConstructorTestWriter _constructorTestWriter;
+
+        public PythonClassTestWriter(
+            IPythonConstructorTestWriter constructorTestWriter,
+            IPythonPropertyTestWriter propertyTestWriter)
+        {
+            _propertyTestWriter = propertyTestWriter;            
+            _constructorTestWriter = constructorTestWriter;
+        }
+        
+        public void Write(IndentingStringBuilder builder, PythonType type)
+        {
+            if (!type.Properties.Any() & !type.Methods.Any())
+            {
+                return;
+            }
+
+            using var classBuilder = builder.AppendLineAndIndent($"class Test{type.Name}Generated(AutoFixtureTestBase):");
+            classBuilder.AppendLine();
+
+            if (!type.EnumValues.Any())
+            {              
+                _constructorTestWriter.Write(classBuilder, type);
+
+                foreach (var property in type.Properties)
+                {
+                    _propertyTestWriter.Write(classBuilder, type, property);
+                }
+            }
+        }
+    }
+}
diff --git a/src/Tableau.Migration.PythonGenerator/Writers/PythonConstructorTestWriter.cs b/src/Tableau.Migration.PythonGenerator/Writers/PythonConstructorTestWriter.cs
new file mode 100644
index 0000000..cf9b00b
--- /dev/null
+++ b/src/Tableau.Migration.PythonGenerator/Writers/PythonConstructorTestWriter.cs
@@ -0,0 +1,45 @@
+//
+//  Copyright (c) 2024, Salesforce, Inc.
+//  SPDX-License-Identifier: Apache-2
+//  
+//  Licensed under the Apache License, Version 2.0 (the "License") 
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//  
+//  http://www.apache.org/licenses/LICENSE-2.0
+//  
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+namespace Tableau.Migration.PythonGenerator.Writers
+{
+    internal sealed class PythonConstructorTestWriter : PythonMemberWriter, IPythonConstructorTestWriter
+    {
+        public PythonConstructorTestWriter()
+        { }
+
+        public void Write(IndentingStringBuilder builder, PythonType type)
+        {
+            using (var ctorBuilder = builder.AppendLineAndIndent($"def test_ctor(self):"))
+            {
+                BuildCtorTestBody(type, ctorBuilder);
+            }
+
+            builder.AppendLine();
+        }
+
+        private static void BuildCtorTestBody(PythonType type, IndentingStringBuilder ctorBuilder)
+        {
+            var dotnetObj = "dotnet";
+            var pyObj = "py";
+
+            ctorBuilder.AppendLine($"{dotnetObj} = self.create({type.DotNetType.Name})");
+            ctorBuilder.AppendLine($"{pyObj} = {type.Name}({dotnetObj})");
+            ctorBuilder.AppendLine($"assert {pyObj}._dotnet == {dotnetObj}");
+        }
+    }
+}
diff --git a/src/Tableau.Migration.PythonGenerator/Writers/PythonDocstringWriter.cs b/src/Tableau.Migration.PythonGenerator/Writers/PythonDocstringWriter.cs
new file mode 100644
index 0000000..d9f8125
--- /dev/null
+++ b/src/Tableau.Migration.PythonGenerator/Writers/PythonDocstringWriter.cs
@@ -0,0 +1,58 @@
+//
+//  Copyright (c) 2024, Salesforce, Inc.
+//  SPDX-License-Identifier: Apache-2
+//  
+//  Licensed under the Apache License, Version 2.0 (the "License") 
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//  
+//  http://www.apache.org/licenses/LICENSE-2.0
+//  
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+namespace Tableau.Migration.PythonGenerator.Writers
+{
+    internal sealed class PythonDocstringWriter : IPythonDocstringWriter
+    {
+        private const string DOCSTRING_QUOTE = "\"\"\"";
+
+        public void Write(IndentingStringBuilder builder, PythonDocstring? documentation)
+        {
+            if (documentation is null)
+            {
+                return;
+            }
+
+            if (!documentation.HasExtraInfo)
+            {
+                builder.AppendLine($"{DOCSTRING_QUOTE}{documentation.Summary}{DOCSTRING_QUOTE}");
+                return;
+            }
+
+            builder.AppendLine($"{DOCSTRING_QUOTE}{documentation.Summary}");
+
+            if (documentation.HasArgs)
+            {
+                builder.AppendLine();
+                using var argsBuilder = builder.AppendLineAndIndent("Args:");
+                foreach (var arg in documentation.Args)
+                {
+                    argsBuilder.AppendLine($"{arg.Name}: {arg.Documentation}");
+                }
+            }
+
+            if (documentation.HasReturns)
+            {
+                builder.AppendLine();
+                builder.AppendLine($"Returns: {documentation.Returns}");
+            }
+
+            builder.AppendLine(DOCSTRING_QUOTE);
+        }
+    }
+}
diff --git a/src/Tableau.Migration.PythonGenerator/Writers/PythonEnumValueWriter.cs b/src/Tableau.Migration.PythonGenerator/Writers/PythonEnumValueWriter.cs
new file mode 100644
index 0000000..a725aaa
--- /dev/null
+++ b/src/Tableau.Migration.PythonGenerator/Writers/PythonEnumValueWriter.cs
@@ -0,0 +1,47 @@
+//
+//  Copyright (c) 2024, Salesforce, Inc.
+//  SPDX-License-Identifier: Apache-2
+//  
+//  Licensed under the Apache License, Version 2.0 (the "License") 
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//  
+//  http://www.apache.org/licenses/LICENSE-2.0
+//  
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+namespace Tableau.Migration.PythonGenerator.Writers
+{
+    internal class PythonEnumValueWriter : PythonMemberWriter, IPythonEnumValueWriter
+    {
+        private readonly IPythonDocstringWriter _docWriter;
+
+        public PythonEnumValueWriter(IPythonDocstringWriter docWriter)
+        {
+            _docWriter = docWriter;
+        }
+
+        public void Write(IndentingStringBuilder builder, PythonType type, PythonEnumValue enumValue)
+        {
+            _docWriter.Write(builder, enumValue.Documentation);
+
+            string enumValueToken;
+            if(enumValue.Value is string)
+            {
+                enumValueToken = $"\"{enumValue.Value}\"";
+            }
+            else
+            {
+                enumValueToken = enumValue.Value.ToString() ?? string.Empty;
+            }
+
+            builder.AppendLine($"{enumValue.Name} = {enumValueToken}");
+            builder.AppendLine();
+        }
+    }
+}
diff --git a/src/Tableau.Migration.PythonGenerator/Writers/PythonMemberWriter.cs b/src/Tableau.Migration.PythonGenerator/Writers/PythonMemberWriter.cs
new file mode 100644
index 0000000..2414c2e
--- /dev/null
+++ b/src/Tableau.Migration.PythonGenerator/Writers/PythonMemberWriter.cs
@@ -0,0 +1,132 @@
+//
+//  Copyright (c) 2024, Salesforce, Inc.
+//  SPDX-License-Identifier: Apache-2
+//  
+//  Licensed under the Apache License, Version 2.0 (the "License") 
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//  
+//  http://www.apache.org/licenses/LICENSE-2.0
+//  
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+using System;
+using System.Linq;
+
+namespace Tableau.Migration.PythonGenerator.Writers
+{
+    internal abstract class PythonMemberWriter
+    {
+        protected static string ToPythonTypeDeclaration(PythonType currentType, PythonTypeReference typeRef)
+        {
+            if (currentType.Equals(typeRef))
+            {
+                return "Self";
+            }
+
+            if (typeRef.GenericTypes is null)
+            {
+                return typeRef.Name;
+            }
+
+            return $"{typeRef.Name}[{string.Join(", ", typeRef.GenericTypes.Value.Select(g => ToPythonTypeDeclaration(currentType, g)))}]";
+        }
+
+        private static string BuildWrapExpression(string nullTestExpression, string wrapExpression)
+            => $"None if {nullTestExpression} is None else {wrapExpression}";
+
+        private static string BuildWrapExpression(string nullTestExpression, string wrapFunction, string wrapExpression)
+            => $"None if {nullTestExpression} is None else {wrapFunction}({wrapExpression})";
+
+        private static string BuildArrayWrapExpression(string expression, string? itemName = null)
+        {
+            var arrayElement = string.IsNullOrEmpty(itemName) ? $"x" : $"{itemName}(x)";
+            return $"[] if {expression} is None else [{arrayElement} for x in {expression} if x is not None]";
+        }
+
+
+        protected static string ToPythonType(PythonTypeReference typeRef, string expression)
+        {
+            var wrapCtor = typeRef.WrapType ?? typeRef.GenericDefinitionName;
+
+            switch (typeRef.ConversionMode)
+            {
+                case ConversionMode.Wrap:
+                    return BuildWrapExpression(expression, wrapCtor, expression);
+                case ConversionMode.WrapSerialized:
+                    return BuildWrapExpression(expression, wrapCtor, $"{expression}.ToString()");
+                case ConversionMode.WrapGeneric:
+                    return BuildWrapExpression(expression, "_generic_wrapper", expression);
+                case ConversionMode.WrapImmutableCollection:
+                case ConversionMode.WrapArray:
+                    if (typeRef.GenericTypes is null || !typeRef.GenericTypes.Value.Any())
+                    {
+                        return BuildWrapExpression(expression, wrapCtor, expression);
+                    }
+
+                    if (typeRef.GenericTypes.Value.Length > 1)
+                    {
+                        throw new InvalidOperationException("Multi-dimensional collections are not currently supported.");
+                    }
+
+                    var itemType = typeRef.GenericTypes.Value[0];
+                    if (itemType.ConversionMode is ConversionMode.Direct)
+                    {
+                        return BuildWrapExpression(expression, wrapCtor, expression);
+                    }
+
+                    var itemExpression = ToPythonType(itemType, "x");
+                    return BuildWrapExpression(expression, wrapCtor, $"({itemExpression}) for x in {expression}");
+                case ConversionMode.WrapMutableCollection:
+                    if (typeRef.GenericTypes is null || !typeRef.GenericTypes.Value.Any())
+                    {
+                        return BuildArrayWrapExpression(expression);
+                    }
+
+                    if (typeRef.GenericTypes.Value.Length > 1)
+                    {
+                        throw new InvalidOperationException("Multi-dimensional collections are not currently supported.");
+                    }
+
+                    var mutableItemType = typeRef.GenericTypes.Value[0];
+
+                    if (mutableItemType.ConversionMode is ConversionMode.Direct)
+                    {
+                        return BuildArrayWrapExpression(expression);
+                    }
+
+                    return BuildArrayWrapExpression(expression, mutableItemType.Name);
+                case ConversionMode.Enum:
+                    return BuildWrapExpression(expression, wrapCtor, $"{expression}.value__");
+                case ConversionMode.Direct:
+                default:
+                    return expression;
+            }
+        }
+
+        protected static string ToDotNetType(PythonTypeReference typeRef, string expression, bool skipNoneCheck = false)
+        {
+            switch (typeRef.ConversionMode)
+            {
+                case ConversionMode.Wrap:
+                case ConversionMode.WrapImmutableCollection:
+                case ConversionMode.WrapMutableCollection:
+                case ConversionMode.WrapArray:
+                    if (skipNoneCheck)
+                        return $"{expression}.{PythonTypeWriter.DOTNET_OBJECT}";
+                    else
+                        return BuildWrapExpression(expression, $"{expression}.{PythonTypeWriter.DOTNET_OBJECT}");
+                case ConversionMode.WrapSerialized:
+                    return BuildWrapExpression(expression, typeRef.DotNetParseFunction!, $"str({expression})");
+                case ConversionMode.Direct:
+                default:
+                    return expression;
+            }
+        }
+    }
+}
diff --git a/src/Tableau.Migration.PythonGenerator/Writers/PythonMethodWriter.cs b/src/Tableau.Migration.PythonGenerator/Writers/PythonMethodWriter.cs
new file mode 100644
index 0000000..5c518f0
--- /dev/null
+++ b/src/Tableau.Migration.PythonGenerator/Writers/PythonMethodWriter.cs
@@ -0,0 +1,82 @@
+//
+//  Copyright (c) 2024, Salesforce, Inc.
+//  SPDX-License-Identifier: Apache-2
+//  
+//  Licensed under the Apache License, Version 2.0 (the "License") 
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//  
+//  http://www.apache.org/licenses/LICENSE-2.0
+//  
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+using System.Linq;
+
+namespace Tableau.Migration.PythonGenerator.Writers
+{
+    internal sealed class PythonMethodWriter : PythonMemberWriter, IPythonMethodWriter
+    {
+        private readonly IPythonDocstringWriter _docWriter;
+
+        public PythonMethodWriter(IPythonDocstringWriter docWriter)
+        {
+            _docWriter = docWriter;
+        }
+
+        private string BuildArgumentDeclarations(PythonType type, PythonMethod method)
+        {
+            string ArgumentDeclaration(PythonMethodArgument arg)
+                => $"{arg.Name}: {ToPythonTypeDeclaration(type, arg.Type)}";
+
+            var prefix = method.IsStatic ? "cls" : "self";
+
+            return string.Join(", ", method.Arguments.Select(ArgumentDeclaration).Prepend(prefix));
+        }
+
+        private string BuildArgumentInvocation(PythonMethod method)
+        {
+            string ArgumentInvocation(PythonMethodArgument arg)
+                => ToDotNetType(arg.Type, arg.Name);
+
+            return string.Join(", ", method.Arguments.Select(ArgumentInvocation));
+        }
+
+        public void Write(IndentingStringBuilder builder, PythonType type, PythonMethod method)
+        {
+            var returnTypeName = method.ReturnType is null? "None" : ToPythonTypeDeclaration(type, method.ReturnType);
+
+            if(method.IsStatic)
+            {
+                builder.AppendLine("@classmethod");
+            }
+
+            var argDeclarations = BuildArgumentDeclarations(type, method);
+            using (var methodBuilder = builder.AppendLineAndIndent($"def {method.Name}({argDeclarations}) -> {returnTypeName}:"))
+            {
+                _docWriter.Write(methodBuilder, method.Documentation);
+
+                var argInvocation = BuildArgumentInvocation(method);
+                var dotNetInvoker = method.IsStatic ? type.DotNetType.Name : $"self.{PythonTypeWriter.DOTNET_OBJECT}";
+                var methodInvokeExpression = $"{dotNetInvoker}.{method.DotNetMethod.Name}({argInvocation})";
+
+                if(method.ReturnType is not null)
+                {
+                    methodBuilder.AppendLine($"result = {methodInvokeExpression}");
+                    var returnExpression = ToPythonType(method.ReturnType, "result");
+                    methodBuilder.AppendLine($"return {returnExpression}");
+                }
+                else
+                {
+                    methodBuilder.AppendLine(methodInvokeExpression);
+                }
+            }
+
+            builder.AppendLine();
+        }
+    }
+}
diff --git a/src/Tableau.Migration.PythonGenerator/Writers/PythonPropertyTestWriter.cs b/src/Tableau.Migration.PythonGenerator/Writers/PythonPropertyTestWriter.cs
new file mode 100644
index 0000000..075824b
--- /dev/null
+++ b/src/Tableau.Migration.PythonGenerator/Writers/PythonPropertyTestWriter.cs
@@ -0,0 +1,184 @@
+//
+//  Copyright (c) 2024, Salesforce, Inc.
+//  SPDX-License-Identifier: Apache-2
+//  
+//  Licensed under the Apache License, Version 2.0 (the "License") 
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//  
+//  http://www.apache.org/licenses/LICENSE-2.0
+//  
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+using System.Linq;
+using Microsoft.CodeAnalysis;
+
+namespace Tableau.Migration.PythonGenerator.Writers
+{
+    internal sealed class PythonPropertyTestWriter : PythonMemberWriter, IPythonPropertyTestWriter
+    {
+        public PythonPropertyTestWriter()
+        { }
+
+        public void Write(IndentingStringBuilder builder, PythonType type, PythonProperty property)
+        {
+            if (property.Getter)
+            {
+                using (var getterBuilder = builder.AppendLineAndIndent($"def test_{property.Name}_getter(self):"))
+                {
+                    BuildGetterTestBody(type, property, getterBuilder);
+                }
+
+                builder.AppendLine();
+            }
+
+            if (property.Setter)
+            {
+                using (var getterBuilder = builder.AppendLineAndIndent($"def test_{property.Name}_setter(self):"))
+                {
+                    BuildSetterTestBody(type, property, getterBuilder);
+                }
+
+                builder.AppendLine();
+            }
+
+        }
+
+        private static void BuildSetterTestBody(PythonType type, PythonProperty property, IndentingStringBuilder getterBuilder)
+        {
+            var dotnetObj = "dotnet";
+            var pyObj = "py";
+
+            getterBuilder.AppendLine($"{dotnetObj} = self.create({type.DotNetType.Name})");
+            getterBuilder.AppendLine($"{pyObj} = {type.Name}({dotnetObj})");
+
+            AddSetterAsserts(getterBuilder, dotnetObj, pyObj, property);
+        }
+
+        private static void AddSetterAsserts(IndentingStringBuilder builder, string dotnetObj, string pyObj, PythonProperty property)
+        {
+            string dotnetPropValue = $"{dotnetObj}.{property.DotNetProperty.Name}";
+            var pythonPropValue = $"{pyObj}.{property.Name}";
+
+            var typeRef = property.Type;
+
+            switch (typeRef.ConversionMode)
+            {
+                case ConversionMode.WrapImmutableCollection:
+                case ConversionMode.WrapMutableCollection:
+                case ConversionMode.WrapArray:
+                    {
+                        builder.AppendLine($"assert len({dotnetPropValue}) != 0");
+                        builder.AppendLine($"assert len({pythonPropValue}) == len({dotnetPropValue})");
+                        builder.AppendLine();
+
+                        builder.AppendLine("# create test data");
+
+                        var dotnetType = property.DotNetProperty.Type;
+                        
+                        var element = dotnetType switch
+                        {
+                            INamedTypeSymbol dotnetNameType => dotnetNameType.TypeArguments.First().Name,
+                            IArrayTypeSymbol dotnetArrayType => dotnetArrayType.ElementType.Name,
+                            _ => throw new System.InvalidOperationException($"{dotnetType} is not supported."),
+                        };
+
+                        builder.AppendLine($"dotnetCollection = DotnetList[{element}]()");
+
+                        for (var i = 1; i < 3; i++)
+                        {
+                            builder = builder.AppendLine($"dotnetCollection.Add(self.create({element}))");
+                        }
+
+                        var collectionWrapExp = ToPythonType(typeRef, $"dotnetCollection");
+                        builder.AppendLine($"testCollection = {collectionWrapExp}");
+                        builder.AppendLine();
+
+                        builder.AppendLine("# set property to new test value");
+                        builder.AppendLine($"{pythonPropValue} = testCollection");
+                        builder.AppendLine();
+
+                        builder.AppendLine("# assert value");
+                        builder.AppendLine($"assert len({pythonPropValue}) == len(testCollection)");
+
+                        break;
+                    }
+                default:
+                    {
+                        builder.AppendLine();
+
+                        builder.AppendLine("# create test data");
+
+                        var dotnetType = (INamedTypeSymbol)property.DotNetProperty.Type;
+
+                        if (!dotnetType.IsGenericType)
+                        {
+                            builder.AppendLine($"testValue = self.create({dotnetType.Name})");
+                        }
+                        else
+                        {
+                            var args = string.Join(", ", dotnetType.TypeArguments.Select(x => x.Name));
+                            builder.AppendLine($"testValue = self.create({dotnetType.OriginalDefinition.Name}[{args}])");
+                        }
+
+                        builder.AppendLine();
+
+                        var wrapExp = ToPythonType(typeRef, "testValue");
+                        builder.AppendLine("# set property to new test value");
+                        builder.AppendLine($"{pythonPropValue} = {wrapExp}");
+                        builder.AppendLine();
+
+                        builder.AppendLine("# assert value");
+                        builder.AppendLine($"assert {pythonPropValue} == {wrapExp}");
+                        break;
+                    }
+            }
+        }
+
+        private static void BuildGetterTestBody(PythonType type, PythonProperty property, IndentingStringBuilder getterBuilder)
+        {
+            var dotnetObj = "dotnet";
+            var pyObj = "py";
+
+            getterBuilder.AppendLine($"{dotnetObj} = self.create({type.DotNetType.Name})");
+            getterBuilder.AppendLine($"{pyObj} = {type.Name}({dotnetObj})");
+
+            AddGetterAsserts(getterBuilder, dotnetObj, pyObj, property);
+        }
+
+        private static void AddGetterAsserts(IndentingStringBuilder builder, string dotnetObj, string pyObj, PythonProperty property)
+        {
+            string dotnetPropValue = $"{dotnetObj}.{property.DotNetProperty.Name}";
+            var pythonPropValue = $"{pyObj}.{property.Name}";
+
+            var typeRef = property.Type;
+
+            switch (typeRef.ConversionMode)
+            {
+                case ConversionMode.WrapImmutableCollection:
+                case ConversionMode.WrapMutableCollection:
+                case ConversionMode.WrapArray:
+                    builder.AppendLine($"assert len({dotnetPropValue}) != 0");
+                    builder.AppendLine($"assert len({pythonPropValue}) == len({dotnetPropValue})");
+                    break;
+                case ConversionMode.Enum:
+                    var enumWrapExp = ToPythonType(typeRef, dotnetPropValue);
+                    builder.AppendLine($"assert {pythonPropValue}.value == ({enumWrapExp}).value");
+                    break;
+                case ConversionMode.Wrap:
+                case ConversionMode.WrapSerialized:
+                case ConversionMode.WrapGeneric:
+                case ConversionMode.Direct:
+                default:
+                    var wrapExp = ToPythonType(typeRef, dotnetPropValue);
+                    builder.AppendLine($"assert {pythonPropValue} == {wrapExp}");
+                    break;
+            }
+        }
+    }
+}
diff --git a/src/Tableau.Migration.PythonGenerator/Writers/PythonPropertyWriter.cs b/src/Tableau.Migration.PythonGenerator/Writers/PythonPropertyWriter.cs
new file mode 100644
index 0000000..218cb3e
--- /dev/null
+++ b/src/Tableau.Migration.PythonGenerator/Writers/PythonPropertyWriter.cs
@@ -0,0 +1,171 @@
+//
+//  Copyright (c) 2024, Salesforce, Inc.
+//  SPDX-License-Identifier: Apache-2
+//  
+//  Licensed under the Apache License, Version 2.0 (the "License") 
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//  
+//  http://www.apache.org/licenses/LICENSE-2.0
+//  
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+using System;
+using System.Linq;
+using Microsoft.CodeAnalysis;
+using Tableau.Migration.PythonGenerator.Generators;
+using Py = Tableau.Migration.PythonGenerator.Keywords.Python;
+
+namespace Tableau.Migration.PythonGenerator.Writers
+{
+    internal sealed class PythonPropertyWriter : PythonMemberWriter, IPythonPropertyWriter
+    {
+        private readonly IPythonDocstringWriter _docWriter;
+
+        public PythonPropertyWriter(IPythonDocstringWriter docWriter)
+        {
+            _docWriter = docWriter;
+        }
+
+        public void Write(IndentingStringBuilder builder, PythonType type, PythonProperty property)
+        {
+            var typeDeclaration = ToPythonTypeDeclaration(type, property.Type);
+
+            if (property.Getter)
+            {
+                builder.AppendLine("@property");
+                using (var getterBuilder = builder.AppendLineAndIndent($"def {property.Name}(self) -> {typeDeclaration}:"))
+                {
+                    BuildGetterBody(property, getterBuilder);
+                }
+
+                builder.AppendLine();
+            }
+
+            if (property.Setter)
+            {
+                builder.AppendLine($"@{property.Name}.setter");
+                var paramName = "value";
+                using (var setterBuilder = builder.AppendLineAndIndent($"def {property.Name}(self, {paramName}: {typeDeclaration}) -> None:"))
+                {
+                    BuildSetterBody(property, setterBuilder, paramName);
+                }
+
+                builder.AppendLine();
+            }
+        }
+
+        private void BuildGetterBody(PythonProperty property, IndentingStringBuilder getterBuilder)
+        {
+            _docWriter.Write(getterBuilder, property.Documentation);
+
+            var getterExpression = ToPythonType(property.Type, $"self.{PythonTypeWriter.DOTNET_OBJECT}.{property.DotNetProperty.Name}");
+
+            getterBuilder.AppendLine($"return {getterExpression}");
+        }
+
+        private static void BuildForLoop(IndentingStringBuilder builder, string condition, Action<IndentingStringBuilder> body)
+        {
+            var forLoopBuilder = builder.AppendLineAndIndent($"for {condition}:");
+            body(forLoopBuilder);
+        }
+        private static void BuildIfBlock(IndentingStringBuilder builder, string condition, Action<IndentingStringBuilder> body)
+        {
+            var ifBuilder = builder.AppendLineAndIndent($"if {condition}:");
+            body(ifBuilder);
+        }
+        private static void BuildElseBlock(IndentingStringBuilder builder, Action<IndentingStringBuilder> body)
+        {
+            var elseBuilder = builder.AppendLineAndIndent($"else:");
+            body(elseBuilder);
+        }
+
+        private void BuildSetterBody(PythonProperty property, IndentingStringBuilder setterBuilder, string paramName)
+        {
+            _docWriter.Write(setterBuilder, property.Documentation);
+
+            var conversionMode = property.Type.ConversionMode;
+            switch (conversionMode)
+            {
+                case ConversionMode.WrapMutableCollection:
+                case ConversionMode.WrapArray:
+                    {
+                        var typeRef = property.Type;
+
+                        var dotnetTypes = typeRef.DotnetTypes
+                            ?? throw new InvalidOperationException("Dotnet types are necessary for wrapping mutable collections.");
+                        var dotnetType = dotnetTypes[0];
+
+                        var collectionTypeAlias = GetCollectionTypeAlias(conversionMode, typeRef.Name);
+
+                        BuildIfBlock(setterBuilder, $"{paramName} is None", (builder) =>
+                        {
+                            builder.AppendLine($"self.{PythonTypeWriter.DOTNET_OBJECT}.{property.DotNetProperty.Name} = {collectionTypeAlias}[{dotnetType.Name}]()");
+                        });
+
+                        BuildElseBlock(setterBuilder, (builder) =>
+                        {
+                            builder.AppendLine($"dotnet_collection = {collectionTypeAlias}[{dotnetType.Name}]()");
+                            // Build for loop inside else block
+                            var itemVariableName = "x";
+
+                            BuildForLoop(builder, $"{itemVariableName} in filter(None,{paramName})", (builder) =>
+                            {
+                                if (typeRef.GenericTypes is null || !typeRef.GenericTypes.Value.Any())
+                                {
+                                    builder.AppendLine($"dotnet_collection.Add({itemVariableName})");
+                                }
+                                else if (typeRef.GenericTypes.Value.Length > 1)
+                                {
+                                    throw new InvalidOperationException("Multi-dimensional collections are not currently supported.");
+                                }
+                                else
+                                {
+                                    var element = ToDotNetType(typeRef.GenericTypes.Value[0], itemVariableName, skipNoneCheck: true);
+                                    builder.AppendLine($"dotnet_collection.Add({element})");
+                                }
+                            });
+
+                            if (conversionMode == ConversionMode.WrapArray)
+                            {
+                                builder.AppendLine($"self.{PythonTypeWriter.DOTNET_OBJECT}.{property.DotNetProperty.Name} = dotnet_collection.ToArray()");
+                                return;
+                            }
+                            builder.AppendLine($"self.{PythonTypeWriter.DOTNET_OBJECT}.{property.DotNetProperty.Name} = dotnet_collection");
+                        });
+                        break;
+                    }
+                default:
+                    {
+                        var setterExpression = ToDotNetType(property.Type, paramName);
+                        setterBuilder.AppendLine($"self.{PythonTypeWriter.DOTNET_OBJECT}.{property.DotNetProperty.Name} = {setterExpression}");
+                        break;
+                    }
+            }
+
+            static string? GetCollectionTypeAlias(ConversionMode conversionMode, string typeRefName)
+            {
+                string? collectionTypeAlias;
+                if (conversionMode == ConversionMode.WrapArray)
+                {
+                    collectionTypeAlias = PythonMemberGenerator.LIST_REFERENCE.ImportAlias;
+                }
+                else
+                {
+                    collectionTypeAlias = typeRefName switch
+                    {
+                        Py.Types.SEQUENCE => PythonMemberGenerator.HASH_SET_REFERENCE.ImportAlias,
+                        _ => PythonMemberGenerator.LIST_REFERENCE.ImportAlias,
+                    };
+                }
+
+                return collectionTypeAlias;
+            }
+        }
+    }
+}
diff --git a/src/Tableau.Migration.PythonGenerator/Writers/PythonTestWriter.cs b/src/Tableau.Migration.PythonGenerator/Writers/PythonTestWriter.cs
new file mode 100644
index 0000000..9f1dd31
--- /dev/null
+++ b/src/Tableau.Migration.PythonGenerator/Writers/PythonTestWriter.cs
@@ -0,0 +1,289 @@
+//
+//  Copyright (c) 2024, Salesforce, Inc.
+//  SPDX-License-Identifier: Apache-2
+//  
+//  Licensed under the Apache License, Version 2.0 (the "License") 
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//  
+//  http://www.apache.org/licenses/LICENSE-2.0
+//  
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis;
+using Microsoft.Extensions.Options;
+using Tableau.Migration.Content;
+using Tableau.Migration.Content.Permissions;
+using Tableau.Migration.PythonGenerator.Config;
+using Dotnet= Tableau.Migration.PythonGenerator.Keywords.Dotnet;
+using Py = Tableau.Migration.PythonGenerator.Keywords.Python;
+using Tableau.Migration.PythonGenerator.Writers.Imports;
+
+namespace Tableau.Migration.PythonGenerator.Writers
+{
+    internal sealed class PythonTestWriter : PythonWriterBase, IPythonTestWriter
+    {
+        private readonly PythonGeneratorOptions _options;
+        private readonly IPythonClassTestWriter _classTestWriter;
+        private readonly string _testDirectoryPath;
+
+        public PythonTestWriter(IOptions<PythonGeneratorOptions> options, IPythonClassTestWriter classTestWriter)
+        {
+            _options = options.Value;
+            _classTestWriter = classTestWriter;
+            _testDirectoryPath = Path.Combine(_options.OutputPath, "..", "..", "tests");
+        }
+
+        private bool SearchTypeHierarchy(PythonTypeCache typeCache, PythonType startType, Func<PythonType, bool> search)
+        {
+            if (search(startType))
+            {
+                return true;
+            }
+
+            foreach (var parentTypeRef in startType.InheritedTypes)
+            {
+                var parentType = typeCache.Find(parentTypeRef);
+                if (parentType is not null && SearchTypeHierarchy(typeCache, parentType, search))
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        private bool TypeHasMethod(PythonTypeCache typeCache, PythonType startType, IMethodSymbol searchMethod)
+            => SearchTypeHierarchy(typeCache, startType, t => t.Methods.Any(m => string.Equals(m.DotNetMethod.Name, searchMethod.Name, StringComparison.Ordinal)));
+
+        private bool TypeHasProperty(PythonTypeCache typeCache, PythonType startType, IPropertySymbol searchProperty)
+            => SearchTypeHierarchy(typeCache, startType, t => t.Properties.Any(p => string.Equals(p.DotNetProperty.Name, searchProperty.Name, StringComparison.Ordinal)));
+
+        private void AddHierarchyExcludedMemberHints(List<string> excludedMembers, PythonTypeCache typeCache, PythonType type)
+        {
+            var typeHints = _options.Hints.ForType(type.DotNetType);
+            if (typeHints is not null && typeHints.ExcludeMembers.Any())
+            {
+                excludedMembers.AddRange(typeHints.ExcludeMembers);
+            }
+
+            foreach (var inheritedTypeRef in type.InheritedTypes)
+            {
+                var inheritedType = typeCache.Find(inheritedTypeRef);
+                if (inheritedType is not null)
+                {
+                    AddHierarchyExcludedMemberHints(excludedMembers, typeCache, inheritedType);
+                }
+            }
+        }
+
+        private string BuildExcludedMemberList(PythonTypeCache typeCache, PythonType t)
+        {
+            var excludedMembers = t.ExcludedInterfaces
+                .SelectMany(x => x.GetMembers())
+                .Where(m => m is not IMethodSymbol method || (method.MethodKind is MethodKind.Ordinary && !TypeHasMethod(typeCache, t, method)))
+                .Where(m => m is not IPropertySymbol p || !TypeHasProperty(typeCache, t, p))
+                .Select(x => x.Name)
+                .ToList();
+
+            // Async disposable interface doesn't return any members, but we don't implement dispose in our Python wrappers.
+            if (t.ExcludedInterfaces.Any(i => string.Equals(i.Name, "IAsyncDisposable", StringComparison.Ordinal)))
+            {
+                excludedMembers.Add("DisposeAsync");
+            }
+
+            AddHierarchyExcludedMemberHints(excludedMembers, typeCache, t);
+
+            if (excludedMembers.Count == 0)
+            {
+                return "None";
+            }
+
+            var memberNames = excludedMembers
+                .Distinct()
+                .Order()
+                .Select(m => $"\"{m}\"");
+
+            return $"[ {string.Join(", ", memberNames)} ]";
+        }
+
+        private static void WriteClassTestImports(IndentingStringBuilder builder, PythonTypeCache pyTypeCache)
+        {
+            var testTypes = pyTypeCache.Types;
+
+            WritePythonImports(builder, testTypes);
+
+            var enumDotNetTyeps = testTypes
+                .OrderBy(x => x.Module)
+                .Where(x => x.EnumValues.Any())
+                .Select(x => x.DotNetType)
+                .OrderBy(x => x.ContainingNamespace.ToDisplayString())
+                .ThenBy(x => x.Name)
+                .ToImmutableArray();
+
+            if (!enumDotNetTyeps.Any())
+            {
+                return;
+            }
+
+            foreach (var enumType in enumDotNetTyeps)
+            {
+                builder.AppendLine($"from {enumType.ContainingNamespace.ToDisplayString()} import {enumType.Name}");
+            }
+
+            builder.AppendLine();
+        }
+
+        private void WriteClassCompletenessTestData(IndentingStringBuilder builder, PythonTypeCache pyTypeCache)
+        {
+            var testClassTypes = pyTypeCache.Types
+                .Where(x => !x.EnumValues.Any())
+                .OrderBy(x => x.Module)
+                .ThenBy(x => x.Name)
+                .ToImmutableArray();
+
+            using (var testDataBuilder = builder.AppendLineAndIndent("_generated_class_data = ["))
+            {
+                for (int i = 0; i < testClassTypes.Length; i++)
+                {
+                    var type = testClassTypes[i];
+                    var suffix = i == testClassTypes.Length - 1 ? string.Empty : ",";
+
+                    testDataBuilder.AppendLine($"({type.Name}, {BuildExcludedMemberList(pyTypeCache, type)}){suffix}");
+                }
+            }
+
+            builder.AppendLine("]");
+            builder.AppendLine();
+        }
+
+        private static void WriteEnumCompletenessTestData(IndentingStringBuilder builder, PythonTypeCache pyTypeCache)
+        {
+            var testEnumTypes = pyTypeCache.Types
+                .Where(x => x.EnumValues.Any())
+                .OrderBy(x => x.Module)
+                .ThenBy(x => x.Name)
+                .ToImmutableArray();
+
+            using (var testDataBuilder = builder.AppendLineAndIndent("_generated_enum_data = ["))
+            {
+                for (int i = 0; i < testEnumTypes.Length; i++)
+                {
+                    var type = testEnumTypes[i];
+                    var suffix = i == testEnumTypes.Length - 1 ? string.Empty : ",";
+
+                    testDataBuilder.AppendLine($"({type.Name}, {type.DotNetType.Name}){suffix}");
+                }
+            }
+
+            builder.AppendLine("]");
+        }
+
+        private async ValueTask WriteWrapperCompletenessTestDataAsync(PythonTypeCache pyTypeCache, CancellationToken cancel)
+        {
+            var testClassesPath = Path.Combine(_testDirectoryPath, "test_classes.py");
+            await using var segment = await GeneratedPythonSegment.OpenAsync(testClassesPath, cancel);
+
+            WriteClassTestImports(segment.StringBuilder, pyTypeCache);
+            WriteClassCompletenessTestData(segment.StringBuilder, pyTypeCache);
+            WriteEnumCompletenessTestData(segment.StringBuilder, pyTypeCache);
+        }
+
+        private async ValueTask WriteContentTypeWrapperTestsAsync(PythonTypeCache pyTypeCache, CancellationToken cancel)
+        {
+            var extraTestImports = new List<ImportedModule>()
+            {
+                new(Dotnet.Namespaces.TABLEAU_MIGRATION,new ImportedType(nameof(IContentReference))),
+                new(Dotnet.Namespaces.SYSTEM, [new ImportedType(Dotnet.Types.BOOLEAN), new ImportedType(Dotnet.Types.NULLABLE)])
+            };
+
+            await WriteTests($"{typeof(IUser).Namespace}", pyTypeCache, extraTestImports, cancel);
+
+        }
+
+        private async ValueTask WritePermissionsContentTypeWrapperTestsAsync(PythonTypeCache pyTypeCache, CancellationToken cancel)
+        {
+            var extraTestImports = new List<ImportedModule>()
+            {
+                new(Dotnet.Namespaces.TABLEAU_MIGRATION,new ImportedType(nameof(IContentReference))),
+                new(Dotnet.Namespaces.SYSTEM,new ImportedType(Dotnet.Types.NULLABLE)),
+                new(Dotnet.Namespaces.SYSTEM_COLLECTIONS_GENERIC, new ImportedType(Dotnet.Types.LIST,Dotnet.TypeAliases.LIST))
+            };
+
+            await WriteTests($"{typeof(IPermissions).Namespace}", pyTypeCache, extraTestImports, cancel);
+        }
+
+        private async Task WriteTests(string nameSpace, PythonTypeCache pyTypeCache, List<ImportedModule> extraTestImports, CancellationToken cancel)
+        {
+            var classes = new PythonTypeCache(pyTypeCache
+               .Types
+               .Where(x
+                => x.DotNetType?.ContainingNamespace?.ToDisplayString() != null
+                && x.DotNetType.ContainingNamespace.ToDisplayString() == nameSpace)
+               .ToArray());
+            var moduleGroups = classes.Types.GroupBy(p => p.Module);
+
+            foreach (var moduleGroup in moduleGroups)
+            {
+                var pyFileName = moduleGroup.Key.Replace("tableau_migration.", "") + ".py";
+                var pyFilePath = Path.Combine(_testDirectoryPath, $"test_{pyFileName}");
+
+                await using var segment = await GeneratedPythonSegment.OpenAsync(pyFilePath, cancel);
+
+                WriteImports(segment.StringBuilder, moduleGroup.Key, moduleGroup);
+                var pythonTypes = moduleGroup.ToImmutableArray();
+
+                WriteClassTestImports(segment.StringBuilder, new PythonTypeCache(pythonTypes));
+
+                WriteExtraTestImports(segment.StringBuilder, extraTestImports);
+
+                foreach (var pythonType in pythonTypes)
+                {
+                    _classTestWriter.Write(segment.StringBuilder, pythonType);
+                }
+            }
+        }
+
+        private static void WriteExtraTestImports(
+            IndentingStringBuilder builder,
+            List<ImportedModule> extraTestImports)
+        {
+            builder.AppendLine("# Extra imports for tests.");
+
+            var autoFixtureNamespace = Py.Modules.AUTOFIXTURE;
+
+            if (!extraTestImports.Any(x => x.Name == autoFixtureNamespace))
+            {
+                extraTestImports.Add(new ImportedModule(autoFixtureNamespace, new ImportedType(Py.Types.AUTOFIXTURE_TESTBASE)));
+            }
+            else
+            {
+                extraTestImports.First(x => x.Name == autoFixtureNamespace).Types.Add(new ImportedType(Py.Types.AUTOFIXTURE_TESTBASE));
+            }
+
+            foreach (var moduleImports in extraTestImports)
+            {
+                WriteModuleImports(builder, moduleImports);
+            }
+            builder.AppendLine();
+        }
+        public async ValueTask WriteAsync(PythonTypeCache pyTypeCache, CancellationToken cancel)
+        {
+            await WriteWrapperCompletenessTestDataAsync(pyTypeCache, cancel);
+            await WriteContentTypeWrapperTestsAsync(pyTypeCache, cancel);
+            await WritePermissionsContentTypeWrapperTestsAsync(pyTypeCache, cancel);
+        }
+    }
+}
diff --git a/src/Tableau.Migration.PythonGenerator/Writers/PythonTypeWriter.cs b/src/Tableau.Migration.PythonGenerator/Writers/PythonTypeWriter.cs
new file mode 100644
index 0000000..e41a031
--- /dev/null
+++ b/src/Tableau.Migration.PythonGenerator/Writers/PythonTypeWriter.cs
@@ -0,0 +1,98 @@
+//
+//  Copyright (c) 2024, Salesforce, Inc.
+//  SPDX-License-Identifier: Apache-2
+//  
+//  Licensed under the Apache License, Version 2.0 (the "License") 
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//  
+//  http://www.apache.org/licenses/LICENSE-2.0
+//  
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+using System.Linq;
+
+namespace Tableau.Migration.PythonGenerator.Writers
+{
+    internal class PythonTypeWriter : IPythonTypeWriter
+    {
+        internal const string DOTNET_OBJECT = "_dotnet";
+        private const string DOTNET_BASE = "_dotnet_base";
+
+        private readonly IPythonDocstringWriter _docWriter;
+        private readonly IPythonPropertyWriter _propertyWriter;
+        private readonly IPythonMethodWriter _methodWriter;
+        private readonly IPythonEnumValueWriter _enumValueWriter;
+
+        public PythonTypeWriter(IPythonDocstringWriter docWriter, 
+            IPythonPropertyWriter propertyWriter,
+            IPythonMethodWriter methodWriter,
+            IPythonEnumValueWriter enumValueWriter)
+        {
+            _docWriter = docWriter;
+            _propertyWriter = propertyWriter;
+            _methodWriter = methodWriter;
+            _enumValueWriter = enumValueWriter;
+        }
+
+        private static string ToParamName(string dotNetTypeName)
+        {
+            if(dotNetTypeName.StartsWith("I"))
+                dotNetTypeName = dotNetTypeName.Substring(1);
+
+            return dotNetTypeName.ToSnakeCase();
+        }
+
+        public void Write(IndentingStringBuilder builder, PythonType type)
+        {
+            var inheritedTypeNames = type.InheritedTypes.Select(t => t.GenericDefinitionName);
+            var inheritedTypes = string.Join(", ", inheritedTypeNames);
+
+            using (var classBuilder = builder.AppendLineAndIndent($"class {type.Name}({inheritedTypes}):"))
+            {
+                _docWriter.Write(classBuilder, type.Documentation);
+                classBuilder.AppendLine();
+
+                if(type.EnumValues.Any())
+                {
+                    foreach(var enumValue in type.EnumValues)
+                    {
+                        _enumValueWriter.Write(classBuilder, type, enumValue);
+                    }
+                }
+                else
+                {
+                    var dotNetType = type.DotNetType.Name;
+
+                    classBuilder.AppendLine($"{DOTNET_BASE} = {dotNetType}");
+                    classBuilder.AppendLine();
+
+                    var dotNetParam = ToParamName(dotNetType);
+                    using (var ctorBuilder = classBuilder.AppendLineAndIndent($"def __init__(self, {dotNetParam}: {dotNetType}) -> None:"))
+                    {
+                        var ctorDoc = new PythonDocstring($"Creates a new {type.Name} object.", "None.", (dotNetParam, $"A {dotNetType} object."));
+                        _docWriter.Write(ctorBuilder, ctorDoc);
+
+                        ctorBuilder.AppendLine($"self.{DOTNET_OBJECT} = {dotNetParam}");
+                        ctorBuilder.AppendLine();
+                    }
+
+                    foreach (var property in type.Properties)
+                    {
+                        _propertyWriter.Write(classBuilder, type, property);
+                    }
+
+                    foreach (var method in type.Methods)
+                    {
+                        _methodWriter.Write(classBuilder, type, method);
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/src/Tableau.Migration.PythonGenerator/Writers/PythonWriter.cs b/src/Tableau.Migration.PythonGenerator/Writers/PythonWriter.cs
new file mode 100644
index 0000000..7412828
--- /dev/null
+++ b/src/Tableau.Migration.PythonGenerator/Writers/PythonWriter.cs
@@ -0,0 +1,151 @@
+//
+//  Copyright (c) 2024, Salesforce, Inc.
+//  SPDX-License-Identifier: Apache-2
+//  
+//  Licensed under the Apache License, Version 2.0 (the "License") 
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//  
+//  http://www.apache.org/licenses/LICENSE-2.0
+//  
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Extensions.Options;
+using Tableau.Migration.PythonGenerator.Config;
+
+namespace Tableau.Migration.PythonGenerator.Writers
+{
+    internal sealed class PythonWriter : PythonWriterBase, IPythonWriter
+    {
+        private readonly IPythonTypeWriter _typeWriter;
+        private readonly IPythonTestWriter _testWriter;
+        private readonly PythonGeneratorOptions _options;
+
+        public PythonWriter(IPythonTypeWriter typeWriter, IPythonTestWriter testWriter,
+            IOptions<PythonGeneratorOptions> options)
+        {
+            _typeWriter = typeWriter;
+            _testWriter = testWriter;
+            _options = options.Value;
+        }
+
+        private static void WriteTypeVars(IndentingStringBuilder builder, IEnumerable<PythonType> pyTypes)
+        {
+            var typeVars = pyTypes
+                .SelectMany(pt => pt.InheritedTypes)
+                .SelectMany(it => it.GenericTypes ?? ImmutableArray<PythonTypeReference>.Empty)
+                .Select(gt => gt.Name)
+                .Distinct()
+                .Order()
+                .ToImmutableArray();
+
+            if (typeVars.Any())
+            {
+                foreach (var typeVar in typeVars)
+                {
+                    builder.AppendLine($"{typeVar} = TypeVar(\"{typeVar}\")");
+                }
+
+                builder.AppendLine();
+            }
+        }
+
+        private void WriteTypeAndDependencies(IndentingStringBuilder builder, PythonType type,
+            IReadOnlyDictionary<string, PythonType> moduleTypes, HashSet<PythonType> writtenTypes, HashSet<PythonType> cycleReferences)
+        {
+            if (cycleReferences.Contains(type))
+            {
+                throw new Exception("Type dependency cycle detected. Consider implementing ordering or stubbing.");
+            }
+
+            if (writtenTypes.Contains(type))
+            {
+                return;
+            }
+
+            cycleReferences.Add(type);
+
+            var refTypes = type.GetAllTypeReferences().SelectMany(t => t.UnwrapGenerics());
+            foreach (var refType in refTypes)
+            {
+                if (!string.Equals(type.Module, refType.ImportModule, StringComparison.Ordinal) ||
+                    string.Equals(type.Name, refType.Name, StringComparison.Ordinal))
+                {
+                    continue;
+                }
+
+                if (!moduleTypes.TryGetValue(refType.Name, out var dependencyType))
+                {
+                    continue;
+                }
+
+                WriteTypeAndDependencies(builder, dependencyType, moduleTypes, writtenTypes, cycleReferences);
+            }
+
+            cycleReferences.Remove(type);
+
+            _typeWriter.Write(builder, type);
+            writtenTypes.Add(type);
+        }
+
+        private void WriteModuleTypes(IndentingStringBuilder builder, IEnumerable<PythonType> moduleTypes)
+        {
+            var moduleTypesByName = moduleTypes.ToImmutableDictionary(t => t.Name);
+            var writtenTypes = new HashSet<PythonType>();
+
+            foreach (var typeToWrite in moduleTypes.OrderBy(t => t.Name))
+            {
+                var cycleReferences = new HashSet<PythonType>();
+                WriteTypeAndDependencies(builder, typeToWrite, moduleTypesByName, writtenTypes, cycleReferences);
+            }
+        }
+
+        private async Task WritePublicAliasesAsync(IEnumerable<PythonType> moduleTypes, CancellationToken cancel)
+        {
+            var initFilePath = Path.Combine(_options.OutputPath, "__init__.py");
+            await using var segment = await GeneratedPythonSegment.OpenAsync(initFilePath, cancel);
+
+            foreach (var type in moduleTypes.OrderBy(x => x.Module).ThenBy(x => x.Name))
+            {
+                segment.StringBuilder.AppendLine($"from {type.Module} import {type.Name} as {type.DotNetType.Name} # noqa: E402, F401");
+            }
+        }
+
+        public async ValueTask WriteAsync(PythonTypeCache pyTypeCache, CancellationToken cancel)
+        {
+            var moduleGroups = pyTypeCache.Types
+                .GroupBy(p => p.Module);
+
+            foreach (var moduleGroup in moduleGroups)
+            {
+                var pyFileName = moduleGroup.Key.Replace("tableau_migration.", "") + ".py";
+                var pyFilePath = Path.Combine(_options.OutputPath, pyFileName);
+
+                await using var segment = await GeneratedPythonSegment.OpenAsync(pyFilePath, cancel);
+
+                WriteImports(segment.StringBuilder, moduleGroup.Key, moduleGroup);
+
+                WriteTypeVars(segment.StringBuilder, moduleGroup);
+
+                //Write types in dependency order.
+                WriteModuleTypes(segment.StringBuilder, moduleGroup);
+            }
+
+            await WritePublicAliasesAsync(pyTypeCache.Types, cancel);
+
+            await _testWriter.WriteAsync(pyTypeCache, cancel);
+        }
+    }
+}
diff --git a/src/Tableau.Migration.PythonGenerator/Writers/PythonWriterBase.cs b/src/Tableau.Migration.PythonGenerator/Writers/PythonWriterBase.cs
new file mode 100644
index 0000000..5e681a7
--- /dev/null
+++ b/src/Tableau.Migration.PythonGenerator/Writers/PythonWriterBase.cs
@@ -0,0 +1,171 @@
+//
+//  Copyright (c) 2024, Salesforce, Inc.
+//  SPDX-License-Identifier: Apache-2
+//  
+//  Licensed under the Apache License, Version 2.0 (the "License") 
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//  
+//  http://www.apache.org/licenses/LICENSE-2.0
+//  
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Linq;
+using Microsoft.CodeAnalysis;
+using Tableau.Migration.PythonGenerator.Writers.Imports;
+
+namespace Tableau.Migration.PythonGenerator.Writers
+{
+    internal abstract class PythonWriterBase
+    {
+        protected internal static void WriteImports(IndentingStringBuilder builder, string currentModule, IEnumerable<PythonType> pyTypes)
+        {
+            var typeRefs = new HashSet<PythonTypeReference>();
+
+            foreach (var pyType in pyTypes)
+            {
+                foreach (var typeRef in pyType.GetAllTypeReferences())
+                {
+                    foreach (var t in typeRef.UnwrapGenerics())
+                    {
+                        typeRefs.Add(t);
+                    }
+
+                    if (typeRef.ExtraImports is not null)
+                    {
+                        foreach (var extraImport in typeRef.ExtraImports)
+                        {
+                            typeRefs.Add(extraImport);
+                        }
+                    }
+                }
+            }
+
+            if (pyTypes.Any(t => t.HasSelfTypeReference()))
+            {
+                typeRefs.Add(new("Self", "typing_extensions", ConversionMode.Direct));
+            }
+
+            var pythonRefs = typeRefs.Where(IsPythonReference);
+            if (pythonRefs.Any())
+            {
+                WriteImportSection(builder, currentModule, pythonRefs);
+                builder.AppendLine();
+            }
+
+            var dotNetRefs = typeRefs.Where(t => !IsPythonReference(t));
+            if (dotNetRefs.Any())
+            {
+                WriteImportSection(builder, currentModule, dotNetRefs);
+                builder.AppendLine();
+            }
+        }
+
+        protected internal static void WritePythonImports(IndentingStringBuilder builder, ImmutableArray<PythonType> pyTypes)
+        {
+            if (pyTypes.Length == 0)
+            {
+                return;
+            }
+
+            if (pyTypes.Length == 1)
+            {
+                var typeName = pyTypes.First().Name;
+                var module = pyTypes.First().Module;
+
+                builder.AppendLine($"from {module} import {typeName} # noqa: E402, F401");
+                return;
+            }
+
+            foreach (var moduleBasedGrouping in pyTypes.GroupBy(x => x.Module))
+            {
+                var typesList = moduleBasedGrouping
+                    .OrderBy(x => x.Name)
+                    .Select(x => new ImportedType(x.Name))
+                    .ToHashSet();
+                WriteModuleImports(builder, new ImportedModule(moduleBasedGrouping.Key, typesList));
+                builder.AppendLine();
+            }
+
+            builder.AppendLine();
+        }
+
+        private static bool IsPythonReference(PythonTypeReference r) => string.IsNullOrEmpty(r.ImportModule) || char.IsLower(r.ImportModule[0]);
+
+        private static void WriteImportSection(IndentingStringBuilder builder, string currentModule, IEnumerable<PythonTypeReference> typeRefs)
+        {
+            var explicitImportModules = typeRefs
+                .Where(r => r.IsExplicitReference && r.ImportModule is not null)
+                .Select(r => r.ImportModule!)
+                .Distinct()
+                .Order()
+                .ToImmutableArray();
+
+            if (explicitImportModules.Any())
+            {
+                foreach (var explicitImportModule in explicitImportModules)
+                {
+                    builder.AppendLine($"import {explicitImportModule} # noqa: E402");
+                }
+
+                builder.AppendLine();
+            }
+
+            var implicitImportModules = typeRefs
+                .Where(r => !r.IsExplicitReference)
+                .Where(r => r.ImportModule is not null && !string.Equals(currentModule, r.ImportModule, System.StringComparison.Ordinal))
+                .GroupBy(r => r.ImportModule!)
+                .OrderBy(n => n.Key);
+
+            foreach (var implicitImportModule in implicitImportModules)
+            {
+                var typesList = new HashSet<ImportedType>();
+                foreach (var kvp in implicitImportModule)
+                {
+                    typesList.Add(new ImportedType(kvp.Name, kvp.ImportAlias));
+                }
+
+                WriteModuleImports(builder, new(implicitImportModule.Key, typesList));
+            }
+        }
+
+        /// <summary>
+        /// Writes imports for all types in a module using a list of type names.
+        /// </summary>
+        /// <param name="builder">The string builder to use.</param>
+        /// <param name="module">The name of the module.</param>
+        /// <param name="typeNames">The list of type names</param>
+        internal static void WriteModuleImports(IndentingStringBuilder builder, ImportedModule importedModule)
+        {
+            var module = importedModule.Name;
+            var types = importedModule.Types;
+            if (types.Count == 0)
+            {
+                return;
+            }
+
+            if (types.Count == 1)
+            {
+                builder.AppendLine($"from {module} import {types.First().GetNameWithAlias()} # noqa: E402, F401");
+                return;
+            }
+
+            var indentingBuilder = builder.AppendLineAndIndent($"from {module} import (  # noqa: E402, F401");
+
+            foreach (var typeName in types.SkipLast(1))
+            {
+                indentingBuilder.AppendLine($"{typeName.GetNameWithAlias()},");
+            }
+
+            indentingBuilder.AppendLine($"{types.Last().GetNameWithAlias()}");
+            builder.AppendLine(")");
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Tableau.Migration.PythonGenerator/appsettings.json b/src/Tableau.Migration.PythonGenerator/appsettings.json
new file mode 100644
index 0000000..44bffb6
--- /dev/null
+++ b/src/Tableau.Migration.PythonGenerator/appsettings.json
@@ -0,0 +1,55 @@
+{
+  "hints": {
+    "namespaces": [
+      {
+        "namespace": "Tableau.Migration",
+        "types": [
+          {
+            "type": "IResult",
+            "excludeMembers": [ "CastFailure" ]
+          }
+        ]
+      },
+      {
+        "namespace": "Tableau.Migration.Engine.Hooks.Mappings",
+        "types": [
+          {
+            "type": "ContentMappingContext",
+            "excludeMembers": [ "ToTask" ]
+          }
+        ]
+      },
+      {
+        "namespace": "Tableau.Migration.Engine.Hooks.PostPublish",
+        "types": [
+          {
+            "type": "BulkPostPublishContext",
+            "excludeMembers": [ "ToTask" ]
+          },
+          {
+            "type": "ContentItemPostPublishContext",
+            "excludeMembers": [ "ToTask" ]
+          }
+        ]
+      },
+      {
+        "namespace": "Tableau.Migration.Engine.Manifest",
+        "types": [
+          {
+            "type": "IMigrationManifestEntryEditor",
+            "excludeMembers": [ "SetFailed" ]
+          }
+        ]
+      },
+      {
+        "namespace": "Tableau.Migration.Content.Files",
+        "types": [
+          {
+            "type": "IContentFileHandle",
+            "excludeMembers": [ "OpenReadAsync", "OpenWriteAsync", "GetXmlStreamAsync", "Store" ]
+          }
+        ]
+      }
+    ]
+  }
+}
diff --git a/src/Tableau.Migration/Api/Rest/Models/LicenseLevels.cs b/src/Tableau.Migration/Api/Rest/Models/LicenseLevels.cs
index 59800c7..d86daa7 100644
--- a/src/Tableau.Migration/Api/Rest/Models/LicenseLevels.cs
+++ b/src/Tableau.Migration/Api/Rest/Models/LicenseLevels.cs
@@ -18,7 +18,7 @@
 namespace Tableau.Migration.Api.Rest.Models
 {
     /// <summary>
-    /// The license levels to be dreived from a siterole in <see cref="SiteRoles"/>.
+    /// The license levels to be derived from a siterole in <see cref="SiteRoles"/>.
     /// </summary>
     public class LicenseLevels : StringEnum<LicenseLevels>
     {
diff --git a/src/Tableau.Migration/Api/Rest/Models/PermissionsCapabilityNames.cs b/src/Tableau.Migration/Api/Rest/Models/PermissionsCapabilityNames.cs
index 062b239..f4c60a7 100644
--- a/src/Tableau.Migration/Api/Rest/Models/PermissionsCapabilityNames.cs
+++ b/src/Tableau.Migration/Api/Rest/Models/PermissionsCapabilityNames.cs
@@ -23,7 +23,7 @@ namespace Tableau.Migration.Api.Rest.Models
     public class PermissionsCapabilityNames : StringEnum<PermissionsCapabilityNames>
     {
         /// <summary>
-        /// Gets the name of capability name for no cabapibilities.
+        /// Gets the name of capability name for no capabilities.
         /// </summary>
         public const string None = "None";
 
diff --git a/src/Tableau.Migration/Content/IConnection.cs b/src/Tableau.Migration/Content/IConnection.cs
index 300bef1..b9141ee 100644
--- a/src/Tableau.Migration/Content/IConnection.cs
+++ b/src/Tableau.Migration/Content/IConnection.cs
@@ -15,15 +15,20 @@
 //  limitations under the License.
 //
 
-using Tableau.Migration.Api.Rest;
+using System;
 
 namespace Tableau.Migration.Content
 {
     /// <summary>
     /// Interface for a content item's embedded connection.
     /// </summary>
-    public interface IConnection : IRestIdentifiable
+    public interface IConnection
     {
+        /// <summary>
+        /// Gets the unique identifier.
+        /// </summary>
+        Guid Id { get; }
+
         /// <summary>
         /// Gets the connection type for the response.
         /// </summary>
diff --git a/src/Tableau.Migration/Content/IPublishableWorkbook.cs b/src/Tableau.Migration/Content/IPublishableWorkbook.cs
index f6bcf95..0bb5fa2 100644
--- a/src/Tableau.Migration/Content/IPublishableWorkbook.cs
+++ b/src/Tableau.Migration/Content/IPublishableWorkbook.cs
@@ -34,6 +34,6 @@ public interface IPublishableWorkbook : IWorkbookDetails, IFileContent, IConnect
         /// <summary>
         /// Gets the names of the views that should be hidden.
         /// </summary>
-        ISet<string> HiddenViewNames { get; }
+        ISet<string> HiddenViewNames { get; set; }
     }
 }
diff --git a/src/Tableau.Migration/Content/IView.cs b/src/Tableau.Migration/Content/IView.cs
index db2e81b..776f35b 100644
--- a/src/Tableau.Migration/Content/IView.cs
+++ b/src/Tableau.Migration/Content/IView.cs
@@ -18,7 +18,7 @@
 namespace Tableau.Migration.Content
 {
     /// <summary>
-    /// Interface for view associated with the content item
+    /// Interface for view associated with the content item.
     /// </summary>
     public interface IView : IWithTags, IPermissionsContent
     { }
diff --git a/src/Tableau.Migration/Content/IWorkbookDetails.cs b/src/Tableau.Migration/Content/IWorkbookDetails.cs
index 71cf5c9..3006024 100644
--- a/src/Tableau.Migration/Content/IWorkbookDetails.cs
+++ b/src/Tableau.Migration/Content/IWorkbookDetails.cs
@@ -24,7 +24,9 @@ namespace Tableau.Migration.Content
     /// </summary>
     public interface IWorkbookDetails : IWorkbook, IChildPermissionsContent
     {
-        /// <inheritdoc />
+        /// <summary>
+        /// Gets the view metadata.
+        /// </summary>
         public IImmutableList<IView> Views { get; }
     }
 }
diff --git a/src/Tableau.Migration/Content/Permissions/ICapability.cs b/src/Tableau.Migration/Content/Permissions/ICapability.cs
index e121bae..49c534c 100644
--- a/src/Tableau.Migration/Content/Permissions/ICapability.cs
+++ b/src/Tableau.Migration/Content/Permissions/ICapability.cs
@@ -30,7 +30,7 @@ public interface ICapability
         public string Name { get; }
 
         /// <summary>
-        /// The capability mode from <see cref="PermissionsCapabilityModes"/>
+        /// The capability mode from <see cref="PermissionsCapabilityModes"/>.
         /// </summary>
         public string Mode { get; }
     }
diff --git a/src/Tableau.Migration/Content/PublishableWorkbook.cs b/src/Tableau.Migration/Content/PublishableWorkbook.cs
index 1920dbc..ef0eaef 100644
--- a/src/Tableau.Migration/Content/PublishableWorkbook.cs
+++ b/src/Tableau.Migration/Content/PublishableWorkbook.cs
@@ -35,7 +35,7 @@ internal sealed class PublishableWorkbook : WorkbookDetails, IPublishableWorkboo
         public IImmutableList<IConnection> Connections { get; }
 
         /// <inheritdoc />
-        public ISet<string> HiddenViewNames { get; } = new HashSet<string>(View.NameComparer);
+        public ISet<string> HiddenViewNames { get; set; } = new HashSet<string>(View.NameComparer);
 
         public PublishableWorkbook(IWorkbookDetails workbook, IImmutableList<IConnection> connections, IContentFileHandle file)
             : base(workbook)
diff --git a/src/Tableau.Migration/Content/Search/ContentReferenceCacheBase.cs b/src/Tableau.Migration/Content/Search/ContentReferenceCacheBase.cs
index fb54683..1d9584d 100644
--- a/src/Tableau.Migration/Content/Search/ContentReferenceCacheBase.cs
+++ b/src/Tableau.Migration/Content/Search/ContentReferenceCacheBase.cs
@@ -31,6 +31,7 @@ public abstract class ContentReferenceCacheBase : IContentReferenceCache
         private readonly Dictionary<Guid, ContentReferenceStub?> _idCache = new();
 
         private readonly SemaphoreSlim _writeSemaphore = new(1, 1);
+        private bool _loaded = false;
 
         /// <summary>
         /// Gets the count of items in the cache.
@@ -93,19 +94,24 @@ public abstract class ContentReferenceCacheBase : IContentReferenceCache
                     return cachedResult;
                 }
 
-                var searchResults = await searchAsync(search, cancel).ConfigureAwait(false);
-                foreach (var searchResult in searchResults)
+                if (!_loaded)
                 {
-                    _idCache[searchResult.Id] = searchResult;
-                    _locationCache[searchResult.Location] = searchResult;
+                    // Load the cache with list values just once
+                    var searchResults = await searchAsync(search, cancel).ConfigureAwait(false);
+                    foreach (var searchResult in searchResults)
+                    {
+                        _idCache[searchResult.Id] = searchResult;
+                        _locationCache[searchResult.Location] = searchResult;
+                    }
+
+                    _loaded = true;
+
+                    // Retry lookup now that this attempt populated.
+                    if (cache.TryGetValue(search, out cachedResult))
+                    {
+                        return cachedResult;
+                    }
                 }
-                
-                // Retry lookup now that this attempt populated.
-                if (cache.TryGetValue(search, out cachedResult))
-                {
-                    return cachedResult;
-                }
-
                 // No cached results. Retry individual search.
                 cachedResult = await individualSearchAsync(search, cancel).ConfigureAwait(false);
                 
diff --git a/src/Tableau.Migration/ContentLocation.cs b/src/Tableau.Migration/ContentLocation.cs
index 29c5bb3..374ca23 100644
--- a/src/Tableau.Migration/ContentLocation.cs
+++ b/src/Tableau.Migration/ContentLocation.cs
@@ -54,7 +54,6 @@ public ContentLocation(params string[] segments)
             : this((IEnumerable<string>)segments)
         { }
 
-
         /// <summary>
         /// Creates a new <see cref="ContentLocation"/> value.
         /// </summary>
@@ -107,10 +106,27 @@ public ContentLocation(string pathSeparator, IEnumerable<string> segments)
         /// </summary>
         /// <param name="domain">The user/group domain.</param>
         /// <param name="username">The user/group name.</param>
-        /// <returns></returns>
+        /// <returns>The newly created <see cref="ContentLocation"/>.</returns>
         public static ContentLocation ForUsername(string domain, string username)
             => new(ImmutableArray.Create(domain, username), Constants.DomainNameSeparator);
 
+        /// <summary>
+        /// Creates a new <see cref="ContentLocation"/> value from a string.
+        /// </summary>
+        /// <param name="contentLocationPath">The full path of the location.</param>
+        /// <param name="pathSeparator">The separator to use between segments in the location path.</param>
+        /// <returns>The newly created <see cref="ContentLocation"/>.</returns>
+        public static ContentLocation FromPath(
+            string contentLocationPath, 
+            string pathSeparator = Constants.PathSeparator)
+            => new(
+                contentLocationPath
+                    .Split(
+                        pathSeparator, 
+                        StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries)
+                    .ToImmutableArray(),
+                pathSeparator);
+
         /// <summary>
         /// Compares the current instance with another object of the same type and returns
         /// an integer that indicates whether the current instance precedes, follows, or
@@ -140,7 +156,7 @@ public ContentLocation Append(string name)
         /// Creates a new <see cref="ContentLocation"/> with the last path segment replaced.
         /// </summary>
         /// <param name="newName">The new name to replace the last path segment with.</param>
-        /// <returns>The renamed <see cref="ContentLocation"/></returns>
+        /// <returns>The renamed <see cref="ContentLocation"/>.</returns>
         public ContentLocation Rename(string newName)
             => new(Parent(), newName);
 
diff --git a/src/Tableau.Migration/Engine/Endpoints/MigrationEndpointFactory.cs b/src/Tableau.Migration/Engine/Endpoints/MigrationEndpointFactory.cs
index f130b2d..38b70a6 100644
--- a/src/Tableau.Migration/Engine/Endpoints/MigrationEndpointFactory.cs
+++ b/src/Tableau.Migration/Engine/Endpoints/MigrationEndpointFactory.cs
@@ -29,8 +29,8 @@ namespace Tableau.Migration.Engine.Endpoints
     public class MigrationEndpointFactory : IMigrationEndpointFactory
     {
         private readonly IServiceScopeFactory _serviceScopeFactory;
-        private readonly ManifestDestinationContentReferenceFinderFactory _destinationFinderFactory;
-        private readonly ManifestSourceContentReferenceFinderFactory _sourceFinderFactory;
+        private readonly IDestinationContentReferenceFinderFactory _destinationFinderFactory;
+        private readonly ISourceContentReferenceFinderFactory _sourceFinderFactory;
         private readonly IContentFileStore _fileStore;
         private readonly ISharedResourcesLocalizer _localizer;
 
@@ -43,8 +43,8 @@ public class MigrationEndpointFactory : IMigrationEndpointFactory
         /// <param name="fileStore">The file store to use.</param>
         /// <param name="localizer">A string localizer.</param>
         public MigrationEndpointFactory(IServiceScopeFactory serviceScopeFactory,
-            ManifestSourceContentReferenceFinderFactory sourceFinderFactory,
-            ManifestDestinationContentReferenceFinderFactory destinationFinderFactory,
+            ISourceContentReferenceFinderFactory sourceFinderFactory,
+            IDestinationContentReferenceFinderFactory destinationFinderFactory,
             IContentFileStore fileStore,
             ISharedResourcesLocalizer localizer)
         {
diff --git a/src/Tableau.Migration/Engine/Endpoints/Search/IDestinationContentReferenceFinder.cs b/src/Tableau.Migration/Engine/Endpoints/Search/IDestinationContentReferenceFinder.cs
new file mode 100644
index 0000000..9656646
--- /dev/null
+++ b/src/Tableau.Migration/Engine/Endpoints/Search/IDestinationContentReferenceFinder.cs
@@ -0,0 +1,65 @@
+//
+//  Copyright (c) 2024, Salesforce, Inc.
+//  SPDX-License-Identifier: Apache-2
+//  
+//  Licensed under the Apache License, Version 2.0 (the "License") 
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//  
+//  http://www.apache.org/licenses/LICENSE-2.0
+//  
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using Tableau.Migration.Content.Search;
+
+namespace Tableau.Migration.Engine.Endpoints.Search
+{
+    /// <summary>
+    /// Interface for an object that can find destination content reference 
+    /// for given content information, applying mapping rules.
+    /// </summary>
+    /// <typeparam name="TContent">The content type.</typeparam>
+    public interface IDestinationContentReferenceFinder<TContent> : IContentReferenceFinder<TContent>
+        where TContent : IContentReference
+    {
+        /// <summary>
+        /// Finds the destination content reference for the source content reference location.
+        /// </summary>
+        /// <param name="sourceLocation">The source content reference location.</param>
+        /// <param name="cancel">A cancellation token to obey.</param>
+        /// <returns>The found destination content reference, or null if no content reference was found.</returns>
+        Task<IContentReference?> FindBySourceLocationAsync(ContentLocation sourceLocation, CancellationToken cancel);
+
+        /// <summary>
+        /// Finds the destination content reference for the mapped destination content reference location.
+        /// </summary>
+        /// <param name="mappedLocation">The destination mapped content reference location.</param>
+        /// <param name="cancel">A cancellation token to obey.</param>
+        /// <returns>The found destination content reference, or null if no content reference was found.</returns>
+        Task<IContentReference?> FindByMappedLocationAsync(ContentLocation mappedLocation, CancellationToken cancel);
+
+        /// <summary>
+        /// Finds the destination content reference for the source content reference unique identifier.
+        /// </summary>
+        /// <param name="sourceId">The source content reference unique identifier.</param>
+        /// <param name="cancel">A cancellation token to obey.</param>
+        /// <returns>The found destination content reference, or null if no content reference was found.</returns>
+        Task<IContentReference?> FindBySourceIdAsync(Guid sourceId, CancellationToken cancel);
+
+        /// <summary>
+        /// Finds the destination content reference for the source content reference URL.
+        /// </summary>
+        /// <param name="sourceContentUrl">The source content reference URL.</param>
+        /// <param name="cancel">A cancellation token to obey.</param>
+        /// <returns>The found destination content reference, or null if no content reference was found.</returns>
+        Task<IContentReference?> FindBySourceContentUrlAsync(string sourceContentUrl, CancellationToken cancel);
+    }
+}
diff --git a/src/Tableau.Migration/Engine/Endpoints/Search/IDestinationContentReferenceFinderFactory.cs b/src/Tableau.Migration/Engine/Endpoints/Search/IDestinationContentReferenceFinderFactory.cs
new file mode 100644
index 0000000..ef7b55a
--- /dev/null
+++ b/src/Tableau.Migration/Engine/Endpoints/Search/IDestinationContentReferenceFinderFactory.cs
@@ -0,0 +1,36 @@
+//
+//  Copyright (c) 2024, Salesforce, Inc.
+//  SPDX-License-Identifier: Apache-2
+//  
+//  Licensed under the Apache License, Version 2.0 (the "License") 
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//  
+//  http://www.apache.org/licenses/LICENSE-2.0
+//  
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+using Tableau.Migration.Content.Search;
+
+namespace Tableau.Migration.Engine.Endpoints.Search
+{
+    /// <summary>
+    /// Interface for an object that can create destination content reference finders
+    /// based on content type.
+    /// </summary>
+    public interface IDestinationContentReferenceFinderFactory : IContentReferenceFinderFactory
+    {
+        /// <summary>
+        /// Gets or creates a destination content reference finder for a given content type. 
+        /// </summary>
+        /// <typeparam name="TContent">The content type.</typeparam>
+        /// <returns>The content reference finder.</returns>
+        IDestinationContentReferenceFinder<TContent> ForDestinationContentType<TContent>()
+            where TContent : class, IContentReference;
+    }
+}
diff --git a/src/Tableau.Migration/Engine/Endpoints/Search/IMappedContentReferenceFinder.cs b/src/Tableau.Migration/Engine/Endpoints/Search/IMappedContentReferenceFinder.cs
deleted file mode 100644
index 4acac9d..0000000
--- a/src/Tableau.Migration/Engine/Endpoints/Search/IMappedContentReferenceFinder.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-//
-//  Copyright (c) 2024, Salesforce, Inc.
-//  SPDX-License-Identifier: Apache-2
-//  
-//  Licensed under the Apache License, Version 2.0 (the "License") 
-//  you may not use this file except in compliance with the License.
-//  You may obtain a copy of the License at
-//  
-//  http://www.apache.org/licenses/LICENSE-2.0
-//  
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace Tableau.Migration.Engine.Endpoints.Search
-{
-    /// <summary>
-    /// Interface for an object that can find equivalent destination content 
-    /// given source content information, applying mapping rules.
-    /// </summary>
-    public interface IMappedContentReferenceFinder
-    {
-        /// <summary>
-        /// Finds the equivalent destination content reference for the source reference.
-        /// </summary>
-        /// <param name="sourceLocation">The source content reference location.</param>
-        /// <param name="cancel">A cancellation token to obey.</param>
-        /// <returns>The found destination content reference, or null if no equivalent content exists.</returns>
-        Task<IContentReference?> FindDestinationReferenceAsync(ContentLocation sourceLocation, CancellationToken cancel);
-
-        /// <summary>
-        /// Finds the destination content reference for a mapped destination location.
-        /// </summary>
-        /// <param name="sourceLocation">The mapped content reference location.</param>
-        /// <param name="cancel">A cancellation token to obey.</param>
-        /// <returns>The found destination content reference, or null if no content was found.</returns>
-        Task<IContentReference?> FindMappedDestinationReferenceAsync(ContentLocation sourceLocation, CancellationToken cancel);
-        
-        /// <summary>
-        /// Finds the equivalent destination content reference for the source reference.
-        /// </summary>
-        /// <param name="sourceId">The source content ID.</param>
-        /// <param name="cancel">A cancellation token to obey.</param>
-        /// <returns>The found destination content reference, or null if no equivalent content exists.</returns>
-        Task<IContentReference?> FindDestinationReferenceAsync(Guid sourceId, CancellationToken cancel);
-
-        /// <summary>
-        /// Finds the equivalent destination content reference for the source reference.
-        /// </summary>
-        /// <param name="contentUrl">The source content URL.</param>
-        /// <param name="cancel">A cancellation token to obey.</param>
-        /// <returns>The found destination content reference, or null if no equivalent content exists.</returns>
-        Task<IContentReference?> FindDestinationReferenceAsync(string contentUrl, CancellationToken cancel);
-    }
-
-    /// <summary>
-    /// Interface for an object that can find equivalent destination content 
-    /// given source content information, applying mapping rules.
-    /// </summary>
-    /// <typeparam name="TContent">The content type.</typeparam>
-    public interface IMappedContentReferenceFinder<TContent> : IMappedContentReferenceFinder
-    { }
-}
diff --git a/src/Tableau.Migration/Engine/Endpoints/Search/ISourceContentReferenceFinder.cs b/src/Tableau.Migration/Engine/Endpoints/Search/ISourceContentReferenceFinder.cs
new file mode 100644
index 0000000..04707b1
--- /dev/null
+++ b/src/Tableau.Migration/Engine/Endpoints/Search/ISourceContentReferenceFinder.cs
@@ -0,0 +1,39 @@
+//
+//  Copyright (c) 2024, Salesforce, Inc.
+//  SPDX-License-Identifier: Apache-2
+//  
+//  Licensed under the Apache License, Version 2.0 (the "License") 
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//  
+//  http://www.apache.org/licenses/LICENSE-2.0
+//  
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+using System.Threading.Tasks;
+using System.Threading;
+using Tableau.Migration.Content.Search;
+
+namespace Tableau.Migration.Engine.Endpoints.Search
+{
+    /// <summary>
+    /// Interface for an object that can find source content reference.
+    /// </summary>
+    /// <typeparam name="TContent">The content type.</typeparam>
+    public interface ISourceContentReferenceFinder<TContent> : IContentReferenceFinder<TContent>
+        where TContent : IContentReference
+    {
+        /// <summary>
+        /// Finds the source content reference for the source content reference location.
+        /// </summary>
+        /// <param name="sourceLocation">The source content reference location.</param>
+        /// <param name="cancel">A cancellation token to obey.</param>
+        /// <returns>The found source content reference, or null if no content reference was found.</returns>
+        Task<IContentReference?> FindBySourceLocationAsync(ContentLocation sourceLocation, CancellationToken cancel);
+    }
+}
diff --git a/src/Tableau.Migration/Engine/Endpoints/Search/ISourceContentReferenceFinderFactory.cs b/src/Tableau.Migration/Engine/Endpoints/Search/ISourceContentReferenceFinderFactory.cs
new file mode 100644
index 0000000..13cebe6
--- /dev/null
+++ b/src/Tableau.Migration/Engine/Endpoints/Search/ISourceContentReferenceFinderFactory.cs
@@ -0,0 +1,36 @@
+//
+//  Copyright (c) 2024, Salesforce, Inc.
+//  SPDX-License-Identifier: Apache-2
+//  
+//  Licensed under the Apache License, Version 2.0 (the "License") 
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//  
+//  http://www.apache.org/licenses/LICENSE-2.0
+//  
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+using Tableau.Migration.Content.Search;
+
+namespace Tableau.Migration.Engine.Endpoints.Search
+{
+    /// <summary>
+    /// Interface for an object that can create source content reference finders
+    /// based on content type.
+    /// </summary>
+    public interface ISourceContentReferenceFinderFactory : IContentReferenceFinderFactory
+    {
+        /// <summary>
+        /// Gets or creates a source content reference finder for a given content type. 
+        /// </summary>
+        /// <typeparam name="TContent">The content type.</typeparam>
+        /// <returns>The content reference finder.</returns>
+        ISourceContentReferenceFinder<TContent> ForSourceContentType<TContent>()
+            where TContent : class, IContentReference;
+    }
+}
diff --git a/src/Tableau.Migration/Engine/Endpoints/Search/ManifestDestinationContentReferenceFinder.cs b/src/Tableau.Migration/Engine/Endpoints/Search/ManifestDestinationContentReferenceFinder.cs
index 5ff1c18..99ad08b 100644
--- a/src/Tableau.Migration/Engine/Endpoints/Search/ManifestDestinationContentReferenceFinder.cs
+++ b/src/Tableau.Migration/Engine/Endpoints/Search/ManifestDestinationContentReferenceFinder.cs
@@ -25,13 +25,13 @@
 namespace Tableau.Migration.Engine.Endpoints.Search
 {
     /// <summary>
-    /// <see cref="IMappedContentReferenceFinder{TContent}"/> implementation 
+    /// <see cref="IDestinationContentReferenceFinder{TContent}"/> implementation 
     /// that uses the mapped manifest information to find destination content, 
     /// falling back to API loading.
     /// </summary>
     /// <typeparam name="TContent">The content type.</typeparam>
     public class ManifestDestinationContentReferenceFinder<TContent>
-        : IMappedContentReferenceFinder<TContent>, IContentReferenceFinder<TContent>
+        : IDestinationContentReferenceFinder<TContent>
         where TContent : class, IContentReference
     {
         private readonly IMigrationManifestEditor _manifest;
@@ -48,10 +48,10 @@ public ManifestDestinationContentReferenceFinder(IMigrationManifestEditor manife
             _destinationCache = pipeline.CreateDestinationCache<TContent>();
         }
 
-        #region - IMappedContentReferenceFinder<TContent> Implementation -
+        #region - IDestinationContentReferenceFinder Implementation -
 
         /// <inheritdoc />
-        public async Task<IContentReference?> FindDestinationReferenceAsync(ContentLocation sourceLocation, CancellationToken cancel)
+        public async Task<IContentReference?> FindBySourceLocationAsync(ContentLocation sourceLocation, CancellationToken cancel)
         {
             //Get the DESTINATION reference for the SOURCE location.
             var manifestEntries = _manifest.Entries.GetOrCreatePartition<TContent>();
@@ -69,7 +69,7 @@ public ManifestDestinationContentReferenceFinder(IMigrationManifestEditor manife
         }
 
         /// <inheritdoc />
-        public async Task<IContentReference?> FindMappedDestinationReferenceAsync(ContentLocation mappedLocation, CancellationToken cancel)
+        public async Task<IContentReference?> FindByMappedLocationAsync(ContentLocation mappedLocation, CancellationToken cancel)
         {
             //Get the DESTINATION reference for the DESTINATION location.
             var manifestEntries = _manifest.Entries.GetOrCreatePartition<TContent>();
@@ -82,26 +82,26 @@ public ManifestDestinationContentReferenceFinder(IMigrationManifestEditor manife
         }
 
         /// <inheritdoc />
-        public async Task<IContentReference?> FindDestinationReferenceAsync(Guid sourceId, CancellationToken cancel)
+        public async Task<IContentReference?> FindBySourceIdAsync(Guid sourceId, CancellationToken cancel)
         {
             //Get the DESTINATION reference for the SOURCE ID.
             var manifestEntries = _manifest.Entries.GetOrCreatePartition<TContent>();
             if (manifestEntries.BySourceId.TryGetValue(sourceId, out var entry))
             {
-                return await FindDestinationReferenceAsync(entry.Source.Location, cancel).ConfigureAwait(false);
+                return await FindBySourceLocationAsync(entry.Source.Location, cancel).ConfigureAwait(false);
             }
 
             return null;
         }
 
         /// <inheritdoc />
-        public async Task<IContentReference?> FindDestinationReferenceAsync(string contentUrl, CancellationToken cancel)
+        public async Task<IContentReference?> FindBySourceContentUrlAsync(string contentUrl, CancellationToken cancel)
         {
             //Get the DESTINATION reference for the SOURCE content URL.
             var manifestEntries = _manifest.Entries.GetOrCreatePartition<TContent>();
             if (manifestEntries.BySourceContentUrl.TryGetValue(contentUrl, out var entry))
             {
-                return await FindDestinationReferenceAsync(entry.Source.Location, cancel).ConfigureAwait(false);
+                return await FindBySourceLocationAsync(entry.Source.Location, cancel).ConfigureAwait(false);
             }
 
             return null;
@@ -109,7 +109,7 @@ public ManifestDestinationContentReferenceFinder(IMigrationManifestEditor manife
 
         #endregion
 
-        #region - IContentReferenceFinder<TContent> Implementation -
+        #region - IContentReferenceFinder Implementation -
 
         /// <inheritdoc />
         public async Task<IContentReference?> FindByIdAsync(Guid id, CancellationToken cancel)
diff --git a/src/Tableau.Migration/Engine/Endpoints/Search/ManifestDestinationContentReferenceFinderFactory.cs b/src/Tableau.Migration/Engine/Endpoints/Search/ManifestDestinationContentReferenceFinderFactory.cs
index 333b7de..92cdeab 100644
--- a/src/Tableau.Migration/Engine/Endpoints/Search/ManifestDestinationContentReferenceFinderFactory.cs
+++ b/src/Tableau.Migration/Engine/Endpoints/Search/ManifestDestinationContentReferenceFinderFactory.cs
@@ -25,22 +25,28 @@ namespace Tableau.Migration.Engine.Endpoints.Search
     /// <see cref="IContentReferenceFinderFactory"/> implementation that finds destination references
     /// from the migration manifest.
     /// </summary>
-    public class ManifestDestinationContentReferenceFinderFactory : IContentReferenceFinderFactory
+    public class ManifestDestinationContentReferenceFinderFactory 
+        : IDestinationContentReferenceFinderFactory
     {
         private readonly IServiceProvider _services;
 
         /// <summary>
         /// Creates a new <see cref="ManifestDestinationContentReferenceFinderFactory"/> object.
         /// </summary>
-        /// <param name="services">A service provider.</param>
+        /// <param name="services">A DI service provider to create finders with.</param>
         public ManifestDestinationContentReferenceFinderFactory(IServiceProvider services)
         {
             _services = services;
         }
 
         /// <inheritdoc />
-        public IContentReferenceFinder<TContent> ForContentType<TContent>()
+        public virtual IContentReferenceFinder<TContent> ForContentType<TContent>()
             where TContent : class, IContentReference
-            => _services.GetRequiredService<ManifestDestinationContentReferenceFinder<TContent>>();
+            => ForDestinationContentType<TContent>();
+
+        /// <inheritdoc />
+        public virtual IDestinationContentReferenceFinder<TContent> ForDestinationContentType<TContent>()
+            where TContent : class, IContentReference
+            => _services.GetRequiredService<IDestinationContentReferenceFinder<TContent>>();
     }
 }
diff --git a/src/Tableau.Migration/Engine/Endpoints/Search/ManifestSourceContentReferenceFinder.cs b/src/Tableau.Migration/Engine/Endpoints/Search/ManifestSourceContentReferenceFinder.cs
index 5183008..b39bd67 100644
--- a/src/Tableau.Migration/Engine/Endpoints/Search/ManifestSourceContentReferenceFinder.cs
+++ b/src/Tableau.Migration/Engine/Endpoints/Search/ManifestSourceContentReferenceFinder.cs
@@ -29,7 +29,8 @@ namespace Tableau.Migration.Engine.Endpoints.Search
     /// from the migration manifest.
     /// </summary>
     /// <typeparam name="TContent">The content type.</typeparam>
-    public class ManifestSourceContentReferenceFinder<TContent> : IContentReferenceFinder<TContent>
+    public class ManifestSourceContentReferenceFinder<TContent> 
+        : ISourceContentReferenceFinder<TContent>
         where TContent : class, IContentReference
     {
         private readonly IMigrationManifestEditor _manifest;
@@ -46,9 +47,23 @@ public ManifestSourceContentReferenceFinder(IMigrationManifestEditor manifest, I
             _sourceCache = pipeline.CreateSourceCache<TContent>();
         }
 
+        /// <inheritdoc />
+        public async Task<IContentReference?> FindBySourceLocationAsync(ContentLocation sourceLocation, CancellationToken cancel)
+        {
+            //Get the SOURCE reference for the SOURCE location.
+            var manifestEntries = _manifest.Entries.GetOrCreatePartition<TContent>();
+            if (manifestEntries.BySourceLocation.TryGetValue(sourceLocation, out var entry))
+            {
+                return entry.Source;
+            }
+
+            return await _sourceCache.ForLocationAsync(sourceLocation, cancel).ConfigureAwait(false);
+        }
+
         /// <inheritdoc />
         public async Task<IContentReference?> FindByIdAsync(Guid id, CancellationToken cancel)
         {
+            //Get the SOURCE reference for the SOURCE ID.
             var partition = _manifest.Entries.GetOrCreatePartition<TContent>();
 
             if (partition.BySourceId.TryGetValue(id, out var entry))
diff --git a/src/Tableau.Migration/Engine/Endpoints/Search/ManifestSourceContentReferenceFinderFactory.cs b/src/Tableau.Migration/Engine/Endpoints/Search/ManifestSourceContentReferenceFinderFactory.cs
index e314b4e..b171e0a 100644
--- a/src/Tableau.Migration/Engine/Endpoints/Search/ManifestSourceContentReferenceFinderFactory.cs
+++ b/src/Tableau.Migration/Engine/Endpoints/Search/ManifestSourceContentReferenceFinderFactory.cs
@@ -25,22 +25,27 @@ namespace Tableau.Migration.Engine.Endpoints.Search
     /// <see cref="IContentReferenceFinderFactory"/> implementation that finds source references
     /// from the migration manifest.
     /// </summary>
-    public class ManifestSourceContentReferenceFinderFactory : IContentReferenceFinderFactory
+    public class ManifestSourceContentReferenceFinderFactory : ISourceContentReferenceFinderFactory
     {
         private readonly IServiceProvider _services;
 
         /// <summary>
         /// Creates a new <see cref="ManifestSourceContentReferenceFinderFactory"/> object.
         /// </summary>
-        /// <param name="services">The service provider.</param>
+        /// <param name="services">A DI service provider to create finders with.</param>
         public ManifestSourceContentReferenceFinderFactory(IServiceProvider services)
         {
             _services = services;
         }
 
         /// <inheritdoc />
-        public IContentReferenceFinder<TContent> ForContentType<TContent>()
+        public virtual IContentReferenceFinder<TContent> ForContentType<TContent>()
             where TContent : class, IContentReference
-            => _services.GetRequiredService<ManifestSourceContentReferenceFinder<TContent>>();
+            => ForSourceContentType<TContent>();
+
+        /// <inheritdoc />
+        public virtual ISourceContentReferenceFinder<TContent> ForSourceContentType<TContent>()
+            where TContent : class, IContentReference
+            => _services.GetRequiredService<ISourceContentReferenceFinder<TContent>>();
     }
 }
diff --git a/src/Tableau.Migration/Engine/Endpoints/TableauApiDestinationEndpoint.cs b/src/Tableau.Migration/Engine/Endpoints/TableauApiDestinationEndpoint.cs
index 8854e09..f55a3fe 100644
--- a/src/Tableau.Migration/Engine/Endpoints/TableauApiDestinationEndpoint.cs
+++ b/src/Tableau.Migration/Engine/Endpoints/TableauApiDestinationEndpoint.cs
@@ -44,7 +44,7 @@ public class TableauApiDestinationEndpoint : TableauApiEndpointBase, IDestinatio
         /// <param name="localizer">A string localizer.</param>
         public TableauApiDestinationEndpoint(IServiceScopeFactory serviceScopeFactory,
             ITableauApiEndpointConfiguration config,
-            ManifestDestinationContentReferenceFinderFactory finderFactory,
+            IDestinationContentReferenceFinderFactory finderFactory,
             IContentFileStore fileStore,
             ISharedResourcesLocalizer localizer)
             : base(serviceScopeFactory, config, finderFactory, fileStore, localizer)
diff --git a/src/Tableau.Migration/Engine/Endpoints/TableauApiSourceEndpoint.cs b/src/Tableau.Migration/Engine/Endpoints/TableauApiSourceEndpoint.cs
index 66565d2..ef08372 100644
--- a/src/Tableau.Migration/Engine/Endpoints/TableauApiSourceEndpoint.cs
+++ b/src/Tableau.Migration/Engine/Endpoints/TableauApiSourceEndpoint.cs
@@ -39,7 +39,7 @@ public class TableauApiSourceEndpoint : TableauApiEndpointBase, ISourceApiEndpoi
         /// <param name="localizer">A string localizer.</param>
         public TableauApiSourceEndpoint(IServiceScopeFactory serviceScopeFactory,
             ITableauApiEndpointConfiguration config,
-            ManifestSourceContentReferenceFinderFactory finderFactory,
+            ISourceContentReferenceFinderFactory finderFactory,
             IContentFileStore fileStore,
             ISharedResourcesLocalizer localizer)
             : base(serviceScopeFactory, config, finderFactory, fileStore, localizer)
diff --git a/src/Tableau.Migration/Engine/Hooks/Filters/ContentFilterBase.cs b/src/Tableau.Migration/Engine/Hooks/Filters/ContentFilterBase.cs
index 8b8be32..f3f7272 100644
--- a/src/Tableau.Migration/Engine/Hooks/Filters/ContentFilterBase.cs
+++ b/src/Tableau.Migration/Engine/Hooks/Filters/ContentFilterBase.cs
@@ -48,7 +48,7 @@ public abstract class ContentFilterBase<TContent> : IContentFilter<TContent>
         {
             _localizer = localizer;
             _logger = logger;
-            _typeName = this.GetType().Name;
+            _typeName = GetType().Name;
         }
 
         /// <inheritdoc />
diff --git a/src/Tableau.Migration/Engine/Hooks/Mappings/ContentMappingBase.cs b/src/Tableau.Migration/Engine/Hooks/Mappings/ContentMappingBase.cs
index e9503e8..079e51a 100644
--- a/src/Tableau.Migration/Engine/Hooks/Mappings/ContentMappingBase.cs
+++ b/src/Tableau.Migration/Engine/Hooks/Mappings/ContentMappingBase.cs
@@ -17,7 +17,6 @@
 
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Logging;
 using Tableau.Migration.Resources;
 
@@ -55,7 +54,7 @@ public abstract class ContentMappingBase<TContent> : IContentMapping<TContent>
 
             if((_logger is not null) && (_localizer is not null))
                 _logger.LogDebug(_localizer[(SharedResourceKeys.ContentMappingBaseDebugMessage)], _typeName, ctx.ContentItem.ToStringForLog(), ctx.MappedLocation);
-
+            
             return ret;
         }
 
diff --git a/src/Tableau.Migration/Engine/Hooks/Transformers/Default/GroupUsersTransformer.cs b/src/Tableau.Migration/Engine/Hooks/Transformers/Default/GroupUsersTransformer.cs
index 2b1343d..5898ece 100644
--- a/src/Tableau.Migration/Engine/Hooks/Transformers/Default/GroupUsersTransformer.cs
+++ b/src/Tableau.Migration/Engine/Hooks/Transformers/Default/GroupUsersTransformer.cs
@@ -19,7 +19,7 @@
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 using Tableau.Migration.Content;
-using Tableau.Migration.Engine.Pipelines;
+using Tableau.Migration.Engine.Endpoints.Search;
 using Tableau.Migration.Resources;
 
 namespace Tableau.Migration.Engine.Hooks.Transformers.Default
@@ -29,22 +29,22 @@ namespace Tableau.Migration.Engine.Hooks.Transformers.Default
     /// </summary>
     public class GroupUsersTransformer : ContentTransformerBase<IPublishableGroup>
     {
-        private readonly IMigrationPipeline _migrationPipeline;
+        private readonly IDestinationContentReferenceFinder<IUser> _userFinder;
         private readonly ISharedResourcesLocalizer _localizer;
         private readonly ILogger<GroupUsersTransformer> _logger;
 
         /// <summary>
         /// Creates a new <see cref="GroupUsersTransformer"/> object.
         /// </summary>
-        /// <param name="migrationPipeline">Destination content finder object.</param>
+        /// <param name="destinationFinderFactory">The destination finder factory.</param>
         /// <param name="localizer">A string localizer.</param>
         /// <param name="logger">The logger used to log messages.</param>
         public GroupUsersTransformer(
-            IMigrationPipeline migrationPipeline,
+            IDestinationContentReferenceFinderFactory destinationFinderFactory,
             ISharedResourcesLocalizer localizer,
             ILogger<GroupUsersTransformer> logger) : base(localizer, logger)
         {
-            _migrationPipeline = migrationPipeline;
+            _userFinder = destinationFinderFactory.ForDestinationContentType<IUser>();
             _localizer = localizer;
             _logger = logger;
         }
@@ -54,12 +54,10 @@ public class GroupUsersTransformer : ContentTransformerBase<IPublishableGroup>
             IPublishableGroup sourceGroup,
             CancellationToken cancel)
         {
-            var userFinder = _migrationPipeline.CreateDestinationFinder<IUser>();
-
             foreach (var user in sourceGroup.Users)
             {
-                var destinationUser = await userFinder
-                    .FindDestinationReferenceAsync(user.User.Location, cancel)
+                var destinationUser = await _userFinder
+                    .FindBySourceLocationAsync(user.User.Location, cancel)
                     .ConfigureAwait(false);
 
                 if (destinationUser is not null)
diff --git a/src/Tableau.Migration/Engine/Hooks/Transformers/Default/MappedUserTransformer.cs b/src/Tableau.Migration/Engine/Hooks/Transformers/Default/MappedUserTransformer.cs
index a81431c..21d29c2 100644
--- a/src/Tableau.Migration/Engine/Hooks/Transformers/Default/MappedUserTransformer.cs
+++ b/src/Tableau.Migration/Engine/Hooks/Transformers/Default/MappedUserTransformer.cs
@@ -30,22 +30,22 @@ namespace Tableau.Migration.Engine.Hooks.Transformers.Default
     /// </summary>
     public class MappedUserTransformer : IMappedUserTransformer
     {
-        private readonly IMappedContentReferenceFinder<IUser> _userFinder;
+        private readonly IDestinationContentReferenceFinder<IUser> _userFinder;
         private readonly ILogger _logger;
         private readonly ISharedResourcesLocalizer _localizer;
 
         /// <summary>
         /// Creates a new <see cref="MappedUserTransformer"/> object.
         /// </summary>
-        /// <param name="pipeline">The migration pipeline.</param>
+        /// <param name="destinationFinderFactory">The destination finder factory.</param>
         /// <param name="logger">The logger used to log messages.</param>
         /// <param name="localizer">The string localizer.</param>
         public MappedUserTransformer(
-            IMigrationPipeline pipeline,
+            IDestinationContentReferenceFinderFactory destinationFinderFactory,
             ILogger<MappedUserTransformer> logger,
             ISharedResourcesLocalizer localizer)
         {
-            _userFinder = pipeline.CreateDestinationFinder<IUser>();
+            _userFinder = destinationFinderFactory.ForDestinationContentType<IUser>();
             _logger = logger;
             _localizer = localizer;
         }
@@ -59,7 +59,7 @@ public class MappedUserTransformer : IMappedUserTransformer
                 return null;
             }
 
-            var mapped = await _userFinder.FindDestinationReferenceAsync(ctx.Location, cancel)
+            var mapped = await _userFinder.FindBySourceLocationAsync(ctx.Location, cancel)
                 .ConfigureAwait(false);
 
             if (mapped is null)
diff --git a/src/Tableau.Migration/Engine/Hooks/Transformers/Default/PermissionsTransformer.cs b/src/Tableau.Migration/Engine/Hooks/Transformers/Default/PermissionsTransformer.cs
index 0911698..319391f 100644
--- a/src/Tableau.Migration/Engine/Hooks/Transformers/Default/PermissionsTransformer.cs
+++ b/src/Tableau.Migration/Engine/Hooks/Transformers/Default/PermissionsTransformer.cs
@@ -15,6 +15,7 @@
 //  limitations under the License.
 //
 
+using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Linq;
@@ -26,7 +27,6 @@
 using Tableau.Migration.Content;
 using Tableau.Migration.Content.Permissions;
 using Tableau.Migration.Engine.Endpoints.Search;
-using Tableau.Migration.Engine.Pipelines;
 using Tableau.Migration.Resources;
 
 namespace Tableau.Migration.Engine.Hooks.Transformers.Default
@@ -36,21 +36,24 @@ namespace Tableau.Migration.Engine.Hooks.Transformers.Default
     /// </summary>
     public class PermissionsTransformer : IPermissionsTransformer
     {
-        private readonly IMappedContentReferenceFinder<IUser> _userContentFinder;
-        private readonly IMappedContentReferenceFinder<IGroup> _groupContentFinder;
+        private readonly IDestinationContentReferenceFinder<IUser> _userContentFinder;
+        private readonly IDestinationContentReferenceFinder<IGroup> _groupContentFinder;
         private readonly ILogger<PermissionsTransformer> _logger;
         private readonly ISharedResourcesLocalizer _localizer;
 
         /// <summary>
         /// Creates a new <see cref="PermissionsTransformer"/> object.
         /// </summary>
-        /// <param name="migrationPipeline">Destination content finder object.</param>
+        /// <param name="destinationFinderFactory">The destination finder factory.</param>
         /// <param name="logger">Default logger.</param>
         /// <param name="localizer">A string localizer.</param>
-        public PermissionsTransformer(IMigrationPipeline migrationPipeline, ILogger<PermissionsTransformer> logger, ISharedResourcesLocalizer localizer)
+        public PermissionsTransformer(
+            IDestinationContentReferenceFinderFactory destinationFinderFactory,
+            ILogger<PermissionsTransformer> logger, 
+            ISharedResourcesLocalizer localizer)
         {
-            _userContentFinder = migrationPipeline.CreateDestinationFinder<IUser>();
-            _groupContentFinder = migrationPipeline.CreateDestinationFinder<IGroup>();
+            _userContentFinder = destinationFinderFactory.ForDestinationContentType<IUser>();
+            _groupContentFinder = destinationFinderFactory.ForDestinationContentType<IGroup>();
             _logger = logger;
             _localizer = localizer;
         }
@@ -91,11 +94,10 @@ private static bool ShouldMigrateCapability(ICapability c)
             {
                 var granteeType = group.First().GranteeType;
 
-                IMappedContentReferenceFinder contentFinder = granteeType is GranteeType.User
-                    ? _userContentFinder : _groupContentFinder;
-
-                var destinationGrantee = await contentFinder
-                    .FindDestinationReferenceAsync(group.Key, cancel)
+                var destinationGrantee = await GetDestinationGranteeAsync(
+                    group.Key,
+                    granteeType, 
+                    cancel)
                     .ConfigureAwait(false);
 
                 if (destinationGrantee is null)
@@ -121,5 +123,22 @@ private static bool ShouldMigrateCapability(ICapability c)
 
             return transformedGrantees.ToImmutableArray();
         }
+
+        private async Task<IContentReference?> GetDestinationGranteeAsync(
+            Guid groupKey, 
+            GranteeType granteeType, 
+            CancellationToken cancel)
+        {
+            if (granteeType is GranteeType.User)
+            {
+                return await _userContentFinder
+                    .FindBySourceIdAsync(groupKey, cancel)
+                    .ConfigureAwait(false);
+            }
+
+            return await _groupContentFinder
+                .FindBySourceIdAsync(groupKey, cancel)
+                .ConfigureAwait(false);
+        }
     }
 }
diff --git a/src/Tableau.Migration/Engine/Hooks/Transformers/Default/TableauServerConnectionUrlTransformer.cs b/src/Tableau.Migration/Engine/Hooks/Transformers/Default/TableauServerConnectionUrlTransformer.cs
index 7fbecc6..107fa96 100644
--- a/src/Tableau.Migration/Engine/Hooks/Transformers/Default/TableauServerConnectionUrlTransformer.cs
+++ b/src/Tableau.Migration/Engine/Hooks/Transformers/Default/TableauServerConnectionUrlTransformer.cs
@@ -55,7 +55,7 @@ public class TableauServerConnectionUrlTransformer : XmlContentTransformerBase<I
         internal const string TABLEAU_SERVER_CONNECTION_CLASS = "sqlproxy";
 
         private readonly ITableauApiEndpointConfiguration? _destinationConfig; //Null if the destination is not an API.
-        private readonly IMappedContentReferenceFinder<IDataSource> _mappedDataSourceFinder;
+        private readonly IDestinationContentReferenceFinder<IDataSource> _mappedDataSourceFinder;
         private readonly ILogger<TableauServerConnectionUrlTransformer> _logger;
         private readonly ISharedResourcesLocalizer _localizer;
 
@@ -69,15 +69,18 @@ public class TableauServerConnectionUrlTransformer : XmlContentTransformerBase<I
         /// Creates a new <see cref="TableauServerConnectionUrlTransformer"/> object.
         /// </summary>
         /// <param name="migration">The current migration.</param>
+        /// <param name="destinationFinderFactory">The destination finder factory.</param>
         /// <param name="logger">A logger to use.</param>
         /// <param name="localizer">A localizer to user.</param>
-        public TableauServerConnectionUrlTransformer(IMigration migration,
+        public TableauServerConnectionUrlTransformer(
+            IMigration migration,
+            IDestinationContentReferenceFinderFactory destinationFinderFactory,
             ILogger<TableauServerConnectionUrlTransformer> logger,
             ISharedResourcesLocalizer localizer)
         {
             _contentUrlWarnings = new(StringComparer.OrdinalIgnoreCase);
             _destinationConfig = migration.Plan.Destination as ITableauApiEndpointConfiguration;
-            _mappedDataSourceFinder = migration.Pipeline.CreateDestinationFinder<IDataSource>();
+            _mappedDataSourceFinder = destinationFinderFactory.ForDestinationContentType<IDataSource>();
             _logger = logger;
             _localizer = localizer;
         }
@@ -94,7 +97,7 @@ private async Task UpdateContentUrlAsync(IPublishableWorkbook workbook, XAttribu
             var sourceContentUrl = attr.Value;
 
             //Find the published data source reference.
-            var destDataSourceRef = await _mappedDataSourceFinder.FindDestinationReferenceAsync(sourceContentUrl, cancel)
+            var destDataSourceRef = await _mappedDataSourceFinder.FindBySourceContentUrlAsync(sourceContentUrl, cancel)
                 .ConfigureAwait(false);
 
             if (destDataSourceRef is not null)
@@ -196,7 +199,7 @@ protected override bool NeedsXmlTransforming(IPublishableWorkbook ctx)
             => ctx.Connections.Any(c => c.Type is TABLEAU_SERVER_CONNECTION_CLASS);
 
         /// <inheritdoc />
-        public override async Task ExecuteAsync(IPublishableWorkbook ctx, XDocument xml, CancellationToken cancel)
+        public override async Task TransformAsync(IPublishableWorkbook ctx, XDocument xml, CancellationToken cancel)
         {
             //Update <connection> elements.
             foreach (var connectionElement in xml.GetFeatureFlaggedDescendants(CONNECTION_EL))
diff --git a/src/Tableau.Migration/Engine/Hooks/Transformers/IXmlContentTransformer.cs b/src/Tableau.Migration/Engine/Hooks/Transformers/IXmlContentTransformer.cs
index 23b9030..db8277c 100644
--- a/src/Tableau.Migration/Engine/Hooks/Transformers/IXmlContentTransformer.cs
+++ b/src/Tableau.Migration/Engine/Hooks/Transformers/IXmlContentTransformer.cs
@@ -47,7 +47,7 @@ public interface IXmlContentTransformer<TPublish> : IContentTransformer<TPublish
         /// </param>
         /// <param name="cancel">A cancellation token to obey.</param>
         /// <returns>A task to await.</returns>
-        Task ExecuteAsync(TPublish ctx, XDocument xml, CancellationToken cancel);
+        Task TransformAsync(TPublish ctx, XDocument xml, CancellationToken cancel);
 
         /// <inheritdoc />
         async Task<TPublish?> IMigrationHook<TPublish>.ExecuteAsync(TPublish ctx, CancellationToken cancel)
@@ -56,13 +56,13 @@ public interface IXmlContentTransformer<TPublish> : IContentTransformer<TPublish
             {
                 return ctx;
             }
-
+            
             //We expect the item preparer to finalize/dispose the file stream.
             var xmlStream = await ctx.File.GetXmlStreamAsync(cancel).ConfigureAwait(false);
             var xml = await xmlStream.GetXmlAsync(cancel).ConfigureAwait(false);
 
-            await ExecuteAsync(ctx, xml, cancel).ConfigureAwait(false);
-
+            await TransformAsync(ctx, xml, cancel).ConfigureAwait(false);
+            
             return ctx;
         }
     }
diff --git a/src/Tableau.Migration/Engine/Hooks/Transformers/XmlContentTransformerBase.cs b/src/Tableau.Migration/Engine/Hooks/Transformers/XmlContentTransformerBase.cs
index fc7b95b..c1d9fa6 100644
--- a/src/Tableau.Migration/Engine/Hooks/Transformers/XmlContentTransformerBase.cs
+++ b/src/Tableau.Migration/Engine/Hooks/Transformers/XmlContentTransformerBase.cs
@@ -40,6 +40,6 @@ public abstract class XmlContentTransformerBase<TPublish> : IXmlContentTransform
         bool IXmlContentTransformer<TPublish>.NeedsXmlTransforming(TPublish ctx) => NeedsXmlTransforming(ctx);
 
         /// <inheritdoc />
-        public abstract Task ExecuteAsync(TPublish ctx, XDocument xml, CancellationToken cancel);
+        public abstract Task TransformAsync(TPublish ctx, XDocument xml, CancellationToken cancel);
     }
 }
diff --git a/src/Tableau.Migration/Engine/IServiceCollectionExtensions.cs b/src/Tableau.Migration/Engine/IServiceCollectionExtensions.cs
index 71096e5..e7a05bb 100644
--- a/src/Tableau.Migration/Engine/IServiceCollectionExtensions.cs
+++ b/src/Tableau.Migration/Engine/IServiceCollectionExtensions.cs
@@ -97,13 +97,13 @@ internal static IServiceCollection AddMigrationEngine(this IServiceCollection se
             //Caches/Content Finders
             //Register concrete types so that the easy way to get interface types is through IMigrationPipeline.
             services.AddScoped(typeof(BulkSourceCache<>));
-            services.AddScoped(typeof(ManifestSourceContentReferenceFinder<>));
-            services.AddScoped<ManifestSourceContentReferenceFinderFactory>();
+            services.AddScoped(typeof(ISourceContentReferenceFinder<>), typeof(ManifestSourceContentReferenceFinder<>));
+            services.AddScoped<ISourceContentReferenceFinderFactory, ManifestSourceContentReferenceFinderFactory>();
 
             services.AddScoped(typeof(BulkDestinationCache<>));
             services.AddScoped<BulkDestinationProjectCache>();
-            services.AddScoped(typeof(ManifestDestinationContentReferenceFinder<>));
-            services.AddScoped<ManifestDestinationContentReferenceFinderFactory>();
+            services.AddScoped(typeof(IDestinationContentReferenceFinder<>), typeof(ManifestDestinationContentReferenceFinder<>));
+            services.AddScoped<IDestinationContentReferenceFinderFactory, ManifestDestinationContentReferenceFinderFactory>();
 
             //Pipelines.
             services.AddScoped<ServerToCloudMigrationPipeline>();
diff --git a/src/Tableau.Migration/Engine/MigrationInput.cs b/src/Tableau.Migration/Engine/MigrationInput.cs
index 380e8c2..3440d87 100644
--- a/src/Tableau.Migration/Engine/MigrationInput.cs
+++ b/src/Tableau.Migration/Engine/MigrationInput.cs
@@ -47,7 +47,7 @@ public MigrationInput(ILogger<MigrationInput> log, ISharedResourcesLocalizer loc
         /// <inheritdoc />
         public IMigrationPlan Plan
         {
-            get => _plan ?? throw new InvalidOperationException($"{nameof(MigrationInput)} must be initialized before it it used.");
+            get => _plan ?? throw new InvalidOperationException($"{nameof(MigrationInput)} must be initialized before it is used.");
             private set => _plan = value;
         }
         private IMigrationPlan? _plan;
diff --git a/src/Tableau.Migration/Engine/Pipelines/IMigrationPipeline.cs b/src/Tableau.Migration/Engine/Pipelines/IMigrationPipeline.cs
index e3fe233..8be9dbf 100644
--- a/src/Tableau.Migration/Engine/Pipelines/IMigrationPipeline.cs
+++ b/src/Tableau.Migration/Engine/Pipelines/IMigrationPipeline.cs
@@ -77,14 +77,6 @@ IContentReferenceCache CreateSourceCache<TContent>()
         IContentReferenceCache CreateDestinationCache<TContent>()
             where TContent : class, IContentReference;
 
-        /// <summary>
-        /// Gets the destination content finder for the given content type.
-        /// </summary>
-        /// <typeparam name="TContent">The content type.</typeparam>
-        /// <returns>The destination content finder.</returns>
-        IMappedContentReferenceFinder<TContent> CreateDestinationFinder<TContent>()
-            where TContent : class, IContentReference;
-
         /// <summary>
         /// Gets the destination locked project cache.
         /// </summary>
diff --git a/src/Tableau.Migration/Engine/Pipelines/MigrationPipelineBase.cs b/src/Tableau.Migration/Engine/Pipelines/MigrationPipelineBase.cs
index d0cd9d0..035810f 100644
--- a/src/Tableau.Migration/Engine/Pipelines/MigrationPipelineBase.cs
+++ b/src/Tableau.Migration/Engine/Pipelines/MigrationPipelineBase.cs
@@ -127,13 +127,6 @@ public virtual IContentReferenceCache CreateDestinationCache<TContent>()
             }
         }
 
-        /// <inheritdoc />
-        public virtual IMappedContentReferenceFinder<TContent> CreateDestinationFinder<TContent>()
-            where TContent : class, IContentReference
-        {
-            return Services.GetRequiredService<ManifestDestinationContentReferenceFinder<TContent>>();
-        }
-
         /// <inheritdoc />
         public virtual ILockedProjectCache GetDestinationLockedProjectCache()
             => Services.GetRequiredService<BulkDestinationProjectCache>();
diff --git a/src/Tableau.Migration/Engine/Preparation/ContentItemPreparerBase.cs b/src/Tableau.Migration/Engine/Preparation/ContentItemPreparerBase.cs
index fd12d75..56e6cad 100644
--- a/src/Tableau.Migration/Engine/Preparation/ContentItemPreparerBase.cs
+++ b/src/Tableau.Migration/Engine/Preparation/ContentItemPreparerBase.cs
@@ -20,8 +20,8 @@
 using System.Threading.Tasks;
 using Tableau.Migration.Content;
 using Tableau.Migration.Content.Files;
+using Tableau.Migration.Engine.Endpoints.Search;
 using Tableau.Migration.Engine.Hooks.Transformers;
-using Tableau.Migration.Engine.Pipelines;
 
 namespace Tableau.Migration.Engine.Preparation
 {
@@ -34,17 +34,19 @@ public abstract class ContentItemPreparerBase<TContent, TPublish> : IContentItem
         where TPublish : class
     {
         private readonly IContentTransformerRunner _transformerRunner;
-        private readonly IMigrationPipeline _pipeline;
+        private readonly IDestinationContentReferenceFinderFactory _destinationFinderFactory;
 
         /// <summary>
         /// Creates a new <see cref="ContentItemPreparerBase{TContent, TPublish}"/> object.
         /// </summary>
         /// <param name="transformerRunner">A transformer runner.</param>
-        /// <param name="pipeline">The migration pipeline.</param>
-        public ContentItemPreparerBase(IContentTransformerRunner transformerRunner, IMigrationPipeline pipeline)
+        /// <param name="destinationFinderFactory">The destination finder factory.</param>
+        public ContentItemPreparerBase(
+            IContentTransformerRunner transformerRunner,
+            IDestinationContentReferenceFinderFactory destinationFinderFactory)
         {
             _transformerRunner = transformerRunner;
-            _pipeline = pipeline;
+            _destinationFinderFactory = destinationFinderFactory;
         }
 
         /// <summary>
@@ -103,15 +105,15 @@ protected virtual async Task ApplyMappingAsync(TPublish publishItem, ContentLoca
                 else if(mappedParentLocation != containerContent.Container?.Location)
                 {
                     //If the mapping set a new parent, find based on the destination location.
-                    var destinationFinder = _pipeline.CreateDestinationFinder<IProject>();
-                    newParent = await destinationFinder.FindMappedDestinationReferenceAsync(mappedLocation.Parent(), cancel)
+                    var destinationFinder = _destinationFinderFactory.ForDestinationContentType<IProject>();
+                    newParent = await destinationFinder.FindByMappedLocationAsync(mappedLocation.Parent(), cancel)
                         .ConfigureAwait(false);
                 }
                 else if(containerContent.Container is not null)
                 {
                     //If the mapping uses the same parent, find where that parent mapped to.
-                    var destinationFinder = _pipeline.CreateDestinationFinder<IProject>();
-                    newParent = await destinationFinder.FindDestinationReferenceAsync(containerContent.Container.Location, cancel)
+                    var destinationFinder = _destinationFinderFactory.ForDestinationContentType<IProject>();
+                    newParent = await destinationFinder.FindBySourceLocationAsync(containerContent.Container.Location, cancel)
                         .ConfigureAwait(false);
                 }
                 else
diff --git a/src/Tableau.Migration/Engine/Preparation/EndpointContentItemPreparer.cs b/src/Tableau.Migration/Engine/Preparation/EndpointContentItemPreparer.cs
index 4e76807..b316c43 100644
--- a/src/Tableau.Migration/Engine/Preparation/EndpointContentItemPreparer.cs
+++ b/src/Tableau.Migration/Engine/Preparation/EndpointContentItemPreparer.cs
@@ -17,10 +17,9 @@
 
 using System.Threading;
 using System.Threading.Tasks;
-using Tableau.Migration.Content.Files;
 using Tableau.Migration.Engine.Endpoints;
+using Tableau.Migration.Engine.Endpoints.Search;
 using Tableau.Migration.Engine.Hooks.Transformers;
-using Tableau.Migration.Engine.Pipelines;
 
 namespace Tableau.Migration.Engine.Preparation
 {
@@ -40,10 +39,12 @@ public class EndpointContentItemPreparer<TContent, TPublish> : ContentItemPrepar
         /// </summary>
         /// <param name="source">The source endpoint.</param>
         /// <param name="transformerRunner"><inheritdoc /></param>
-        /// <param name="pipeline"><inheritdoc /></param>
-        public EndpointContentItemPreparer(ISourceEndpoint source,
-            IContentTransformerRunner transformerRunner, IMigrationPipeline pipeline)
-            : base(transformerRunner, pipeline)
+        /// <param name="destinationFinderFactory"><inheritdoc /></param>
+        public EndpointContentItemPreparer(
+            ISourceEndpoint source,
+            IContentTransformerRunner transformerRunner, 
+            IDestinationContentReferenceFinderFactory destinationFinderFactory)
+            : base(transformerRunner, destinationFinderFactory)
         {
             _source = source;
         }
diff --git a/src/Tableau.Migration/Engine/Preparation/SourceContentItemPreparer.cs b/src/Tableau.Migration/Engine/Preparation/SourceContentItemPreparer.cs
index 82d05cf..091ee2c 100644
--- a/src/Tableau.Migration/Engine/Preparation/SourceContentItemPreparer.cs
+++ b/src/Tableau.Migration/Engine/Preparation/SourceContentItemPreparer.cs
@@ -17,9 +17,8 @@
 
 using System.Threading;
 using System.Threading.Tasks;
-using Tableau.Migration.Content.Files;
+using Tableau.Migration.Engine.Endpoints.Search;
 using Tableau.Migration.Engine.Hooks.Transformers;
-using Tableau.Migration.Engine.Pipelines;
 
 namespace Tableau.Migration.Engine.Preparation
 {
@@ -35,9 +34,11 @@ public class SourceContentItemPreparer<TContent> : ContentItemPreparerBase<TCont
         /// Creates a new <see cref="SourceContentItemPreparer{TContent}"/>.
         /// </summary>
         /// <param name="transformerRunner"><inheritdoc /></param>
-        /// <param name="pipeline"><inheritdoc /></param>
-        public SourceContentItemPreparer(IContentTransformerRunner transformerRunner, IMigrationPipeline pipeline)
-            : base(transformerRunner, pipeline)
+        /// <param name="destinationFinderFactory"><inheritdoc /></param>
+        public SourceContentItemPreparer(
+            IContentTransformerRunner transformerRunner,
+            IDestinationContentReferenceFinderFactory destinationFinderFactory)
+            : base(transformerRunner, destinationFinderFactory)
         { }
 
         /// <inheritdoc />
diff --git a/src/Tableau.Migration/Interop/Hooks/Transformers/ISyncXmlContentTransformer.cs b/src/Tableau.Migration/Interop/Hooks/Transformers/ISyncXmlContentTransformer.cs
index 35b29de..715e61c 100644
--- a/src/Tableau.Migration/Interop/Hooks/Transformers/ISyncXmlContentTransformer.cs
+++ b/src/Tableau.Migration/Interop/Hooks/Transformers/ISyncXmlContentTransformer.cs
@@ -49,10 +49,10 @@ public interface ISyncXmlContentTransformer<TPublish> : IXmlContentTransformer<T
         /// The XML of the content item to transform.
         /// Any changes made to the XML are persisted back to the file before publishing.
         /// </param>
-        void Execute(TPublish ctx, XDocument xml);
+        void Transform(TPublish ctx, XDocument xml);
 
         /// <inheritdoc />
-        Task IXmlContentTransformer<TPublish>.ExecuteAsync(TPublish ctx, XDocument xml, CancellationToken cancel)
-            => Task.Run(() => Execute(ctx, xml), cancel);
+        Task IXmlContentTransformer<TPublish>.TransformAsync(TPublish ctx, XDocument xml, CancellationToken cancel)
+            => Task.Run(() => Transform(ctx, xml), cancel);
     }
 }
diff --git a/src/Tableau.Migration/Interop/IServiceCollectionExtensions.cs b/src/Tableau.Migration/Interop/IServiceCollectionExtensions.cs
index 5710944..48d71e6 100644
--- a/src/Tableau.Migration/Interop/IServiceCollectionExtensions.cs
+++ b/src/Tableau.Migration/Interop/IServiceCollectionExtensions.cs
@@ -34,16 +34,21 @@ public static class IServiceCollectionExtensions
         /// Add python support by adding python logging and configuration via environment variables.
         /// This will clear all existing <see cref="ILoggerProvider"/>s. All other logger provider should be added after this call.
         /// </summary>
-        /// <param name="services"></param>
-        /// <param name="pythonProviderFactory"></param>
+        /// <param name="services">The service collection to register services with.</param>
+        /// <param name="loggerFactory">A factory to use to create new loggers for a given category name.</param>
+        /// <param name="userOptions">The configuration options to initialize the SDK with.</param>
         /// <returns></returns>
-        public static IServiceCollection AddPythonSupport(this IServiceCollection services, Func<IServiceProvider, NonGenericLoggerProvider> pythonProviderFactory)
+        public static IServiceCollection AddPythonSupport(
+            this IServiceCollection services,
+            Func<string, NonGenericLoggerBase> loggerFactory, 
+            IConfiguration? userOptions = null)
         {
             services
+                .AddTableauMigrationSdk(userOptions)
                 // Replace the default IUserAgentSuffixProvider with the python one
                 .Replace(new ServiceDescriptor(typeof(IUserAgentSuffixProvider), typeof(PythonUserAgentSuffixProvider), ServiceLifetime.Singleton))
                 // Add Python Logging
-                .AddLogging(b => b.AddPythonLogging(pythonProviderFactory))
+                .AddLogging(b => b.AddPythonLogging(loggerFactory))
                 // Add environment variable configuration
                 .AddEnvironmentVariableConfiguration();
             return services;
@@ -53,13 +58,15 @@ public static IServiceCollection AddPythonSupport(this IServiceCollection servic
         /// Adds a python support, including supporting the python logger
         /// </summary>
         /// <param name="builder">The <see cref="ILoggingBuilder"/></param>
-        /// <param name="pythonProviderFactory">Function that creates a new <see cref="NonGenericLoggerProvider"/></param>
+        /// <param name="loggerFactory">A factory to use to create new loggers for a given category name.</param>
         /// <returns></returns>
-        public static ILoggingBuilder AddPythonLogging(this ILoggingBuilder builder, Func<IServiceProvider, NonGenericLoggerProvider> pythonProviderFactory)
+        public static ILoggingBuilder AddPythonLogging(
+            this ILoggingBuilder builder,
+            Func<string, NonGenericLoggerBase> loggerFactory)
         {
             // Clear all previous providers
             builder.ClearProviders();
-            builder.Services.TryAddSingleton<ILoggerProvider>(pythonProviderFactory);
+            builder.Services.TryAddSingleton<ILoggerProvider>(new NonGenericLoggerProvider(loggerFactory));
             // Enable all logs from .NET
             // They will be filtered on the migration_logger.py class
             builder.AddFilter<NonGenericLoggerProvider>(null, LogLevel.Trace);
diff --git a/src/Tableau.Migration/Interop/InteropHelper.cs b/src/Tableau.Migration/Interop/InteropHelper.cs
index a5f96e7..f517a1e 100644
--- a/src/Tableau.Migration/Interop/InteropHelper.cs
+++ b/src/Tableau.Migration/Interop/InteropHelper.cs
@@ -18,6 +18,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
+using Tableau.Migration.Content;
 
 namespace Tableau.Migration.Interop
 {
@@ -26,93 +28,118 @@ namespace Tableau.Migration.Interop
     /// </summary>
     public static class InteropHelper
     {
-        internal static List<string> ignoredMethods = new()
+        internal static HashSet<string> _ignoredMethods = new()
         {
-            "GetHashCode",
-            "ToString",
+            nameof(object.GetHashCode),
+            nameof(object.ToString),
+            nameof(object.GetType),
+            nameof(object.Equals),
+            nameof(Enum.HasFlag),
             "Deconstruct",
-            "GetType",
-            "Equals",
             "GetTypeCode",
             "CompareTo",
-            "HasFlag"
+            "<Clone>$"
         };
 
+        private static Type MakeSampleGenericType(Type generic)
+        {
+            var genericTypes = generic.GetGenericArguments()
+                .Select(gt => typeof(IUser))
+                .ToArray();
+
+            return generic.MakeGenericType(genericTypes);
+        }
+
+        private static bool IsPropertyMethod(MethodInfo method)
+            => method.Name.StartsWith("get_") || method.Name.StartsWith("set_");
+
+        private static bool IsOperator(MethodInfo method)
+            => method.Name.StartsWith("op_");
+
         /// <summary>
-        /// Gets methods of a class that aren't "generic"
+        /// Gets the methods of a class.
         /// </summary>
-        /// <typeparam name="T">The objects type to get methods from</typeparam>
-        /// <returns>List of method names</returns>
-        public static List<string> GetMethods<T>()
-        {
-            List<string> methods;
-            List<string> ret = new();
+        /// <typeparam name="T">The type to get methods from.</typeparam>
+        /// <returns>The method names.</returns>
+        public static IEnumerable<string> GetMethods<T>()
+            => GetMethods(typeof(T));
 
-            if (typeof(T).IsInterface)
-            {
-                methods = typeof(T).GetAllInterfaceMethods().Select(p => p.Name).ToList();
-            }
-            else
+        /// <summary>
+        /// Gets the methods of a class.
+        /// </summary>
+        /// <param name="type">The type to get methods from.</param>
+        /// <returns>The method names.</returns>
+        public static IEnumerable<string> GetMethods(Type type)
+        {
+            if(type.ContainsGenericParameters)
             {
-                methods = typeof(T).GetMethods().Select(p => p.Name).ToList();
+                return GetMethods(MakeSampleGenericType(type));
             }
 
-            foreach (var method in methods)
-            {
-                if (!method.StartsWith("get_") && // getters
-                   !method.StartsWith("set_") && // setters
-                   !method.StartsWith("op_") &&  // operators 
-                   !ignoredMethods.Contains(method)
-                   )
-                {
-                    ret.Add(method);
-                }
-            }
+            var methods = type.IsInterface ? type.GetAllInterfaceMethods() : type.GetMethods();
 
-            return ret;
+            return methods
+                .Where(m => !IsPropertyMethod(m))
+                .Where(m => !IsOperator(m))
+                .Where(m => !_ignoredMethods.Contains(m.Name))
+                .Select(m => m.Name);
         }
 
         /// <summary>
-        /// Gets the properies of a class
+        /// Gets the properies of a class.
         /// </summary>
-        /// <typeparam name="T">The objects type to get properties from</typeparam>
-        /// <returns>List of property names</returns>
-        public static List<string> GetProperties<T>()
+        /// <typeparam name="T">The type to get properties from.</typeparam>
+        /// <returns>The property names.</returns>
+        public static IEnumerable<string> GetProperties<T>()
+            => GetProperties(typeof(T));
+
+        /// <summary>
+        /// Gets the properies of a class.
+        /// </summary>
+        /// <param name="type">The type to get properties from.</param>
+        /// <returns>The property names.</returns>
+        public static IEnumerable<string> GetProperties(Type type)
         {
-            if (typeof(T).IsInterface)
-            {
-                return typeof(T).GetAllInterfaceProperties().Select(p => p.Name).ToList();
-            }
-            else
+            if (type.ContainsGenericParameters)
             {
-                return typeof(T).GetProperties().Select(p => p.Name).ToList();
+                return GetProperties(MakeSampleGenericType(type));
             }
-        }
 
+            var properties = type.IsInterface ? type.GetAllInterfaceProperties() : type.GetProperties();
+
+            return properties.Select(p => p.Name);
+        }
 
         /// <summary>
-        /// Gets all the names and values of a enum and returns them as a list.
+        /// Gets all the names and values of an enumeration.
         /// </summary>
-        /// <typeparam name="T">The enum type</typeparam>
-        /// <returns>List of tuples with all the names and values</returns>
-        static public List<Tuple<string, object>> GetEnum<T>() where T : Enum
+        /// <typeparam name="T">The enum type.</typeparam>
+        /// <returns>Tuples with all the names and values.</returns>
+        public static IEnumerable<Tuple<string, object>> GetEnum<T>() 
         {
-            var ret = new List<Tuple<string, object>>();
-
             var enumType = typeof(T);
-            var underlyingType = Enum.GetUnderlyingType(enumType);
+            if (enumType.BaseType == typeof(Enum))
+            {
+                var underlyingType = Enum.GetUnderlyingType(enumType);
 
-            var names = Enum.GetNames(enumType);
+                foreach (var name in Enum.GetNames(enumType))
+                {
+                    var value = Enum.Parse(enumType, name);
+                    object underlyingValue = Convert.ChangeType(value, underlyingType);
 
-            foreach (var name in names)
+                    yield return new(name, underlyingValue);
+                }
+            }
+            else if(enumType.BaseType == typeof(StringEnum<T>))
             {
-                var value = Enum.Parse(enumType, name);
-                object underlyingValue = Convert.ChangeType(value, underlyingType);
+                foreach(var field in enumType.GetFields(BindingFlags.Public | BindingFlags.Static))
+                {
+                    if (field is null || !field.IsLiteral || field.IsInitOnly)
+                        continue;
 
-                ret.Add(new Tuple<string, object>(name, underlyingValue));
+                    yield return new(field.Name, field.GetValue(null)!);
+                }
             }
-
-            return ret;
         }
     }
 }
diff --git a/src/Tableau.Migration/Interop/Logging/NonGenericLoggerBase.cs b/src/Tableau.Migration/Interop/Logging/NonGenericLoggerBase.cs
index 6b8b944..183d2bc 100644
--- a/src/Tableau.Migration/Interop/Logging/NonGenericLoggerBase.cs
+++ b/src/Tableau.Migration/Interop/Logging/NonGenericLoggerBase.cs
@@ -47,7 +47,7 @@ public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Except
         {
             // In python.net, a generic method like Log<T> can't be concretely implemented because python has no understanding of generic methods.
             // To get around this, we pre-format the message, and pass it to the non-generic `Log` method
-            this.Log(logLevel, eventId, formatter(state, null), exception, formatter(state, exception));
+            Log(logLevel, eventId, formatter(state, null), exception, formatter(state, exception));
         }
 
         /// <inheritdoc />
diff --git a/src/Tableau.Migration/Interop/Logging/NonGenericLoggerProvider.cs b/src/Tableau.Migration/Interop/Logging/NonGenericLoggerProvider.cs
index 1a0d16f..6acb588 100644
--- a/src/Tableau.Migration/Interop/Logging/NonGenericLoggerProvider.cs
+++ b/src/Tableau.Migration/Interop/Logging/NonGenericLoggerProvider.cs
@@ -27,7 +27,7 @@ namespace Tableau.Migration.Interop.Logging
     /// </summary>
     [UnsupportedOSPlatform("browser")]
     [ProviderAlias("NonGeneric")]
-    public class NonGenericLoggerProvider : ILoggerProvider
+    internal class NonGenericLoggerProvider : ILoggerProvider
     {
         private readonly ConcurrentDictionary<string, NonGenericLoggerBase> _loggers =
             new(StringComparer.OrdinalIgnoreCase);
diff --git a/src/Tableau.Migration/Tableau.Migration.csproj b/src/Tableau.Migration/Tableau.Migration.csproj
index 6e9fcbf..34d03f2 100644
--- a/src/Tableau.Migration/Tableau.Migration.csproj
+++ b/src/Tableau.Migration/Tableau.Migration.csproj
@@ -15,7 +15,6 @@
 		<BuildInParallel>false</BuildInParallel>
 		<PackageReadmeFile>NUGET.md</PackageReadmeFile>
 		<PackageTags>Tableau;migration;API;REST;workbook;datasource;project;group;user;permission</PackageTags>
-		<PackageLicenseExpression>MIT</PackageLicenseExpression>
 		<PackageRequireLicenseAcceptance>True</PackageRequireLicenseAcceptance>
 		<PackageIcon>TableauLogoColor.png</PackageIcon>
 		<Description>Customers worldwide are migrating to Tableau Cloud to take advantage of the innovation, reduced cost, security, and scalability of Tableau’s managed data service. The Migration Software Development Kit (SDK) helps you migrate to Tableau Cloud in a seamless and predictable way. You can use the Migration SDK to build your own migration application to do the following:
diff --git a/src/Tableau.Migration/TaskExtensions.cs b/src/Tableau.Migration/TaskExtensions.cs
index c1a9010..e2efc11 100644
--- a/src/Tableau.Migration/TaskExtensions.cs
+++ b/src/Tableau.Migration/TaskExtensions.cs
@@ -22,7 +22,7 @@ namespace Tableau.Migration
     /// <summary>
     /// Static class containing extension methods for <see cref="Task"/> and <see cref="Task{TResult}"/> objects.
     /// </summary>
-    internal static class TaskExtensions
+    public static class TaskExtensions
     {
         /// <summary>
         /// Get the results synchronously, applying best practices.
diff --git a/tests/Python.TestApplication/Python.TestApplication.pyproj b/tests/Python.TestApplication/Python.TestApplication.pyproj
index b795ab9..2e82ee2 100644
--- a/tests/Python.TestApplication/Python.TestApplication.pyproj
+++ b/tests/Python.TestApplication/Python.TestApplication.pyproj
@@ -28,12 +28,12 @@
     <Compile Include="helper.py" />
     <Compile Include="main.py" />
     <Compile Include="migration_testcomponents_engine_manifest.py" />
+    <Compile Include="migration_testcomponents_transformers.py" />
     <Compile Include="migration_testcomponents_filters.py" />
     <Compile Include="migration_testcomponents_hooks.py" />
     <Compile Include="migration_testcomponents_mappings.py" />
     <Compile Include="testapplication_tests\test_classes.py" />
     <Compile Include="testapplication_tests\__init__.py" />
-    <Compile Include="test_tableau_cloud_username_mapping.py" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="config*.json" />
diff --git a/tests/Python.TestApplication/config.json b/tests/Python.TestApplication/config.json
index 905dc30..99ec228 100644
--- a/tests/Python.TestApplication/config.json
+++ b/tests/Python.TestApplication/config.json
@@ -22,7 +22,9 @@
   "special_users": {
     "admin_domain": "",
     "admin_username": "",
-    "emails": [ ]
+    "emails": []
   },
+  "skipped_project": "",
+  "skipped_parent_destination": "Missing Parent",
   "previous_manifest": ""
 }
diff --git a/tests/Python.TestApplication/main.py b/tests/Python.TestApplication/main.py
index 5a99b16..6f9811b 100644
--- a/tests/Python.TestApplication/main.py
+++ b/tests/Python.TestApplication/main.py
@@ -30,36 +30,63 @@
 from threading import Thread
 
 # tableau_migration and migration_testcomponents
-from tableau_migration.migration import PyMigrationResult, PyMigrationManifest
-from tableau_migration.migration_engine import PyMigrationPlanBuilder
-from tableau_migration.migration_engine_migrators import PyMigrator
-from migration_testcomponents_engine_manifest import PyMigrationManifestSerializer
-from migration_testcomponents_filters import PySpecialUserFilter, PyUnlicensedUserFilter
+from tableau_migration import (
+    IMigrationManifestEntry, 
+    Migrator, 
+    MigrationPlanBuilder, 
+    MigrationManifestEntryStatus,
+    cancellation_token_source
+)
+from tableau_migration.migration import (
+    PyMigrationResult, 
+    PyMigrationManifest
+)
+from migration_testcomponents_engine_manifest import (
+    PyMigrationManifestSerializer
+)
+from migration_testcomponents_filters import (
+    # Skip Filters: Uncomment when neccesary.
+    # SkipAllUsersFilter,
+    # SkipAllGroupsFilter,
+    # SkipAllProjectsFilter,
+    # SkipAllDataSourcesFilter,
+    # SkipAllWorkbooksFilter,
+    # Skip Filters: Uncomment when neccesary.
+    SkipProjectByParentLocationFilter,
+    SkipDataSourceByParentLocationFilter,
+    SkipWorkbookByParentLocationFilter,
+    SpecialUserFilter, 
+    UnlicensedUserFilter
+)
 from migration_testcomponents_hooks import (
-    PySaveManifestAfterBatch_User, 
-    PySaveManifestAfterBatch_Group, 
-    PySaveManifestAfterBatch_Project, 
-    PySaveManifestAfterBatch_DataSource, 
-    PySaveManifestAfterBatch_Workbook, 
-    PyTimeLoggerAfterActionHook, 
-    save_manifest_after_batch_user_factory, 
-    save_manifest_after_batch_group_factory,
-    save_manifest_after_batch_project_factory,
-    save_manifest_after_batch_datasource_factory,
-    save_manifest_after_batch_workbook_factory)
-from migration_testcomponents_mappings import PySpecialUserMapping, PyTestTableauCloudUsernameMapping, PyUnlicensedUserMapping
+    SaveUserManifestHook,
+    SaveGroupManifestHook,
+    SaveProjectManifestHook,
+    SaveDataSourceManifestHook,
+    SaveWorkbookManifestHook,
+    TimeLoggerAfterActionHook
+)
+from migration_testcomponents_mappings import (
+    SpecialUserMapping, 
+    TestTableauCloudUsernameMapping,
+    ProjectWithinSkippedLocationMapping,
+    DataSourceWithinSkippedLocationMapping,
+    WorkbookWithinSkippedLocationMapping,
+    UnlicensedUserMapping
+)
+from migration_testcomponents_transformers import (
+    RemoveMissingDestinationUsersFromGroupsTransformer
+)
 
 # CSharp imports
-from System import Func, IServiceProvider 
-
-from Tableau.Migration.Content import IUser
 from Tableau.Migration.Engine.Pipelines import ServerToCloudMigrationPipeline
-from Tableau.Migration.Engine.Manifest import MigrationManifestEntryStatus
 from Tableau.Migration.TestComponents import IServiceCollectionExtensions as MigrationTestComponentsSCE
 
 
 class Program():
     """Main program class."""
+    
+    done = False
 
     def __init__(self):
         """Program init, sets up logging."""
@@ -98,9 +125,10 @@ def print_result(self, result: PyMigrationResult):
         for pipeline_content_type in ServerToCloudMigrationPipeline.ContentTypes:
             content_type = pipeline_content_type.ContentType
         
-            type_result = result.manifest.entries.ForContentType(content_type)
+            result.manifest.entries
+            type_entries = [IMigrationManifestEntry(x) for x in result.manifest.entries.ForContentType(content_type)]
         
-            count_total = type_result.Count
+            count_total = len(type_entries)
 
             count_migrated = 0
             count_skipped = 0
@@ -108,16 +136,16 @@ def print_result(self, result: PyMigrationResult):
             count_cancelled = 0
             count_pending = 0
 
-            for item in type_result:
-                if item.Status == MigrationManifestEntryStatus.Migrated:
+            for entry in type_entries:
+                if entry.status == MigrationManifestEntryStatus.MIGRATED:
                     count_migrated += 1
-                elif item.Status == MigrationManifestEntryStatus.Skipped:
+                elif entry.status == MigrationManifestEntryStatus.SKIPPED:
                     count_skipped += 1
-                elif item.Status == MigrationManifestEntryStatus.Error:
+                elif entry.status == MigrationManifestEntryStatus.ERROR:
                     count_errored += 1
-                elif item.Status == MigrationManifestEntryStatus.Canceled:
+                elif entry.status == MigrationManifestEntryStatus.CANCELED:
                     count_cancelled += 1
-                elif item.Status == MigrationManifestEntryStatus.Pending:
+                elif entry.status == MigrationManifestEntryStatus.PENDING:
                     count_pending += 1
             
             output = f'''
@@ -134,15 +162,15 @@ def print_result(self, result: PyMigrationResult):
     def migrate(self):
         """The main migration function."""
         self.logger.info("Starting migration")
+        
         # Add the C# test components we've ported to Python and register them with the DI Service Provider
         MigrationTestComponentsSCE.AddTestComponents(tableau_migration._service_collection)
-        tableau_migration.migration._build_service_provider()
+        tableau_migration.migration._build_service_provider(tableau_migration._service_collection)
 
         # Setup base objects for migrations
-        plan_builder = PyMigrationPlanBuilder()
-        migration = PyMigrator()
-
         self._manifest_serializer = PyMigrationManifestSerializer()
+        plan_builder = MigrationPlanBuilder()
+        migration = Migrator()
     
         # Build the plan
         plan_builder = plan_builder \
@@ -158,37 +186,42 @@ def migrate(self):
                         access_token = os.environ.get('TABLEAU_MIGRATION_DESTINATION_TOKEN', helper.config['destination']['access_token'])) \
                     .for_server_to_cloud() \
                     .with_tableau_id_authentication_type() \
-                    .with_tableau_cloud_usernames(PyTestTableauCloudUsernameMapping())        
+                    .with_tableau_cloud_usernames(TestTableauCloudUsernameMapping)        
     
     
         self.logger.info("Adding Special User filter and mapping")
-        plan_builder.filters.add(IUser, PySpecialUserFilter())
-        plan_builder.mappings.add(IUser, PySpecialUserMapping())
+        plan_builder.filters.add(SpecialUserFilter)
+        plan_builder.mappings.add(SpecialUserMapping)
     
         self.logger.info("Adding unlicensed user filter and mapping")
-        plan_builder.filters.add(IUser, PyUnlicensedUserFilter())
-        plan_builder.mappings.add(IUser, PyUnlicensedUserMapping())
+        plan_builder.filters.add(UnlicensedUserFilter)
+        plan_builder.mappings.add(UnlicensedUserMapping)
     
         self.logger.info("Adding Hooks")
-        plan_builder.hooks.add(PyTimeLoggerAfterActionHook(self.consoleHandler))
+        TimeLoggerAfterActionHook.handler = self.consoleHandler
+        plan_builder.hooks.add(TimeLoggerAfterActionHook)
     
-        # This adds the PySaveManifestAfterBatch_<content type> hook via the save_manifest_after_batch_<content type>_factory function.
-        # This is required because the manifest comes from the IMigration, which is scoped.
-        # The global DI provider can not create the scoped IMigration.
-        # the save_manifest_after_batch_<content type>_factory function takes the IServiceProvider, which is scoped when save_manifest_after_batch_<content type>_factory is called
-        # This means save_manifest_after_batch_<content type>_factory can create the PySaveManifestAfterBatch_<content type> and pass in the IMigration
-        plan_builder.hooks.add(PySaveManifestAfterBatch_User, Func[IServiceProvider, PySaveManifestAfterBatch_User](save_manifest_after_batch_user_factory))
-        plan_builder.hooks.add(PySaveManifestAfterBatch_Group, Func[IServiceProvider, PySaveManifestAfterBatch_Group](save_manifest_after_batch_group_factory))
-        plan_builder.hooks.add(PySaveManifestAfterBatch_Project, Func[IServiceProvider, PySaveManifestAfterBatch_Project](save_manifest_after_batch_project_factory))
-        plan_builder.hooks.add(PySaveManifestAfterBatch_DataSource, Func[IServiceProvider, PySaveManifestAfterBatch_DataSource](save_manifest_after_batch_datasource_factory))
-        plan_builder.hooks.add(PySaveManifestAfterBatch_Workbook, Func[IServiceProvider, PySaveManifestAfterBatch_Workbook](save_manifest_after_batch_workbook_factory))
+        plan_builder.hooks.add(SaveUserManifestHook)
+        plan_builder.hooks.add(SaveGroupManifestHook)
+        plan_builder.hooks.add(SaveProjectManifestHook)
+        plan_builder.hooks.add(SaveDataSourceManifestHook)
+        plan_builder.hooks.add(SaveWorkbookManifestHook)
+
+        plan_builder.filters.add(SkipProjectByParentLocationFilter)
+        plan_builder.filters.add(SkipDataSourceByParentLocationFilter)
+        plan_builder.filters.add(SkipWorkbookByParentLocationFilter)
+        plan_builder.transformers.add(RemoveMissingDestinationUsersFromGroupsTransformer)
+        plan_builder.mappings.add(ProjectWithinSkippedLocationMapping)
+        plan_builder.mappings.add(DataSourceWithinSkippedLocationMapping)
+        plan_builder.mappings.add(WorkbookWithinSkippedLocationMapping)
     
-        # Comment out an neccesary 
-        #planBuilder.filters.add(IUser, PySkipFilter_Users())
-        #planBuilder.filters.add(IGroup, PySkipFilter_Groups())
-        #planBuilder.filters.add(IProject, PySkipFilter_Projects())
-        #planBuilder.filters.add(IDataSource, PySkipFilter_DataSources())
-        #planBuilder.filters.add(IWorkbook, PySkipFilter_Workbooks())
+        # Skip Filters: Uncomment when neccesary.
+        # plan_builder.filters.add(SkipAllUsersFilter)
+        # plan_builder.filters.add(SkipAllGroupsFilter)
+        # plan_builder.filters.add(SkipAllProjectsFilter)
+        # plan_builder.filters.add(SkipAllDataSourcesFilter)
+        # plan_builder.filters.add(SkipAllWorkbooksFilter)
+        # Skip Filters: Uncomment when neccesary.
 
         # Load manifest if available
         prev_manifest = self.load_manifest(helper.config['previous_manifest'])
@@ -210,7 +243,9 @@ def migrate(self):
         self.logger.info(f'Migration Ended: {time.ctime(end_time)}')
         self.logger.info(f'Elapsed: {end_time - start_time}')
 
-        print("All done")    
+        print("All done")
+
+        self.done = True
         
 
 if __name__ == '__main__':
@@ -218,14 +253,13 @@ def migrate(self):
     program = Program()
     thread = Thread(target = program.migrate)
     thread.start()
-    done = False
 
-    while not done:
+    while not program.done:
         try:
             thread.join(1)
         except KeyboardInterrupt:
             print("Caught Ctrl+C, shutting down...")
-            tableau_migration.cancellation_token_source.Cancel()
+            cancellation_token_source.Cancel()
             thread.join()
-            done = True
+            program.done = True
             
diff --git a/tests/Python.TestApplication/migration_testcomponents_engine_manifest.py b/tests/Python.TestApplication/migration_testcomponents_engine_manifest.py
index 80c1f59..18de95f 100644
--- a/tests/Python.TestApplication/migration_testcomponents_engine_manifest.py
+++ b/tests/Python.TestApplication/migration_testcomponents_engine_manifest.py
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 """Wrapper for classes in Tableau.Migration.TestComponents.Engine.Manifest namespace."""
-import tableau_migration.migration
+import tableau_migration
 
 from Tableau.Migration.TestComponents.Engine.Manifest import MigrationManifestSerializer
 from System.Text.Json import JsonSerializerOptions
@@ -30,36 +30,46 @@ def __init__(self) -> None:
         self._services = tableau_migration.migration.get_service_provider()
         self._migration_manifest_serializer = tableau_migration.migration.get_service(self._services, MigrationManifestSerializer)
         
-    def save(self, manifest: PyMigrationManifest, path: str, cancel = tableau_migration.cancellation_token, json_options: JsonSerializerOptions = None) -> None:
+    def save(self, manifest: PyMigrationManifest, path: str, cancel = None, json_options: JsonSerializerOptions = None) -> None:
         """
         Saves a manifest in JSON format.
 
         Args:
             manifest (PyMigrationManifest): The manifest to save.
             path (str): The file path to save the manifest to.
-            cancel (_type_, optional): A cancellation token to obey. Defaults to tableau_migration.cancellation_token.
+            cancel (_type_, optional): A cancellation token to obey.
             json_options (JsonSerializerOptions, optional): Optional JSON options to use. Defaults to None.
 
         Returns:
             None
         """
+        
+        # Defaults to global singleton cancellation token.
+        if cancel is None:
+            cancel = tableau_migration.cancellation_token
+
         if(json_options is None):
             return self._migration_manifest_serializer.SaveAsync(manifest._migration_manifest, path).GetAwaiter().GetResult()
         else:
             return self._migration_manifest_serializer.SaveAsync(manifest._migration_manifest, path, json_options).GetAwaiter().GetResult()
     
-    def load(self, path: str, cancel = tableau_migration.cancellation_token, json_options: JsonSerializerOptions = None) -> PyMigrationManifest | None:
+    def load(self, path: str, cancel = None, json_options: JsonSerializerOptions = None) -> PyMigrationManifest | None:
         """
         Loads a manifest from JSON format.
 
         Args:
             path (str): The file path to load the manifest from.
-            cancel (_type_, optional): A cancellation token to obey. Defaults to tableau_migration.cancellation_token.
+            cancel (_type_, optional): A cancellation token to obey. 
             json_options (JsonSerializerOptions, optional): Optional JSON options to use. Defaults to None.
 
         Returns:
             PyMigrationManifest: The PyMigrationManifest, or null if the manifest could not be loaded.
         """
+        
+        # Defaults to global singleton cancellation token.
+        if cancel is None:
+            cancel = tableau_migration.cancellation_token
+
         manifest = self._migration_manifest_serializer.LoadAsync(path,cancel,json_options).GetAwaiter().GetResult()
         if manifest is not None:
             return PyMigrationManifest(manifest)
diff --git a/tests/Python.TestApplication/migration_testcomponents_filters.py b/tests/Python.TestApplication/migration_testcomponents_filters.py
index c62eeb8..2084220 100644
--- a/tests/Python.TestApplication/migration_testcomponents_filters.py
+++ b/tests/Python.TestApplication/migration_testcomponents_filters.py
@@ -18,110 +18,159 @@
 import helper
 import logging
 
-from Tableau.Migration.Api.Rest.Models import LicenseLevels
-from Tableau.Migration.Content import IUser, IGroup, IProject, IDataSource, IWorkbook
-from Tableau.Migration.Interop.Hooks.Filters import ISyncContentFilter
-from Tableau.Migration.Engine.Hooks.Filters import ContentFilterBase
-
-
-class PySpecialUserFilter(ContentFilterBase[IUser]):
+from typing import (
+    Generic,
+    TypeVar
+)
+from tableau_migration import (
+    ContentFilterBase,
+    ContentMigrationItem,
+    IDataSource,
+    IGroup,
+    IProject,
+    IUser,
+    IWorkbook,
+    LicenseLevels
+)
+
+class SpecialUserFilter(ContentFilterBase[IUser]):
     """A class to filter special users."""
-
-    __namespace__ = "Python.TestApplication"
-    _dotnet_base = ContentFilterBase[IUser]
     
     def __init__(self):
         """Default init to set up logging."""
         self._logger = logging.getLogger(self.__class__.__name__)
         self._logger.setLevel(logging.DEBUG)
 
-    def ShouldMigrate(self,item):   # noqa: N802
-        """Implements ShouldMigrate from base."""
+    def should_migrate(self, item: ContentMigrationItem[IUser]) -> bool:
         # Need to improve this to be an array not a single item
-        if item.SourceItem.Email in helper.config['special_users']['emails']:
-            self._logger.debug('%s filtered %s', self.__class__.__name__, item.SourceItem.Email)
+        if item.source_item.email in helper.config['special_users']['emails']:
+            self._logger.debug('%s filtered %s', self.__class__.__name__, item.source_item.email)
             return False
         
-        return True
-        
+        return True        
     
-class PyUnlicensedUserFilter(ContentFilterBase[IUser]):
+class UnlicensedUserFilter(ContentFilterBase[IUser]):
     """A class to filter unlicensed users."""
-
-    __namespace__ = "Python.TestApplication"
-    _dotnet_base = ContentFilterBase[IUser]
     
     def __init__(self):
         """Default init to set up logging."""
         self._logger = logging.getLogger(self.__class__.__name__)
         self._logger.setLevel(logging.DEBUG)
     
-    def ShouldMigrate(self,item):   # noqa: N802
-        """Implements ShouldMigrate from base."""
-        if item.SourceItem.LicenseLevel == LicenseLevels.Unlicensed:
-            self._logger.debug('%s filtered %s',self.__class__.__name__, item.SourceItem.Email)
+    def should_migrate(self, item: ContentMigrationItem[IUser]) -> bool:
+        if item.source_item.license_level == LicenseLevels.UNLICENSED:
+            self._logger.debug('%s filtered %s',self.__class__.__name__, item.source_item.email)
             return False
         
         return True
-    
-
 
-class PySkipFilter_Users(ContentFilterBase[IUser]): # noqa: N801
+class SkipAllUsersFilter(ContentFilterBase[IUser]): # noqa: N801
     """A class to filter all users."""
 
-    __namespace__ = "Python.TestApplication"
-    _dotnet_base = ContentFilterBase[IUser]
-
     def __init__(self):
         """Default init to set up logging."""
         self.logger = logging.getLogger(self.__class__.__name__)
         self.logger.setLevel(logging.DEBUG)
 
-    def ShouldMigrate(self,item):   # noqa: N802
-        """Implements ShouldMigrate from base."""
-        self.logger.debug('%s is filtering %s', self.__class__.__name__, item.SourceItem.Email)
+    def should_migrate(self, item: ContentMigrationItem[IUser]) -> bool:
+        self.logger.debug('%s is filtering "%s"', self.__class__.__name__, item.source_item.name)
         return False
-    
-    
-class PySkipFilter_Groups(ContentFilterBase[IGroup]):    # noqa: N801
+
+class SkipAllGroupsFilter(ContentFilterBase[IGroup]): # noqa: N801
     """A class to filter all groups."""
 
-    __namespace__ = "Python.TestApplication"
-    _dotnet_base = ContentFilterBase[IGroup]
-    
-    def ShouldMigrate(self,item):   # noqa: N802
-        """Implements ShouldMigrate from base."""
-        return False
-         
+    def __init__(self):
+        """Default init to set up logging."""
+        self.logger = logging.getLogger(self.__class__.__name__)
+        self.logger.setLevel(logging.DEBUG)
 
-class PySkipFilter_Projects(ContentFilterBase[IProject]):    # noqa: N801
+    def should_migrate(self, item: ContentMigrationItem[IGroup]) -> bool:
+        self.logger.debug('%s is filtering "%s"', self.__class__.__name__, item.source_item.name)
+        return False
+    
+class SkipAllProjectsFilter(ContentFilterBase[IProject]): # noqa: N801
     """A class to filter all projects."""
 
-    __namespace__ = "Python.TestApplication"
-    _dotnet_base = ContentFilterBase[IProject]
-    
-    def ShouldMigrate(self,item):   # noqa: N802
-        """Implements ShouldMigrate from base."""
-        return False
-         
+    def __init__(self):
+        """Default init to set up logging."""
+        self.logger = logging.getLogger(self.__class__.__name__)
+        self.logger.setLevel(logging.DEBUG)
 
-class PySkipFilter_DataSources(ContentFilterBase[IDataSource]):  # noqa: N801
+    def should_migrate(self, item: ContentMigrationItem[IProject]) -> bool:
+        self.logger.debug('%s is filtering "%s"', self.__class__.__name__, item.source_item.name)
+        return False
+    
+class SkipAllDataSourcesFilter(ContentFilterBase[IDataSource]): # noqa: N801
     """A class to filter all data sources."""
 
-    __namespace__ = "Python.TestApplication"
-    _dotnet_base = ContentFilterBase[IDataSource]
-    
-    def ShouldMigrate(self,item):   # noqa: N802
-        """Implements ShouldMigrate from base."""
+    def __init__(self):
+        """Default init to set up logging."""
+        self.logger = logging.getLogger(self.__class__.__name__)
+        self.logger.setLevel(logging.DEBUG)
+
+    def should_migrate(self, item: ContentMigrationItem[IDataSource]) -> bool:
+        self.logger.debug('%s is filtering "%s"', self.__class__.__name__, item.source_item.name)
         return False
-         
 
-class PySkipFilter_Workbooks(ContentFilterBase[IWorkbook]):  # noqa: N801
+class SkipAllWorkbooksFilter(ContentFilterBase[IWorkbook]): # noqa: N801
     """A class to filter all workbooks."""
 
-    __namespace__ = "Python.TestApplication"
-    _dotnet_base = ContentFilterBase[IWorkbook]
+    def __init__(self):
+        """Default init to set up logging."""
+        self.logger = logging.getLogger(self.__class__.__name__)
+        self.logger.setLevel(logging.DEBUG)
+
+    def should_migrate(self, item: ContentMigrationItem[IWorkbook]) -> bool:
+        self.logger.debug('%s is filtering "%s"', self.__class__.__name__, item.source_item.name)
+        return False
+
+TContent = TypeVar("TContent")
+
+class _SkipContentByParentLocationFilter(Generic[TContent]): # noqa: N801
+    """Generic base filter wrapper to filter content by parent location."""
     
-    def ShouldMigrate(self,item):   # noqa: N802
-        """Implements ShouldMigrate from base."""
+    def __init__(self, logger_name: str):
+        """Default init to set up logging."""
+        self._logger = logging.getLogger(logger_name)
+        self._logger.setLevel(logging.DEBUG)
+
+    def should_migrate(self, item: ContentMigrationItem[TContent], services) -> bool:
+        if item.source_item.location.parent().path != helper.config['skipped_project']:
+            return True
+
+        source_project_finder = services.get_source_finder(IProject)
+
+        content_reference = source_project_finder.find_by_source_location(item.source_item.location.parent())
+
+        self._logger.info('Skipping %s that belongs to "%s" (Project ID: %s)', self.__orig_class__.__args__[0].__name__, helper.config['skipped_project'], content_reference.id)
         return False
+
+class SkipProjectByParentLocationFilter(ContentFilterBase[IProject]): # noqa: N801
+    """A class to filter projects from a given parent location."""
+
+    def __init__(self):
+        """Default init to set up wrapper."""
+        self._filter = _SkipContentByParentLocationFilter[IProject](self.__class__.__name__)
+
+    def should_migrate(self, item: ContentMigrationItem[IProject]) -> bool:
+        return self._filter.should_migrate(item, self.services)
+
+class SkipDataSourceByParentLocationFilter(ContentFilterBase[IDataSource]): # noqa: N801
+    """A class to filter data sources from a given parent location."""
+
+    def __init__(self):
+        """Default init to set up wrapper."""
+        self._filter = _SkipContentByParentLocationFilter[IDataSource](self.__class__.__name__)
+
+    def should_migrate(self, item: ContentMigrationItem[IDataSource]) -> bool:
+        return self._filter.should_migrate(item, self.services)
+
+class SkipWorkbookByParentLocationFilter(ContentFilterBase[IWorkbook]): # noqa: N801
+    """A class to filter workbooks from a given parent location."""
+
+    def __init__(self):
+        """Default init to set up wrapper."""
+        self._filter = _SkipContentByParentLocationFilter[IWorkbook](self.__class__.__name__)
+
+    def should_migrate(self, item: ContentMigrationItem[IWorkbook]) -> bool:
+        return self._filter.should_migrate(item, self.services)
\ No newline at end of file
diff --git a/tests/Python.TestApplication/migration_testcomponents_hooks.py b/tests/Python.TestApplication/migration_testcomponents_hooks.py
index 8118003..a7ca2a1 100644
--- a/tests/Python.TestApplication/migration_testcomponents_hooks.py
+++ b/tests/Python.TestApplication/migration_testcomponents_hooks.py
@@ -15,179 +15,79 @@
 
 """Hooks for the Python.TestApplication."""
 
-import logging 
-import helper 
+import logging
+import helper
+from typing import TypeVar
 
 import tableau_migration
 import tableau_migration.migration
-from migration_testcomponents_engine_manifest import PyMigrationManifestSerializer 
 
-from Tableau.Migration.Content import IUser, IGroup, IProject, IDataSource, IWorkbook
-from Tableau.Migration.Engine import IMigration
-from Tableau.Migration.Engine.Actions import IMigrationActionResult
-from Tableau.Migration.Interop.Hooks import ISyncContentBatchMigrationCompletedHook, ISyncMigrationActionCompletedHook
+from tableau_migration import (
+    ContentBatchMigrationCompletedHookBase,
+    IContentBatchMigrationResult,
+    MigrationActionCompletedHookBase,
+    IMigrationActionResult,
+    IDataSource,
+    IGroup,
+    IProject,
+    IUser,
+    IWorkbook
+)
 
-from System import IServiceProvider
+from migration_testcomponents_engine_manifest import PyMigrationManifestSerializer
 
-# This gets called every time the hook is called, meaning this object
-# is created every single time
-# This is less then ideal
-def save_manifest_after_batch_user_factory(services: IServiceProvider):
-    """Factory function to build PySaveManifestAfterBatch_User."""
-    migration = services.GetService(IMigration)
-    ret = PySaveManifestAfterBatch_User(PyMigrationManifestSerializer(), migration)
-    return ret
+TContent = TypeVar("TContent")
 
-def save_manifest_after_batch_group_factory(services: IServiceProvider):
-    """Factory function to build PySaveManifestAfterBatch_Group."""
-    migration = services.GetService(IMigration)
-    ret = PySaveManifestAfterBatch_Group(PyMigrationManifestSerializer(), migration)
-    return ret
-
-def save_manifest_after_batch_project_factory(services: IServiceProvider):
-    """Factory function to build PySaveManifestAfterBatch_Project."""
-    migration = services.GetService(IMigration)
-    ret = PySaveManifestAfterBatch_Project(PyMigrationManifestSerializer(), migration)
-    return ret
-
-def save_manifest_after_batch_datasource_factory(services: IServiceProvider):
-    """Factory function to build PySaveManifestAfterBatch_DataSource."""
-    migration = services.GetService(IMigration)
-    ret = PySaveManifestAfterBatch_DataSource(PyMigrationManifestSerializer(), migration)
-    return ret
-
-def save_manifest_after_batch_workbook_factory(services: IServiceProvider):
-    """Factory function to build PySaveManifestAfterBatch_Workbook."""
-    migration = services.GetService(IMigration)
-    ret = PySaveManifestAfterBatch_Workbook(PyMigrationManifestSerializer(), migration)
-    return ret
-
-
-class PyTimeLoggerAfterActionHook(ISyncMigrationActionCompletedHook):
+class TimeLoggerAfterActionHook(MigrationActionCompletedHookBase):
     """Logs the time when an action is complete."""
+
+    handler = None
     
-    __namespace__ = "Python.TestApplication"
-    _dotnet_base = ISyncMigrationActionCompletedHook
-    
-    def __init__(self, handler: logging.Handler | None = None):
+    def __init__(self):
         """Default init to set up logging."""
         self._logger = logging.getLogger(self.__class__.__name__)
         self._logger.setLevel(logging.DEBUG)
         
-        if handler is not None:
-            self._logger.addHandler(handler)
+        if TimeLoggerAfterActionHook.handler is not None:
+            self._logger.addHandler(TimeLoggerAfterActionHook.handler)
             
-    def Execute(self, ctx : IMigrationActionResult):       # noqa: N802
-        """Implements Execute from base."""
-        self._logger.info("Migration action completed")
-        return ctx
-    
+    def execute(self, ctx: IMigrationActionResult) -> IMigrationActionResult: # noqa: N802
+        """Executes the hook."""
+        self._logger.info("Migration action completed.")
+        return ctx    
 
-class PySaveManifestAfterBatch_User(ISyncContentBatchMigrationCompletedHook[IUser]):
-    """A update the manifest file after a user batch is migrated."""
+class SaveManifestHookBase(ContentBatchMigrationCompletedHookBase[TContent]):
+    """Updates the manifest file after a batch is migrated."""
 
-    __namespace__ = "Python.TestApplication"
-    _dotnet_base = ISyncContentBatchMigrationCompletedHook[IUser]
-    
-    
-    def __init__(self, manifest_serializer: PyMigrationManifestSerializer, migration: IMigration) -> None:
-        """Default __init__."""
-        self._manifest_serializer = manifest_serializer
-        self._migration = migration
-        
+    def __init__(self) -> None:
+        """Default __init__."""        
         self._logger = logging.getLogger(self.__class__.__name__)
         self._logger.setLevel(logging.DEBUG)
         
-
-    def Execute(self, ctx):    # noqa: N802
-        """Implements Execute from base."""
-        self._logger.debug("Saving manifest")
-        self._manifest_serializer.save(tableau_migration.migration.PyMigrationManifest(self._migration.Manifest), helper.manifest_path)
-
-         
-class PySaveManifestAfterBatch_Group(ISyncContentBatchMigrationCompletedHook[IGroup]):
-    """A update the manifest file after group batch is migrated."""
-
-    __namespace__ = "Python.TestApplication"
-    _dotnet_base = ISyncContentBatchMigrationCompletedHook[IGroup]
-    
-    
-    def __init__(self, manifest_serializer: PyMigrationManifestSerializer, migration: IMigration) -> None:
-        """Default __init__."""
-        self._manifest_serializer = manifest_serializer
-        self._migration = migration
+    def execute(self, ctx: IContentBatchMigrationResult[TContent]) -> IContentBatchMigrationResult[TContent]: # noqa: N802
+        """Executes the hook."""
+        self._logger.debug("Saving manifest.")
         
-        self._logger = logging.getLogger(self.__class__.__name__)
-        self._logger.setLevel(logging.DEBUG)
-        
-
-    def Execute(self, ctx):    # noqa: N802
-        """Implements Execute from base."""
-        self._logger.debug("Saving manifest")
-        self._manifest_serializer.save(tableau_migration.migration.PyMigrationManifest(self._migration.Manifest), helper.manifest_path)
-        
-
-class PySaveManifestAfterBatch_Project(ISyncContentBatchMigrationCompletedHook[IProject]):
-    """A update the manifest file after project batch is migrated."""
-
-    __namespace__ = "Python.TestApplication"
-    _dotnet_base = ISyncContentBatchMigrationCompletedHook[IProject]
+        serializer = PyMigrationManifestSerializer()
+        manifest = self.services.get_manifest()
+        serializer.save(manifest, helper.manifest_path)
     
-    
-    def __init__(self, manifest_serializer: PyMigrationManifestSerializer, migration: IMigration) -> None:
-        """Default __init__."""
-        self._manifest_serializer = manifest_serializer
-        self._migration = migration
-        
-        self._logger = logging.getLogger(self.__class__.__name__)
-        self._logger.setLevel(logging.DEBUG)
-        
-
-    def Execute(self, ctx):    # noqa: N802
-        """Implements Execute from base."""
-        self._logger.debug("Saving manifest")
-        self._manifest_serializer.save(tableau_migration.migration.PyMigrationManifest(self._migration.Manifest), helper.manifest_path)
-        
-
-class PySaveManifestAfterBatch_DataSource(ISyncContentBatchMigrationCompletedHook[IDataSource]):
-    """A update the manifest file after Data Source batch type is migrated."""
-
-    __namespace__ = "Python.TestApplication"
-    _dotnet_base = ISyncContentBatchMigrationCompletedHook[IDataSource]
-    
-    
-    def __init__(self, manifest_serializer: PyMigrationManifestSerializer, migration: IMigration) -> None:
-        """Default __init__."""
-        self._manifest_serializer = manifest_serializer
-        self._migration = migration
-        
-        self._logger = logging.getLogger(self.__class__.__name__)
-        self._logger.setLevel(logging.DEBUG)
-        
+class SaveUserManifestHook(SaveManifestHookBase[IUser]):
+    """Updates the manifest file after a user batch is migrated."""
+    pass
 
-    def Execute(self, ctx):    # noqa: N802
-        """Implements Execute from base."""
-        self._logger.debug("Saving manifest")
-        self._manifest_serializer.save(tableau_migration.migration.PyMigrationManifest(self._migration.Manifest), helper.manifest_path)
-        
+class SaveGroupManifestHook(SaveManifestHookBase[IGroup]):
+    """Updates the manifest file after a group batch is migrated."""
+    pass
 
-class PySaveManifestAfterBatch_Workbook(ISyncContentBatchMigrationCompletedHook[IWorkbook]):
-    """A update the manifest file after a content type is migrated."""
+class SaveProjectManifestHook(SaveManifestHookBase[IProject]):
+    """Updates the manifest file after a project batch is migrated."""
+    pass
 
-    __namespace__ = "Python.TestApplication"
-    _dotnet_base = ISyncContentBatchMigrationCompletedHook[IWorkbook]
-    
-    
-    def __init__(self, manifest_serializer: PyMigrationManifestSerializer, migration: IMigration) -> None:
-        """Default __init__."""
-        self._manifest_serializer = manifest_serializer
-        self._migration = migration
-        
-        self._logger = logging.getLogger(self.__class__.__name__)
-        self._logger.setLevel(logging.DEBUG)
-        
+class SaveDataSourceManifestHook(SaveManifestHookBase[IDataSource]):
+    """Updates the manifest file after a data source batch is migrated."""
+    pass
 
-    def Execute(self, ctx):    # noqa: N802
-        """Implements Execute from base."""
-        self._logger.debug("Saving manifest")
-        self._manifest_serializer.save(tableau_migration.migration.PyMigrationManifest(self._migration.Manifest), helper.manifest_path)
\ No newline at end of file
+class SaveWorkbookManifestHook(SaveManifestHookBase[IWorkbook]):
+    """Updates the manifest file after a workbook batch is migrated."""
+    pass
\ No newline at end of file
diff --git a/tests/Python.TestApplication/migration_testcomponents_mappings.py b/tests/Python.TestApplication/migration_testcomponents_mappings.py
index ac45a95..f17989f 100644
--- a/tests/Python.TestApplication/migration_testcomponents_mappings.py
+++ b/tests/Python.TestApplication/migration_testcomponents_mappings.py
@@ -17,19 +17,24 @@
 
 import logging
 import helper
+from typing import (
+    Generic,
+    TypeVar
+)
+from tableau_migration import (
+    ContentLocation,
+    ContentMappingBase,
+    ContentMappingContext,
+    IDataSource,
+    IProject,
+    IUser,
+    IWorkbook,
+    LicenseLevels,
+    TableauCloudUsernameMappingBase
+)
 
-from Tableau.Migration import ContentLocation
-from Tableau.Migration.Api.Rest.Models import LicenseLevels
-from Tableau.Migration.Content import IUser
-from Tableau.Migration.Interop.Hooks.Mappings import ISyncContentMapping
-from Tableau.Migration.Engine.Hooks.Mappings.Default import ITableauCloudUsernameMapping
-
-class PyTestTableauCloudUsernameMapping(ITableauCloudUsernameMapping, ISyncContentMapping[IUser]
-):
+class TestTableauCloudUsernameMapping(TableauCloudUsernameMappingBase):
     """Mapping that takes a base email and appends the source item name to the email username."""
-    
-    __namespace__ = "Python.TestApplication"
-    _dotnet_base = ITableauCloudUsernameMapping
 
     def __init__(self):
         """Default init to set up logging."""
@@ -40,59 +45,134 @@ def __init__(self):
         
         self._base_username, self._base_domain = helper.config['test_tableau_cloud_username_options']['base_override_mail_address'].split('@')
         
-    def Execute(self,ctx):  # noqa: N802
+    def map(self, ctx: ContentMappingContext[IUser]) -> ContentMappingContext[IUser]:  # noqa: N802
         """Implements Execute from base."""
-        parent_domain = ctx.MappedLocation.Parent()
+        parent_domain = ctx.mapped_location.parent()
 
-        if self._always_override_address is False and ctx.ContentItem.Email:
-            ctx = ctx.MapTo(parent_domain.Append(ctx.ContentItem.Email))
+        if self._always_override_address is False and ctx.content_item.email:
+            ctx = ctx.map_to(parent_domain.append(ctx.content_item.email))
             return ctx
 
         # Takes the existing "Name" and appends the default domain to build the email
-        item_name: str = ctx.ContentItem.Name
+        item_name: str = ctx.content_item.name
         item_name = item_name.replace(' ', '')
 
         test_email = f'{self._base_username}+{item_name}@{self._base_domain}'
-        ctx = ctx.MapTo(parent_domain.Append(test_email))
-        self._logger.debug('Mapped %s to %s', ctx.ContentItem.Email, ctx.MappedLocation.ToString())
+        ctx = ctx.map_to(parent_domain.append(test_email))
+        self._logger.debug('Mapped %s to %s', ctx.content_item.email, str(ctx.mapped_location))
 
         return ctx
 
-class PySpecialUserMapping(ISyncContentMapping[IUser]):
+class SpecialUserMapping(ContentMappingBase[IUser]):
     """A class to map users to server admin."""
 
-    __namespace__ = "Python.TestApplication"
-    _dotnet_base = ISyncContentMapping[IUser]
-    _admin_username = ContentLocation.ForUsername(helper.config['special_users']['admin_domain'], helper.config['special_users']['admin_username'])
+    _admin_username = ContentLocation.for_username(helper.config['special_users']['admin_domain'], helper.config['special_users']['admin_username'])
         
     def __init__(self):
         """Default init to set up logging."""
         self._logger = logging.getLogger(self.__class__.__name__)
         self._logger.setLevel(logging.DEBUG)
     
-    def Execute(self,ctx):  # noqa: N802
-        """Implements Execute from base."""
-        if ctx.ContentItem.Email in helper.config['special_users']['emails']:
-            ctx=ctx.MapTo(self._admin_username)        
-            self._logger.debug('Mapped %s to %s', ctx.ContentItem.Email, ctx.MappedLocation.ToString())
+    def map(self, ctx: ContentMappingContext[IUser]) -> ContentMappingContext[IUser]:
+        if ctx.content_item.email in helper.config['special_users']['emails']:
+            ctx = ctx.map_to(self._admin_username)        
+            self._logger.debug('Mapped %s to %s', ctx.content_item.email, str(ctx.mapped_location))
         return ctx
     
-class PyUnlicensedUserMapping(ISyncContentMapping[IUser]):
+class UnlicensedUserMapping(ContentMappingBase[IUser]):
     """A class to map unlicensed users to server admin."""
 
-    __namespace__ = "Python.TestApplication"
-    _dotnet_base = ISyncContentMapping[IUser]
-    _admin_username = ContentLocation.ForUsername(helper.config['special_users']['admin_domain'], helper.config['special_users']['admin_username'])
+    _admin_username = ContentLocation.for_username(helper.config['special_users']['admin_domain'], helper.config['special_users']['admin_username'])
         
     def __init__(self):
-        """Implements Execute from base."""
+        """Default init to set up logging."""
         self._logger = logging.getLogger(self.__class__.__name__)
         self._logger.setLevel(logging.DEBUG)    
     
-    def Execute(self,ctx):  # noqa: N802
-        """Implements Execute from base."""
-        if ctx.ContentItem.LicenseLevel == LicenseLevels.Unlicensed:
-            ctx=ctx.MapTo(self._admin_username)        
-            self._logger.debug('Mapped %s to %s', ctx.ContentItem.Email, ctx.MappedLocation.ToString())
+    def map(self, ctx: ContentMappingContext[IUser]) -> ContentMappingContext[IUser]:
+        if ctx.content_item.license_level == LicenseLevels.UNLICENSED:
+            ctx = ctx.map_to(self._admin_username)        
+            self._logger.debug('Mapped %s to %s', ctx.content_item.email, str(ctx.mapped_location))
 
         return ctx
+
+TContent = TypeVar("TContent")
+
+class _ContentWithinSkippedLocationMapping(Generic[TContent]):
+    """Generic base mapping wrapper for content within skipped location."""
+    
+    def __init__(self, logger_name: str):
+        """Default init to set up logging."""
+        self._logger = logging.getLogger(logger_name)
+        self._logger.setLevel(logging.DEBUG)
+
+    def map(self, ctx: ContentMappingContext[TContent], services) -> ContentMappingContext[TContent]:
+        """Executes the mapping.
+        
+        Args:
+            ctx: The input context from the migration engine or previous hook.
+            
+        Returns:
+            The context, potentially modified to pass on to the next hook or migration engine, or None to continue passing the input context.
+        """
+        if helper.config['skipped_project'] == '':
+            return ctx
+
+        path_replaced = ctx.content_item.location.path.replace(helper.config['skipped_project'],'')
+        path_separator = ctx.content_item.location.path_separator
+
+        if not ctx.content_item.location.path.startswith(helper.config['skipped_project']) or \
+           path_replaced == '' or \
+           len(path_replaced.split(path_separator)) <= 2: # considering the first empty value before the first slash
+            return ctx
+        
+        destination_project_finder = services.get_destination_finder(IProject)
+
+        mapped_destination = ContentLocation.from_path(helper.config['skipped_parent_destination'], path_separator)
+
+        project_reference = destination_project_finder.find_by_mapped_location(mapped_destination)
+
+        if project_reference is None:
+            self._logger.error('Cannot map %s "%s" that belongs to "%s" to the project "%s". You must create the destination location first.', self.__orig_class__.__args__[0].__name__, ctx.content_item.name, helper.config['skipped_project'], helper.config['skipped_parent_destination'])
+            return ctx
+            
+        mapped_list = list(mapped_destination.path_segments)
+        
+        for i in range(len(helper.config['skipped_project'].split(ctx.content_item.location.path_separator))+1,len(ctx.content_item.location.path_segments)):
+            mapped_list.append(ctx.content_item.location.path_segments[i])
+
+        self._logger.info('Mapping the %s "%s" that belongs to "%s" to the project "%s" (Id: %s).', self.__orig_class__.__args__[0].__name__, ctx.content_item.name, helper.config['skipped_project'], helper.config['skipped_parent_destination'], project_reference.id)
+
+        ctx = ctx.map_to(ContentLocation.from_path(path_separator.join(mapped_list),path_separator))
+
+        return ctx
+    
+class ProjectWithinSkippedLocationMapping(ContentMappingBase[IProject]):
+    """A class to map projects within skipped project to a configured destination project."""
+
+    def __init__(self):
+        """Default init to set up wrapper."""
+        self._mapper = _ContentWithinSkippedLocationMapping[IProject](self.__class__.__name__)
+    
+    def map(self, ctx: ContentMappingContext[IProject]) -> ContentMappingContext[IProject]:
+        return self._mapper.map(ctx, self.services)
+    
+class DataSourceWithinSkippedLocationMapping(ContentMappingBase[IDataSource]):
+    """A class to map datasources within skipped project to a configured destination project."""
+
+    def __init__(self):
+        """Default init to set up wrapper."""
+        self._mapper = _ContentWithinSkippedLocationMapping[IDataSource](self.__class__.__name__)
+    
+    def map(self, ctx: ContentMappingContext[IDataSource]) -> ContentMappingContext[IDataSource]:
+        return self._mapper.map(ctx, self.services)
+    
+class WorkbookWithinSkippedLocationMapping(ContentMappingBase[IWorkbook]):
+    """A class to map workbooks within skipped project to a configured destination project."""
+
+    def __init__(self):
+        """Default init to set up wrapper."""
+        self._mapper = _ContentWithinSkippedLocationMapping[IWorkbook](self.__class__.__name__)
+    
+    def map(self, ctx: ContentMappingContext[IWorkbook]) -> ContentMappingContext[IWorkbook]:
+        return self._mapper.map(ctx, self.services)
diff --git a/tests/Python.TestApplication/migration_testcomponents_transformers.py b/tests/Python.TestApplication/migration_testcomponents_transformers.py
new file mode 100644
index 0000000..0a63b90
--- /dev/null
+++ b/tests/Python.TestApplication/migration_testcomponents_transformers.py
@@ -0,0 +1,38 @@
+# Copyright (c) 2024, Salesforce, Inc.
+# SPDX-License-Identifier: Apache-2
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Transformers for the Python.TestApplication."""
+
+from tableau_migration import (
+    ContentTransformerBase,
+    IPublishableGroup,
+    IUser
+)
+
+class RemoveMissingDestinationUsersFromGroupsTransformer(ContentTransformerBase[IPublishableGroup]):
+    """A class to transform groups to not try to link skipped users to the group."""
+    
+    def transform(self, item_to_transform: IPublishableGroup) -> IPublishableGroup:
+        destination_user_finder = self.services.get_destination_finder(IUser)
+        users_list = []
+        for usergroup in item_to_transform.users:
+            destination_reference = destination_user_finder.find_by_id(usergroup.user.id)
+
+            if destination_reference is not None:
+                users_list.append(usergroup)
+            
+        item_to_transform.users = users_list
+        
+        return item_to_transform
diff --git a/tests/Python.TestApplication/requirements.txt b/tests/Python.TestApplication/requirements.txt
index 69d617b..2655ae5 100644
--- a/tests/Python.TestApplication/requirements.txt
+++ b/tests/Python.TestApplication/requirements.txt
@@ -1,6 +1,5 @@
 typing_extensions==4.9.0
 cffi==1.16.0
-clr-loader==0.2.6
 pycparser==2.21
 pythonnet==3.0.3
 configparser==6.0.0
diff --git a/tests/Python.TestApplication/test_tableau_cloud_username_mapping.py b/tests/Python.TestApplication/test_tableau_cloud_username_mapping.py
deleted file mode 100644
index 34f0f3e..0000000
--- a/tests/Python.TestApplication/test_tableau_cloud_username_mapping.py
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright (c) 2024, Salesforce, Inc.
-# SPDX-License-Identifier: Apache-2
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-from configparser import ConfigParser
-from Tableau.Migration.Interop.Hooks.Mappings import ISyncContentMapping
-from Tableau.Migration.Content import IUser
-
-class PyTestTableauCloudUsernameMapping(ISyncContentMapping[IUser]):
-    __namespace__ = "MyNamespace"
-
-    def __init__(self, config: ConfigParser) -> None:
-        self._config: ConfigParser = config
-        None
-
-    def Execute(self, ctx):
-        domain = ctx.MappedLocation.Parent()
-
-        # Re-use an existing email if it already exists unless always override is set
-        if self._config['TEST_TABLEAU_CLOUD_USERNAME_OPTIONS']['ALWAYS_OVERRIDE_ADDRESS'] == False and ctx.ContentItem.Email:
-            return ctx.MapTo(domain.Append(ctx.ContentItem.Email))    
-            
-        username, domain = ctx.ContentItem.Email.split('@')
-        test_email = username + ctx.ContentItem.Name.Replace(" ", "") + '@' + domain
-
-        return ctx.MapTo(domain.Append(test_email))
-    
diff --git a/tests/Python.TestApplication/testapplication_tests/test_classes.py b/tests/Python.TestApplication/testapplication_tests/test_classes.py
index 6be294a..17df168 100644
--- a/tests/Python.TestApplication/testapplication_tests/test_classes.py
+++ b/tests/Python.TestApplication/testapplication_tests/test_classes.py
@@ -30,18 +30,7 @@
 from enum import Enum
 from typing import List
 
-from migration_testcomponents_engine_manifest import (
-    PyMigrationManifestSerializer)
-
-from migration_testcomponents_filters import(
-    PySpecialUserFilter,
-    PyUnlicensedUserFilter)
-
-from migration_testcomponents_mappings import(
-    PySpecialUserMapping,
-    PyUnlicensedUserMapping)
-from migration_testcomponents_hooks import(
-    PyTimeLoggerAfterActionHook)
+from migration_testcomponents_engine_manifest import PyMigrationManifestSerializer
 
 def get_class_methods(cls):
     """
@@ -198,12 +187,7 @@ def test_overloaded_missing(self):
 
 
 @pytest.mark.parametrize("python_class, ignored_methods", [                          
-                          (PyMigrationManifestSerializer, None),
-                          (PySpecialUserFilter, "ExecuteAsync"),
-                          (PySpecialUserMapping, None),
-                          (PyUnlicensedUserMapping, None),
-                          (PyUnlicensedUserFilter, "ExecuteAsync"),
-                          (PyTimeLoggerAfterActionHook, None)
+                          (PyMigrationManifestSerializer, None)
                           ])
 def test_classes(python_class, ignored_methods):
     """Verify that all the python wrapper classes actually wrap all the dotnet methods and properties."""
diff --git a/tests/Tableau.Migration.TestApplication/Config/TestApplicationOptions.cs b/tests/Tableau.Migration.TestApplication/Config/TestApplicationOptions.cs
index 303a2ff..cf5db04 100644
--- a/tests/Tableau.Migration.TestApplication/Config/TestApplicationOptions.cs
+++ b/tests/Tableau.Migration.TestApplication/Config/TestApplicationOptions.cs
@@ -32,5 +32,9 @@ public sealed class TestApplicationOptions
         public SpecialUsersOptions SpecialUsers { get; set; } = new();
 
         public string PreviousManifestPath { get; set; } = "";
+
+        public string SkippedProject { get; set; } = string.Empty;
+
+        public string SkippedMissingParentDestination { get; set; } = "Missing Parent";
     }
 }
diff --git a/tests/Tableau.Migration.TestApplication/Hooks/ContentWithinSkippedLocationMapping.cs b/tests/Tableau.Migration.TestApplication/Hooks/ContentWithinSkippedLocationMapping.cs
new file mode 100644
index 0000000..6c6c992
--- /dev/null
+++ b/tests/Tableau.Migration.TestApplication/Hooks/ContentWithinSkippedLocationMapping.cs
@@ -0,0 +1,92 @@
+//
+//  Copyright (c) 2024, Salesforce, Inc.
+//  SPDX-License-Identifier: Apache-2
+//  
+//  Licensed under the Apache License, Version 2.0 (the "License") 
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//  
+//  http://www.apache.org/licenses/LICENSE-2.0
+//  
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+using Tableau.Migration.Content;
+using Tableau.Migration.Engine.Endpoints.Search;
+using Tableau.Migration.Engine.Hooks.Mappings;
+using Tableau.Migration.TestApplication.Config;
+
+namespace Tableau.Migration.TestApplication.Hooks
+{
+    class ContentWithinSkippedLocationMapping<TContent> : IContentMapping<TContent>
+        where TContent : IContentReference
+    {
+        private readonly ContentLocation _skippedParentProject;
+        private readonly ContentLocation _missingParentLocation;
+        private readonly IDestinationContentReferenceFinder<IProject> _destinationProjectContentReferenceFinder;
+        private readonly ILogger<ContentWithinSkippedLocationMapping<TContent>> _logger;
+
+        public ContentWithinSkippedLocationMapping(
+            ILogger<ContentWithinSkippedLocationMapping<TContent>> logger,
+            IDestinationContentReferenceFinderFactory destinationContentReferenceFinderFactory,
+            IOptions<TestApplicationOptions> options)
+        {
+            _destinationProjectContentReferenceFinder = destinationContentReferenceFinderFactory.ForDestinationContentType<IProject>();
+            _logger = logger;
+            _skippedParentProject = ContentLocation.FromPath(options.Value.SkippedProject);
+            _missingParentLocation = ContentLocation.FromPath(options.Value.SkippedMissingParentDestination);
+        }
+
+        public async Task<ContentMappingContext<TContent>?> ExecuteAsync(
+            ContentMappingContext<TContent> ctx, 
+            CancellationToken cancel)
+        {
+            if (_skippedParentProject.IsEmpty)
+            {
+                return ctx;
+            }
+
+            var pathReplaced = ctx.ContentItem.Location.Path.Replace(_skippedParentProject.Path, "");
+
+            if (!ctx.ContentItem.Location.Path.StartsWith(_skippedParentProject.Path) ||
+                string.IsNullOrWhiteSpace(pathReplaced) ||
+                pathReplaced.Split(Constants.PathSeparator, StringSplitOptions.RemoveEmptyEntries).Length <= 1)
+            {
+                return ctx;
+            }
+
+            var contentReference = await _destinationProjectContentReferenceFinder
+                .FindByMappedLocationAsync(_missingParentLocation, cancel)
+                .ConfigureAwait(false);
+
+            if (contentReference is null)
+            {
+                _logger.LogError($"Cannot map the {typeof(TContent).Name} \"{ctx.ContentItem.Name}\" that belongs to \"{nameof(TestApplicationOptions.SkippedProject)}\" to the Project \"{_missingParentLocation}\". You must create the destination location first.");
+
+                return ctx;
+            }
+            var pathList = new List<string>(_missingParentLocation.PathSegments);
+
+            for (int i = _skippedParentProject.PathSegments.Length + 1; i < ctx.ContentItem.Location.PathSegments.Length; i++)
+            {
+                pathList.Add(ctx.ContentItem.Location.PathSegments[i]);
+            }
+
+            _logger.LogInformation($"Mapping the {typeof(TContent).Name} \"{ctx.ContentItem.Name}\" that belongs to \"{nameof(TestApplicationOptions.SkippedProject)}\" to the Project \"{_missingParentLocation}\" ( Id: {contentReference.Id})");
+
+            ctx = ctx.MapTo(new ContentLocation(pathList));
+
+            return ctx;
+        }
+    }
+}
diff --git a/tests/Tableau.Migration.TestApplication/Hooks/NonDomainUserFilter.cs b/tests/Tableau.Migration.TestApplication/Hooks/NonDomainUserFilter.cs
index b8b5448..eb39925 100644
--- a/tests/Tableau.Migration.TestApplication/Hooks/NonDomainUserFilter.cs
+++ b/tests/Tableau.Migration.TestApplication/Hooks/NonDomainUserFilter.cs
@@ -19,16 +19,15 @@
 using System.Collections.Generic;
 using System.DirectoryServices;
 using System.Linq;
+using System.Runtime.InteropServices;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
 using Tableau.Migration.Api.Rest.Models;
 using Tableau.Migration.Content;
 using Tableau.Migration.Engine;
 using Tableau.Migration.Engine.Hooks.Filters;
-using Tableau.Migration.TestApplication.Config;
-using System.Runtime.InteropServices;
-using Microsoft.Extensions.Logging;
-using Polly;
-using Microsoft.Extensions.Options;
 using Tableau.Migration.Resources;
+using Tableau.Migration.TestApplication.Config;
 
 namespace Tableau.Migration.TestApplication.Hooks
 {
diff --git a/tests/Tableau.Migration.TestApplication/Hooks/RemoveMissingDestinationUsersFromGroupsTransformer.cs b/tests/Tableau.Migration.TestApplication/Hooks/RemoveMissingDestinationUsersFromGroupsTransformer.cs
new file mode 100644
index 0000000..c37a7ec
--- /dev/null
+++ b/tests/Tableau.Migration.TestApplication/Hooks/RemoveMissingDestinationUsersFromGroupsTransformer.cs
@@ -0,0 +1,66 @@
+//
+//  Copyright (c) 2024, Salesforce, Inc.
+//  SPDX-License-Identifier: Apache-2
+//  
+//  Licensed under the Apache License, Version 2.0 (the "License") 
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//  
+//  http://www.apache.org/licenses/LICENSE-2.0
+//  
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
+using Tableau.Migration.Content;
+using Tableau.Migration.Engine.Endpoints.Search;
+using Tableau.Migration.Engine.Hooks.Transformers;
+using Tableau.Migration.Resources;
+
+namespace Tableau.Migration.TestApplication.Hooks
+{
+    class RemoveMissingDestinationUsersFromGroupsTransformer : ContentTransformerBase<IPublishableGroup>
+    {
+        private readonly IDestinationContentReferenceFinder<IUser> _destinationUserContentReferenceFinder;
+        
+        public RemoveMissingDestinationUsersFromGroupsTransformer(
+            ISharedResourcesLocalizer? localizer,
+            ILogger<IContentTransformer<IPublishableGroup>>? logger,
+            IDestinationContentReferenceFinderFactory destinationContentReferenceFinderFactory)
+            : base(localizer, logger)
+        {
+            _destinationUserContentReferenceFinder = destinationContentReferenceFinderFactory.ForDestinationContentType<IUser>();
+        }
+
+        public override async Task<IPublishableGroup?> TransformAsync(
+            IPublishableGroup itemToTransform, 
+            CancellationToken cancel)
+        {
+            var updatedUsersList = new List<IGroupUser>();
+
+            foreach (var groupUser in itemToTransform.Users)
+            {
+                var destinationReference = await _destinationUserContentReferenceFinder.FindByIdAsync(
+                    groupUser.User.Id,
+                    cancel).
+                    ConfigureAwait(false);
+
+                if (destinationReference is not null)
+                {
+                    updatedUsersList.Add(groupUser);
+                }
+            }
+
+            itemToTransform.Users = updatedUsersList;
+
+            return itemToTransform;
+        }
+    }
+}
diff --git a/tests/Tableau.Migration.TestApplication/Hooks/SaveManifestAfterBatchMigrationCompletedHook.cs b/tests/Tableau.Migration.TestApplication/Hooks/SaveManifestAfterBatchMigrationCompletedHook.cs
index 5ce0b12..0361492 100644
--- a/tests/Tableau.Migration.TestApplication/Hooks/SaveManifestAfterBatchMigrationCompletedHook.cs
+++ b/tests/Tableau.Migration.TestApplication/Hooks/SaveManifestAfterBatchMigrationCompletedHook.cs
@@ -15,14 +15,11 @@
 //  limitations under the License.
 //
 
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
-using System;
 using System.Threading;
 using System.Threading.Tasks;
-using Tableau.Migration.Content;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
 using Tableau.Migration.Engine;
-using Tableau.Migration.Engine.Actions;
 using Tableau.Migration.Engine.Hooks;
 using Tableau.Migration.TestApplication.Config;
 using Tableau.Migration.TestComponents.Engine.Manifest;
diff --git a/tests/Tableau.Migration.TestApplication/Hooks/SkipByParentLocationFilter.cs b/tests/Tableau.Migration.TestApplication/Hooks/SkipByParentLocationFilter.cs
new file mode 100644
index 0000000..86f40e2
--- /dev/null
+++ b/tests/Tableau.Migration.TestApplication/Hooks/SkipByParentLocationFilter.cs
@@ -0,0 +1,80 @@
+//
+//  Copyright (c) 2024, Salesforce, Inc.
+//  SPDX-License-Identifier: Apache-2
+//  
+//  Licensed under the Apache License, Version 2.0 (the "License") 
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//  
+//  http://www.apache.org/licenses/LICENSE-2.0
+//  
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+using Tableau.Migration.Content;
+using Tableau.Migration.Engine;
+using Tableau.Migration.Engine.Endpoints.Search;
+using Tableau.Migration.Engine.Hooks.Filters;
+using Tableau.Migration.TestApplication.Config;
+
+namespace Tableau.Migration.TestApplication.Hooks
+{
+    class SkipByParentLocationFilter<TContent> : IContentFilter<TContent>
+        where TContent : IContentReference
+    {
+        private readonly ContentLocation _skippedParentProject;
+        private readonly ISourceContentReferenceFinder<IProject> _sourceProjectContentReferenceFinder;
+        private readonly ILogger<SkipByParentLocationFilter<TContent>> _logger;
+
+        public SkipByParentLocationFilter(
+            ILogger<SkipByParentLocationFilter<TContent>> logger,
+            ISourceContentReferenceFinderFactory sourceContentReferenceFinderFactory,
+            IOptions<TestApplicationOptions> options)
+        {
+            _sourceProjectContentReferenceFinder = sourceContentReferenceFinderFactory.ForSourceContentType<IProject>();
+            _logger = logger;
+            _skippedParentProject = ContentLocation.FromPath(options.Value.SkippedProject);
+        }
+
+        public async Task<IEnumerable<ContentMigrationItem<TContent>>?> ExecuteAsync(
+            IEnumerable<ContentMigrationItem<TContent>> ctx, 
+            CancellationToken cancel)
+        {
+            if (_skippedParentProject.IsEmpty)
+            {
+                return ctx;
+            }
+
+            var filteredList = new List<ContentMigrationItem<TContent>>();
+
+            foreach (var item in ctx)
+            {
+                var parent = item.SourceItem.Location.Parent();
+
+                if (_skippedParentProject != parent)
+                {
+                    filteredList.Add(item);
+                    continue;
+                }
+
+                var contentReference = await _sourceProjectContentReferenceFinder
+                    .FindBySourceLocationAsync(parent, cancel)
+                    .ConfigureAwait(false);
+
+                _logger.LogInformation($"Skipping {typeof(TContent).Name} that belongs to \"{nameof(TestApplicationOptions.SkippedProject)}\"  (Project Id: {contentReference?.Id})");
+            }
+
+            return filteredList;
+        }
+    }
+}
diff --git a/tests/Tableau.Migration.TestApplication/Hooks/SpecialUserFilter.cs b/tests/Tableau.Migration.TestApplication/Hooks/SpecialUserFilter.cs
index 4851472..32ca8a0 100644
--- a/tests/Tableau.Migration.TestApplication/Hooks/SpecialUserFilter.cs
+++ b/tests/Tableau.Migration.TestApplication/Hooks/SpecialUserFilter.cs
@@ -16,19 +16,14 @@
 //
 
 using System;
-using System.Collections.Generic;
-using System.DirectoryServices;
 using System.Linq;
-using Tableau.Migration.Api.Rest.Models;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
 using Tableau.Migration.Content;
 using Tableau.Migration.Engine;
 using Tableau.Migration.Engine.Hooks.Filters;
-using Tableau.Migration.TestApplication.Config;
-using System.Runtime.InteropServices;
-using Microsoft.Extensions.Logging;
-using Polly;
 using Tableau.Migration.Resources;
-using Microsoft.Extensions.Options;
+using Tableau.Migration.TestApplication.Config;
 
 namespace Tableau.Migration.TestApplication.Hooks
 {
diff --git a/tests/Tableau.Migration.TestApplication/Hooks/SpecialUserMapping.cs b/tests/Tableau.Migration.TestApplication/Hooks/SpecialUserMapping.cs
index e7adcec..fca18fb 100644
--- a/tests/Tableau.Migration.TestApplication/Hooks/SpecialUserMapping.cs
+++ b/tests/Tableau.Migration.TestApplication/Hooks/SpecialUserMapping.cs
@@ -16,15 +16,15 @@
 //
 
 using System;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
 using Tableau.Migration.Content;
 using Tableau.Migration.Engine.Hooks.Mappings;
 using Tableau.Migration.Resources;
 using Tableau.Migration.TestApplication.Config;
-using Microsoft.Extensions.Options;
-using Microsoft.Extensions.Logging;
-using System.Linq;
 
 namespace Tableau.Migration.TestApplication.Hooks
 {
diff --git a/tests/Tableau.Migration.TestApplication/Program.cs b/tests/Tableau.Migration.TestApplication/Program.cs
index 3b56784..c578b70 100644
--- a/tests/Tableau.Migration.TestApplication/Program.cs
+++ b/tests/Tableau.Migration.TestApplication/Program.cs
@@ -105,7 +105,10 @@ public static async Task Main(string[] args)
                         .AddScoped<UnlicensedUserMapping>()
                         .AddScoped<SpecialUserFilter>()
                         .AddScoped<SpecialUserMapping>()
-                        .AddScoped<NonDomainUserFilter>();
+                        .AddScoped<NonDomainUserFilter>()
+                        .AddScoped(typeof(SkipByParentLocationFilter<>))
+                        .AddScoped(typeof(ContentWithinSkippedLocationMapping<>))
+                        .AddScoped<RemoveMissingDestinationUsersFromGroupsTransformer>();
                 })
                 .Build();
 
diff --git a/tests/Tableau.Migration.TestApplication/TestApplication.cs b/tests/Tableau.Migration.TestApplication/TestApplication.cs
index 4783910..54bd5d3 100644
--- a/tests/Tableau.Migration.TestApplication/TestApplication.cs
+++ b/tests/Tableau.Migration.TestApplication/TestApplication.cs
@@ -106,6 +106,13 @@ public async Task StartAsync(CancellationToken cancel)
             // Log when a content type is done
             _planBuilder.Hooks.Add<TimeLoggerAfterActionHook>();
 
+            _planBuilder.Filters.Add<SkipByParentLocationFilter<IProject>, IProject>();
+            _planBuilder.Filters.Add<SkipByParentLocationFilter<IDataSource>, IDataSource>();
+            _planBuilder.Filters.Add<SkipByParentLocationFilter<IWorkbook>, IWorkbook>();
+            _planBuilder.Transformers.Add<RemoveMissingDestinationUsersFromGroupsTransformer, IPublishableGroup>();
+            _planBuilder.Mappings.Add<ContentWithinSkippedLocationMapping<IProject>, IProject>();
+            _planBuilder.Mappings.Add<ContentWithinSkippedLocationMapping<IDataSource>, IDataSource>();
+            _planBuilder.Mappings.Add<ContentWithinSkippedLocationMapping<IWorkbook>, IWorkbook>();
             // Skip content types we've already done. 
             // Uncomment as needed
             //_planBuilder.Filters.Add(new SkipFilter<IUser>());
diff --git a/tests/Tableau.Migration.TestComponents/JsonConverters/ExceptionJsonConverter.cs b/tests/Tableau.Migration.TestComponents/JsonConverters/ExceptionJsonConverter.cs
index 76b82de..380c78a 100644
--- a/tests/Tableau.Migration.TestComponents/JsonConverters/ExceptionJsonConverter.cs
+++ b/tests/Tableau.Migration.TestComponents/JsonConverters/ExceptionJsonConverter.cs
@@ -15,10 +15,12 @@
 //  limitations under the License.
 //
 
-using Microsoft.Extensions.Logging;
+using System.Collections.Immutable;
 using System.Reflection;
 using System.Text.Json;
 using System.Text.Json.Serialization;
+using Microsoft.Extensions.Logging;
+using Python.Runtime;
 
 namespace Tableau.Migration.TestComponents.JsonConverters
 {
@@ -28,7 +30,12 @@ namespace Tableau.Migration.TestComponents.JsonConverters
     /// </summary>
     public class ExceptionJsonConverter : JsonConverter<Exception>
     {
-        ILogger<ExceptionJsonConverter> _logger;
+        private readonly ILogger<ExceptionJsonConverter> _logger;
+        private static readonly ImmutableHashSet<Type> IGNORED_PROPERTY_TYPES = new[]
+        {
+            typeof(Type),
+            typeof(CancellationToken)
+        }.ToImmutableHashSet();
 
         public ExceptionJsonConverter(ILogger<ExceptionJsonConverter> logger)
         {
@@ -46,10 +53,19 @@ public override void Write(Utf8JsonWriter writer, Exception value, JsonSerialize
         {
             var exceptionType = value.GetType();
 
+            if (value is PythonException pyException)
+            {
+                writer.WriteStartObject();
+                writer.WriteString("ClassName", exceptionType.FullName);
+                writer.WriteString("Message", pyException.Format());
+                writer.WriteEndObject();
+                return;
+            }
+
             var properties = exceptionType.GetProperties()
-                .Where(e => e.PropertyType != typeof(Type))
+                .Where(e => !IGNORED_PROPERTY_TYPES.Contains(e.PropertyType))
                 .Where(e => e.PropertyType.Namespace != typeof(MemberInfo).Namespace)
-                .ToList();
+                .ToImmutableArray();
 
             writer.WriteStartObject();
             writer.WriteString("ClassName", exceptionType.FullName);
@@ -73,6 +89,7 @@ public override void Write(Utf8JsonWriter writer, Exception value, JsonSerialize
                 catch (Exception ex)
                 {
                     _logger.LogError(ex, "Unable to write property");
+                    throw new Exception($"Error serializing {exceptionType.FullName}.{property.Name} (type {property.PropertyType}).", ex);
                 }
             }
 
diff --git a/tests/Tableau.Migration.TestComponents/Tableau.Migration.TestComponents.csproj b/tests/Tableau.Migration.TestComponents/Tableau.Migration.TestComponents.csproj
index b56b7df..51729f7 100644
--- a/tests/Tableau.Migration.TestComponents/Tableau.Migration.TestComponents.csproj
+++ b/tests/Tableau.Migration.TestComponents/Tableau.Migration.TestComponents.csproj
@@ -8,6 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="CommunityToolkit.Diagnostics" Version="8.2.2" />
+	<PackageReference Include="pythonnet" Version="3.0.3" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/tests/Tableau.Migration.Tests/AutoFixtureTestBase.cs b/tests/Tableau.Migration.Tests/AutoFixtureTestBase.cs
index 9960329..4555367 100644
--- a/tests/Tableau.Migration.Tests/AutoFixtureTestBase.cs
+++ b/tests/Tableau.Migration.Tests/AutoFixtureTestBase.cs
@@ -17,15 +17,10 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using System.Threading;
 using AutoFixture;
-using AutoFixture.AutoMoq;
 using AutoFixture.Kernel;
-using Moq;
-using Tableau.Migration.Api.Rest.Models.Requests;
-using Tableau.Migration.Api.Rest.Models.Responses;
 
 namespace Tableau.Migration.Tests
 {
@@ -43,8 +38,6 @@ public abstract class AutoFixtureTestBase
 
         public AutoFixtureTestBase()
         {
-            Customize();
-
             var testCancellationTimeoutConfig = Environment.GetEnvironmentVariable("MIGRATIONSDK_TEST_CANCELLATION_TIMEOUT_TIMESPAN");
 
             if (!TimeSpan.TryParse(testCancellationTimeoutConfig, out TestCancellationTimeout))
@@ -56,7 +49,7 @@ public AutoFixtureTestBase()
         /// <summary>
         /// Creates a new <see cref="IFixture"/> instance.
         /// </summary>
-        protected static IFixture CreateFixture() => new Fixture().Customize(new AutoMoqCustomization { ConfigureMembers = true });
+        protected static IFixture CreateFixture() => FixtureFactory.Create();
 
         /// <summary>
         /// Creates a variable of the requested type.
@@ -134,123 +127,5 @@ protected IEnumerable<T> CreateMany<T>(int generatedCount, IEnumerable<T>? first
         /// <param name="value">The value to freeze.</param>
         /// <returns>The value that will subsequently always be created for <typeparamref name="T" />.</returns>
         protected T Freeze<T>(T value) => AutoFixture.Freeze<T>(composer => composer.FromFactory(() => value));
-
-        private void Customize()
-        {
-            AutoFixture.Register(() => Create<MockServiceProvider>().Object);
-
-            AutoFixture.Register(() => Create<Mock<TimeProvider>>().Object);
-
-            AutoFixture.Register(() => new ContentLocation(CreateMany<string>()));
-
-            AutoFixture.Register<string, Stream>((string data) =>
-            {
-                var bytes = Constants.DefaultEncoding.GetBytes(data);
-                return new MemoryStream(bytes);
-            });
-
-            AutoFixture.Register<IMemoryStreamManager>(() => MemoryStreamManager.Instance);
-
-            #region - JobResponse -
-
-            // These properties should return DateTime strings instead of the default Guid-like ones.
-            AutoFixture.Customize<JobResponse.JobType>(composer => composer
-                .With(j => j.CreatedAt, () => Create<DateTime>().ToIso8601())
-                .With(j => j.UpdatedAt, () => Create<DateTime>().ToIso8601())
-                .With(j => j.CompletedAt, () => Create<DateTime?>()?.ToIso8601()));
-
-            #endregion
-
-            #region - ImportJobResponse -
-
-            // These properties should return DateTime strings instead of the default Guid-like ones.
-            AutoFixture.Customize<ImportJobResponse.ImportJobType>(composer => composer
-                .With(j => j.CreatedAt, () => Create<DateTime>().ToIso8601()));
-
-            #endregion
-
-            #region - UsersResponse - 
-
-            // Just to make the strings a little easier to read during test debugging
-            AutoFixture.Customize<UsersResponse.UserType.DomainType>(composer => composer
-                .With(d => d.Name, $"DomainName{Guid.NewGuid()}"));
-
-            // Wrong - Work item in in backlog
-            // The domain does not go into the name for UsersResponse.UserType. Also, domain can never be "local" 
-            // here. If code tries something like Create<UsersResponse.UserType>.With(u => domain.name, "local"), then this code is skipped
-            AutoFixture.Customize<UsersResponse.UserType>(composer => composer
-                .With(
-                u => u.Name,
-                (UsersResponse.UserType.DomainType domain) =>
-                {
-                    var plainUserName = $"Name{Guid.NewGuid()}";
-                    var domainName = domain?.Name;
-
-                    return string.Equals(domainName, "local", StringComparison.OrdinalIgnoreCase)
-                    ? plainUserName
-                    : $"{domainName}{Constants.DomainNameSeparator}{plainUserName}";
-                }));
-
-            #endregion
-
-            #region - CreateProjectResponse -
-
-            // These properties should return Guid strings instead of the default PropertyName/Guid ones.
-            AutoFixture.Customize<CreateProjectResponse.ProjectType>(composer => composer
-                .With(p => p.ParentProjectId, () => Create<Guid?>()?.ToString()));
-
-            #endregion
-
-            #region - ProjectsResponse -
-
-            // These properties should return Guid strings instead of the default PropertyName/Guid ones.
-            AutoFixture.Customize<ProjectsResponse.ProjectType>(composer => composer
-                .With(p => p.ParentProjectId, () => Create<Guid?>()?.ToString()));
-
-            #endregion
-
-            #region - UpdateDataSourceResponse -
-
-            // These properties should return DateTime strings instead of the default Guid-like ones.
-            AutoFixture.Customize<UpdateDataSourceResponse.DataSourceType>(composer => composer
-                .With(j => j.CreatedAt, () => Create<DateTime>().ToIso8601())
-                .With(j => j.UpdatedAt, () => Create<DateTime>().ToIso8601()));
-
-            #endregion
-
-            #region - UpdateWorkbookResponse -
-
-            // These properties should return DateTime strings instead of the default Guid-like ones.
-            AutoFixture.Customize<UpdateWorkbookResponse.WorkbookType>(composer => composer
-                .With(j => j.CreatedAt, () => Create<DateTime>().ToIso8601())
-                .With(j => j.UpdatedAt, () => Create<DateTime>().ToIso8601()));
-
-            #endregion
-
-            #region - UpdateConnectionRequest -
-
-            // These properties should return nullable bool strings instead of the default Guid-like ones.
-            AutoFixture.Customize<UpdateConnectionRequest.ConnectionType>(composer => composer
-                .With(j => j.EmbedPassword, () => Create<bool?>().ToString())
-                .With(j => j.QueryTaggingEnabled, () => Create<bool?>().ToString()));
-
-            #endregion
-
-            #region - ConnectionsResponse - 
-
-            // These properties should return nullable bool strings instead of the default Guid-like ones.
-            AutoFixture.Customize<ConnectionsResponse.ConnectionType>(composer => composer
-                .With(j => j.QueryTaggingEnabled, () => Create<bool?>().ToString()));
-
-            #endregion
-
-            #region - ConnectionResponse - 
-            
-            // These properties should return nullable bool strings instead of the default Guid-like ones.
-            AutoFixture.Customize<ConnectionResponse.ConnectionType>(composer => composer
-                .With(j => j.QueryTaggingEnabled, () => Create<bool?>().ToString()));
-
-            #endregion
-        }
     }
 }
diff --git a/tests/Tableau.Migration.Tests/FixtureFactory.cs b/tests/Tableau.Migration.Tests/FixtureFactory.cs
new file mode 100644
index 0000000..3b65fff
--- /dev/null
+++ b/tests/Tableau.Migration.Tests/FixtureFactory.cs
@@ -0,0 +1,156 @@
+//
+//  Copyright (c) 2024, Salesforce, Inc.
+//  SPDX-License-Identifier: Apache-2
+//  
+//  Licensed under the Apache License, Version 2.0 (the "License") 
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//  
+//  http://www.apache.org/licenses/LICENSE-2.0
+//  
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+using System;
+using System.IO;
+using AutoFixture;
+using AutoFixture.AutoMoq;
+using Moq;
+using Tableau.Migration.Api.Rest.Models.Requests;
+using Tableau.Migration.Api.Rest.Models.Responses;
+
+namespace Tableau.Migration.Tests
+{
+    public static class FixtureFactory
+    {
+        public static IFixture Create() => Customize(new Fixture());
+
+        private static IFixture Customize(IFixture fixture)
+        {
+            fixture = fixture.Customize(new AutoMoqCustomization { ConfigureMembers = true });
+
+            fixture.Customizations.Add(new ImmutableCollectionSpecimenBuilder());
+
+            fixture.Register(() => fixture.Create<MockServiceProvider>().Object);
+
+            fixture.Register(() => fixture.Create<Mock<TimeProvider>>().Object);
+
+            fixture.Register(() => new ContentLocation(fixture.CreateMany<string>()));
+
+            fixture.Register<string, Stream>((string data) =>
+            {
+                var bytes = Constants.DefaultEncoding.GetBytes(data);
+                return new MemoryStream(bytes);
+            });
+
+            fixture.Register<IMemoryStreamManager>(() => MemoryStreamManager.Instance);
+
+            #region - JobResponse -
+
+            // These properties should return DateTime strings instead of the default Guid-like ones.
+            fixture.Customize<JobResponse.JobType>(composer => composer
+                .With(j => j.CreatedAt, () => fixture.Create<DateTime>().ToIso8601())
+                .With(j => j.UpdatedAt, () => fixture.Create<DateTime>().ToIso8601())
+                .With(j => j.CompletedAt, () => fixture.Create<DateTime?>()?.ToIso8601()));
+
+            #endregion
+
+            #region - ImportJobResponse -
+
+            // These properties should return DateTime strings instead of the default Guid-like ones.
+            fixture.Customize<ImportJobResponse.ImportJobType>(composer => composer
+                .With(j => j.CreatedAt, () => fixture.Create<DateTime>().ToIso8601()));
+
+            #endregion
+
+            #region - UsersResponse - 
+
+            // Just to make the strings a little easier to read during test debugging
+            fixture.Customize<UsersResponse.UserType.DomainType>(composer => composer
+                .With(d => d.Name, $"DomainName{Guid.NewGuid()}"));
+
+            // Wrong - Work item in in backlog
+            // The domain does not go into the name for UsersResponse.UserType. Also, domain can never be "local" 
+            // here. If code tries something like Create<UsersResponse.UserType>.With(u => domain.name, "local"), then this code is skipped
+            fixture.Customize<UsersResponse.UserType>(composer => composer
+                .With(
+                u => u.Name,
+                (UsersResponse.UserType.DomainType domain) =>
+                {
+                    var plainUserName = $"Name{Guid.NewGuid()}";
+                    var domainName = domain?.Name;
+
+                    return string.Equals(domainName, "local", StringComparison.OrdinalIgnoreCase)
+                    ? plainUserName
+                    : $"{domainName}{Constants.DomainNameSeparator}{plainUserName}";
+                }));
+
+            #endregion
+
+            #region - CreateProjectResponse -
+
+            // These properties should return Guid strings instead of the default PropertyName/Guid ones.
+            fixture.Customize<CreateProjectResponse.ProjectType>(composer => composer
+                .With(p => p.ParentProjectId, () => fixture.Create<Guid?>()?.ToString()));
+
+            #endregion
+
+            #region - ProjectsResponse -
+
+            // These properties should return Guid strings instead of the default PropertyName/Guid ones.
+            fixture.Customize<ProjectsResponse.ProjectType>(composer => composer
+                .With(p => p.ParentProjectId, () => fixture.Create<Guid?>()?.ToString()));
+
+            #endregion
+
+            #region - UpdateDataSourceResponse -
+
+            // These properties should return DateTime strings instead of the default Guid-like ones.
+            fixture.Customize<UpdateDataSourceResponse.DataSourceType>(composer => composer
+                .With(j => j.CreatedAt, () => fixture.Create<DateTime>().ToIso8601())
+                .With(j => j.UpdatedAt, () => fixture.Create<DateTime>().ToIso8601()));
+
+            #endregion
+
+            #region - UpdateWorkbookResponse -
+
+            // These properties should return DateTime strings instead of the default Guid-like ones.
+            fixture.Customize<UpdateWorkbookResponse.WorkbookType>(composer => composer
+                .With(j => j.CreatedAt, () => fixture.Create<DateTime>().ToIso8601())
+                .With(j => j.UpdatedAt, () => fixture.Create<DateTime>().ToIso8601()));
+
+            #endregion
+
+            #region - UpdateConnectionRequest -
+
+            // These properties should return nullable bool strings instead of the default Guid-like ones.
+            fixture.Customize<UpdateConnectionRequest.ConnectionType>(composer => composer
+                .With(j => j.EmbedPassword, () => fixture.Create<bool?>().ToString())
+                .With(j => j.QueryTaggingEnabled, () => fixture.Create<bool?>().ToString()));
+
+            #endregion
+
+            #region - ConnectionsResponse - 
+
+            // These properties should return nullable bool strings instead of the default Guid-like ones.
+            fixture.Customize<ConnectionsResponse.ConnectionType>(composer => composer
+                .With(j => j.QueryTaggingEnabled, () => fixture.Create<bool?>().ToString()));
+
+            #endregion
+
+            #region - ConnectionResponse - 
+
+            // These properties should return nullable bool strings instead of the default Guid-like ones.
+            fixture.Customize<ConnectionResponse.ConnectionType>(composer => composer
+                .With(j => j.QueryTaggingEnabled, () => fixture.Create<bool?>().ToString()));
+
+            #endregion
+
+            return fixture;
+        }
+    }
+}
diff --git a/tests/Tableau.Migration.Tests/ImmutableCollectionSpecimenBuilder.cs b/tests/Tableau.Migration.Tests/ImmutableCollectionSpecimenBuilder.cs
new file mode 100644
index 0000000..93f3afa
--- /dev/null
+++ b/tests/Tableau.Migration.Tests/ImmutableCollectionSpecimenBuilder.cs
@@ -0,0 +1,56 @@
+//
+//  Copyright (c) 2024, Salesforce, Inc.
+//  SPDX-License-Identifier: Apache-2
+//  
+//  Licensed under the Apache License, Version 2.0 (the "License") 
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//  
+//  http://www.apache.org/licenses/LICENSE-2.0
+//  
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using AutoFixture.Kernel;
+
+namespace Tableau.Migration.Tests
+{
+    internal sealed class ImmutableCollectionSpecimenBuilder : ISpecimenBuilder
+    {
+        private static Type? GetConcreteImmutableType(Type genericType)
+        {
+            if (genericType == typeof(IImmutableList<>))
+            {
+                return typeof(ImmutableList<>);
+            }
+
+            return null;
+        }
+
+        public object Create(object request, ISpecimenContext context)
+        {
+            if(!(request is Type t) || !t.IsGenericType)
+            {
+                return new NoSpecimen();
+            }
+
+            var typeArguments = t.GetGenericArguments();
+            var genericType = t.GetGenericTypeDefinition();
+
+            if(genericType == typeof(ImmutableList<>) || genericType == typeof(IImmutableList<>))
+            {
+                dynamic list = context.Resolve(typeof(List<>).MakeGenericType(typeArguments));
+                return ImmutableList.ToImmutableList(list);
+            }
+
+            return new NoSpecimen();
+        }
+    }
+}
diff --git a/tests/Tableau.Migration.Tests/Unit/Api/GroupsApiClientTests.cs b/tests/Tableau.Migration.Tests/Unit/Api/GroupsApiClientTests.cs
index 6942cc1..738b985 100644
--- a/tests/Tableau.Migration.Tests/Unit/Api/GroupsApiClientTests.cs
+++ b/tests/Tableau.Migration.Tests/Unit/Api/GroupsApiClientTests.cs
@@ -302,6 +302,7 @@ public async Task Returns_success()
 
                 var getUsersResponse = AutoFixture.CreateResponse<UsersResponse>();
                 getUsersResponse.Items = Array.Empty<UsersResponse.UserType>();
+                getUsersResponse.Pagination = new() { PageNumber = 1, PageSize = int.MaxValue, TotalAvailable = getUsersResponse.Items.Length };
 
                 MockHttpClient.SetupResponse(new MockHttpResponseMessage<UsersResponse>(getUsersResponse));
 
@@ -332,6 +333,7 @@ public async Task Succeeds_when_group_exists()
 
                 var getUsersResponse = AutoFixture.CreateResponse<UsersResponse>();
                 getUsersResponse.Items = Array.Empty<UsersResponse.UserType>();
+                getUsersResponse.Pagination = new() { PageNumber = 1, PageSize = int.MaxValue, TotalAvailable = getUsersResponse.Items.Length };
 
                 MockHttpClient.SetupResponse(new MockHttpResponseMessage<UsersResponse>(getUsersResponse));
 
diff --git a/tests/Tableau.Migration.Tests/Unit/Content/Search/ContentReferenceCacheBaseTests.cs b/tests/Tableau.Migration.Tests/Unit/Content/Search/ContentReferenceCacheBaseTests.cs
index c6762b1..822597c 100644
--- a/tests/Tableau.Migration.Tests/Unit/Content/Search/ContentReferenceCacheBaseTests.cs
+++ b/tests/Tableau.Migration.Tests/Unit/Content/Search/ContentReferenceCacheBaseTests.cs
@@ -166,6 +166,26 @@ public async Task NotFoundCachedAsync()
                 Assert.Equal(1, Cache.SearchCalls);
             }
 
+            [Fact]
+            public async Task NotFoundSingleListAsync()
+            {
+                var notFoundItem1 = Create<ContentReferenceStub>();
+                var notFoundItem2 = Create<ContentReferenceStub>();
+
+                var result = await Cache.ForLocationAsync(notFoundItem1.Location, Cancel);
+                Assert.Null(result);
+
+                result = await Cache.ForLocationAsync(notFoundItem1.Location, Cancel);
+                Assert.Null(result);
+
+                Assert.Equal(1, Cache.SearchCalls);
+
+                result = await Cache.ForLocationAsync(notFoundItem2.Location, Cancel);
+                Assert.Null(result);
+
+                Assert.Equal(1, Cache.SearchCalls);
+            }
+
             // TODO: W-14187810 - Fix Flaky Test.
             // Increasing the timeout configuration helps when the test runs in a machine with limited resources.
             [Fact]
diff --git a/tests/Tableau.Migration.Tests/Unit/Engine/Endpoints/Search/ManifestDestinationContentReferenceFinderFactoryTests.cs b/tests/Tableau.Migration.Tests/Unit/Engine/Endpoints/Search/ManifestDestinationContentReferenceFinderFactoryTests.cs
index 4c43746..6bcd331 100644
--- a/tests/Tableau.Migration.Tests/Unit/Engine/Endpoints/Search/ManifestDestinationContentReferenceFinderFactoryTests.cs
+++ b/tests/Tableau.Migration.Tests/Unit/Engine/Endpoints/Search/ManifestDestinationContentReferenceFinderFactoryTests.cs
@@ -16,6 +16,7 @@
 //
 
 using Moq;
+using Tableau.Migration.Content.Search;
 using Tableau.Migration.Engine.Endpoints.Search;
 using Xunit;
 
@@ -34,7 +35,10 @@ public void ReturnsManifestDestinationFinder()
 
                 var finder = fac.ForContentType<TestContentType>();
 
-                provider.Verify(x => x.GetService(typeof(ManifestDestinationContentReferenceFinder<TestContentType>)), Times.Once);
+                provider.Verify(x => x.GetService(typeof(IDestinationContentReferenceFinder<TestContentType>)), Times.Once);
+
+                Assert.IsAssignableFrom<IDestinationContentReferenceFinder<TestContentType>>(finder);
+                Assert.IsAssignableFrom<IContentReferenceFinder<TestContentType>>(finder);
             }
         }
     }
diff --git a/tests/Tableau.Migration.Tests/Unit/Engine/Endpoints/Search/ManifestDestinationContentReferenceFinderTests.cs b/tests/Tableau.Migration.Tests/Unit/Engine/Endpoints/Search/ManifestDestinationContentReferenceFinderTests.cs
index 09b34ec..368d5f7 100644
--- a/tests/Tableau.Migration.Tests/Unit/Engine/Endpoints/Search/ManifestDestinationContentReferenceFinderTests.cs
+++ b/tests/Tableau.Migration.Tests/Unit/Engine/Endpoints/Search/ManifestDestinationContentReferenceFinderTests.cs
@@ -72,7 +72,7 @@ public async Task FindsWithCachedMappedLocationAsync()
                 MockCache.Setup(x => x.ForLocationAsync(mappedLoc, Cancel))
                     .ReturnsAsync(cacheItem);
 
-                var result = await Finder.FindDestinationReferenceAsync(sourceItem.Location, Cancel);
+                var result = await Finder.FindBySourceLocationAsync(sourceItem.Location, Cancel);
 
                 Assert.Same(cacheItem, result);
 
@@ -93,7 +93,7 @@ public async Task FindsById()
                 MockCache.Setup(x => x.ForLocationAsync(sourceItem.Location, Cancel))
                     .ReturnsAsync(cacheItem);
 
-                var result = await Finder.FindDestinationReferenceAsync(sourceItem.Id, Cancel);
+                var result = await Finder.FindBySourceIdAsync(sourceItem.Id, Cancel);
 
                 Assert.Same(cacheItem, result);
 
@@ -103,7 +103,7 @@ public async Task FindsById()
             [Fact]
             public async Task ReturnsNullWhenLocationNotFound()
             {
-                var result = await Finder.FindDestinationReferenceAsync(Create<ContentLocation>(), Cancel);
+                var result = await Finder.FindBySourceLocationAsync(Create<ContentLocation>(), Cancel);
 
                 Assert.Null(result);
 
@@ -113,7 +113,7 @@ public async Task ReturnsNullWhenLocationNotFound()
             [Fact]
             public async Task ReturnsNullWhenIdNotFound()
             {
-                var result = await Finder.FindDestinationReferenceAsync(Create<Guid>(), Cancel);
+                var result = await Finder.FindBySourceIdAsync(Create<Guid>(), Cancel);
 
                 Assert.Null(result);
 
@@ -134,7 +134,7 @@ public async Task FindsByContentUrl()
                 MockCache.Setup(x => x.ForLocationAsync(sourceItem.Location, Cancel))
                     .ReturnsAsync(cacheItem);
 
-                var result = await Finder.FindDestinationReferenceAsync(sourceItem.ContentUrl, Cancel);
+                var result = await Finder.FindBySourceContentUrlAsync(sourceItem.ContentUrl, Cancel);
 
                 Assert.Same(cacheItem, result);
 
@@ -144,7 +144,7 @@ public async Task FindsByContentUrl()
             [Fact]
             public async Task ReturnsNullWhenContentUrlNotFound()
             {
-                var result = await Finder.FindDestinationReferenceAsync(Create<string>(), Cancel);
+                var result = await Finder.FindBySourceContentUrlAsync(Create<string>(), Cancel);
 
                 Assert.Null(result);
 
@@ -179,7 +179,7 @@ public async Task FindsWithMappedLocationFromManifestAsync()
                 await entryBuilder.MapEntriesAsync(new[] { sourceItem }, mockMapping.Object, Cancel);
                 entries.Single().DestinationFound(mockDestinationRef.Object);
 
-                var result = await Finder.FindMappedDestinationReferenceAsync(mappedLoc, Cancel);
+                var result = await Finder.FindByMappedLocationAsync(mappedLoc, Cancel);
 
                 Assert.Same(mockDestinationRef.Object, result);
 
@@ -207,7 +207,7 @@ public async Task FindsWithMappedLocationNoDestinationAsync()
                 MockCache.Setup(x => x.ForLocationAsync(mappedLoc, Cancel))
                     .ReturnsAsync(cacheItem);
 
-                var result = await Finder.FindMappedDestinationReferenceAsync(mappedLoc, Cancel);
+                var result = await Finder.FindByMappedLocationAsync(mappedLoc, Cancel);
 
                 Assert.Same(cacheItem, result);
 
@@ -230,7 +230,7 @@ public async Task FindsWithCachedDestinationLocationAsync()
                 MockCache.Setup(x => x.ForLocationAsync(mappedLoc, Cancel))
                     .ReturnsAsync(cacheItem);
 
-                var result = await Finder.FindMappedDestinationReferenceAsync(entry.MappedLocation, Cancel);
+                var result = await Finder.FindByMappedLocationAsync(entry.MappedLocation, Cancel);
 
                 Assert.Same(cacheItem, result);
 
diff --git a/tests/Tableau.Migration.Tests/Unit/Engine/Endpoints/Search/ManifestSourceContentReferenceFinderFactoryTests.cs b/tests/Tableau.Migration.Tests/Unit/Engine/Endpoints/Search/ManifestSourceContentReferenceFinderFactoryTests.cs
index beaafd7..4a4302d 100644
--- a/tests/Tableau.Migration.Tests/Unit/Engine/Endpoints/Search/ManifestSourceContentReferenceFinderFactoryTests.cs
+++ b/tests/Tableau.Migration.Tests/Unit/Engine/Endpoints/Search/ManifestSourceContentReferenceFinderFactoryTests.cs
@@ -16,6 +16,7 @@
 //
 
 using Moq;
+using Tableau.Migration.Content.Search;
 using Tableau.Migration.Engine.Endpoints.Search;
 using Xunit;
 
@@ -34,7 +35,10 @@ public void ReturnsManifestSourceFinder()
 
                 var finder = fac.ForContentType<TestContentType>();
 
-                provider.Verify(x => x.GetService(typeof(ManifestSourceContentReferenceFinder<TestContentType>)), Times.Once);
+                provider.Verify(x => x.GetService(typeof(ISourceContentReferenceFinder<TestContentType>)), Times.Once);
+
+                Assert.IsAssignableFrom<ISourceContentReferenceFinder<TestContentType>>(finder);
+                Assert.IsAssignableFrom<IContentReferenceFinder<TestContentType>>(finder);
             }
         }
     }
diff --git a/tests/Tableau.Migration.Tests/Unit/Engine/Endpoints/Search/ManifestSourceContentReferenceFinderTests.cs b/tests/Tableau.Migration.Tests/Unit/Engine/Endpoints/Search/ManifestSourceContentReferenceFinderTests.cs
index 4ea91bf..f409a7b 100644
--- a/tests/Tableau.Migration.Tests/Unit/Engine/Endpoints/Search/ManifestSourceContentReferenceFinderTests.cs
+++ b/tests/Tableau.Migration.Tests/Unit/Engine/Endpoints/Search/ManifestSourceContentReferenceFinderTests.cs
@@ -19,7 +19,6 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using Castle.Components.DictionaryAdapter.Xml;
 using Moq;
 using Tableau.Migration.Content.Search;
 using Tableau.Migration.Engine.Endpoints.Search;
@@ -45,7 +44,10 @@ public ManifestSourceContentReferenceFinderTest()
                 Pipeline = Create<Mock<IMigrationPipeline>>();
                 ContentReferenceCache = Create<Mock<IContentReferenceCache>>();
 
-                ContentReferenceCache.Setup(x => x.ForIdAsync(It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
+                ContentReferenceCache.Setup(x => x.ForIdAsync(It.IsAny<Guid>(), Cancel))
+                    .Returns(Task.FromResult<IContentReference?>(null));
+
+                ContentReferenceCache.Setup(x => x.ForLocationAsync(It.IsAny<ContentLocation>(), Cancel))
                     .Returns(Task.FromResult<IContentReference?>(null));
 
                 Pipeline.Setup(x => x.CreateSourceCache<TestContentType>())
@@ -77,13 +79,13 @@ public async Task FindCacheReferenceAsync()
             {
                 var sourceItem = Create<TestContentType>();
 
-                ContentReferenceCache.Setup(x => x.ForIdAsync(sourceItem.Id, It.IsAny<CancellationToken>()))
+                ContentReferenceCache.Setup(x => x.ForIdAsync(sourceItem.Id, Cancel))
                     .ReturnsAsync(sourceItem);
 
                 var result = await Finder.FindByIdAsync(sourceItem.Id, Cancel);
 
                 Assert.Same(sourceItem, result);
-                ContentReferenceCache.Verify(x => x.ForIdAsync(It.IsAny<Guid>(), It.IsAny<CancellationToken>()), Times.Once);
+                ContentReferenceCache.Verify(x => x.ForIdAsync(It.IsAny<Guid>(), Cancel), Times.Once);
             }
 
             [Fact]
@@ -94,7 +96,50 @@ public async Task NotFoundAsync()
                 var result = await Finder.FindByIdAsync(sourceItem.Id, Cancel);
 
                 Assert.Null(result);
-                ContentReferenceCache.Verify(x => x.ForIdAsync(It.IsAny<Guid>(), It.IsAny<CancellationToken>()), Times.Once);
+                ContentReferenceCache.Verify(x => x.ForIdAsync(It.IsAny<Guid>(), Cancel), Times.Once);
+            }
+        }
+
+        public class FindBySourceLocationAsync : ManifestSourceContentReferenceFinderTest
+        {
+            [Fact]
+            public async Task FindsManifestReferenceAsync()
+            {
+                var sourceItem = Create<TestContentType>();
+
+                var entry = Manifest.Entries.GetOrCreatePartition<TestContentType>().GetEntryBuilder(1)
+                    .CreateEntries(new[] { sourceItem }, (i, e) => e)
+                    .Single();
+
+                var result = await Finder.FindBySourceLocationAsync(sourceItem.Location, Cancel);
+
+                Assert.Same(entry.Source, result);
+                ContentReferenceCache.Verify(x => x.ForLocationAsync(It.IsAny<ContentLocation>(), It.IsAny<CancellationToken>()), Times.Never);
+            }
+
+            [Fact]
+            public async Task FindCacheReferenceAsync()
+            {
+                var sourceItem = Create<TestContentType>();
+
+                ContentReferenceCache.Setup(x => x.ForLocationAsync(sourceItem.Location, Cancel))
+                    .ReturnsAsync(sourceItem);
+
+                var result = await Finder.FindBySourceLocationAsync(sourceItem.Location, Cancel);
+
+                Assert.Same(sourceItem, result);
+                ContentReferenceCache.Verify(x => x.ForLocationAsync(It.IsAny<ContentLocation>(), Cancel), Times.Once);
+            }
+
+            [Fact]
+            public async Task NotFoundAsync()
+            {
+                var sourceItem = Create<TestContentType>();
+
+                var result = await Finder.FindBySourceLocationAsync(sourceItem.Location, Cancel);
+
+                Assert.Null(result);
+                ContentReferenceCache.Verify(x => x.ForLocationAsync(It.IsAny<ContentLocation>(), Cancel), Times.Once);
             }
         }
     }
diff --git a/tests/Tableau.Migration.Tests/Unit/Engine/Hooks/Transformers/Default/MappedUserTransformerTests.cs b/tests/Tableau.Migration.Tests/Unit/Engine/Hooks/Transformers/Default/MappedUserTransformerTests.cs
index c51e4ea..8b2b795 100644
--- a/tests/Tableau.Migration.Tests/Unit/Engine/Hooks/Transformers/Default/MappedUserTransformerTests.cs
+++ b/tests/Tableau.Migration.Tests/Unit/Engine/Hooks/Transformers/Default/MappedUserTransformerTests.cs
@@ -21,7 +21,6 @@
 using Tableau.Migration.Content;
 using Tableau.Migration.Engine.Endpoints.Search;
 using Tableau.Migration.Engine.Hooks.Transformers.Default;
-using Tableau.Migration.Engine.Pipelines;
 using Xunit;
 
 namespace Tableau.Migration.Tests.Unit.Engine.Hooks.Transformers.Default
@@ -30,18 +29,18 @@ public class MappedUserTransformerTests
     {
         public abstract class MappedUserTransformerTest : AutoFixtureTestBase
         {
-            protected readonly Mock<IMigrationPipeline> MockMigrationPipeline = new();
+            protected readonly Mock<IDestinationContentReferenceFinderFactory> MockDestinationFinderFactory = new();
             protected readonly Mock<ILogger<MappedUserTransformer>> MockLogger = new();
             protected readonly MockSharedResourcesLocalizer MockSharedResourcesLocalizer = new();
-            protected readonly Mock<IMappedContentReferenceFinder<IUser>> MockUserContentFinder = new();
+            protected readonly Mock<IDestinationContentReferenceFinder<IUser>> MockUserContentFinder = new();
 
             protected readonly MappedUserTransformer Transformer;
 
             public MappedUserTransformerTest()
             {
-                MockMigrationPipeline.Setup(p => p.CreateDestinationFinder<IUser>()).Returns(MockUserContentFinder.Object);
+                MockDestinationFinderFactory.Setup(p => p.ForDestinationContentType<IUser>()).Returns(MockUserContentFinder.Object);
 
-                Transformer = new(MockMigrationPipeline.Object, MockLogger.Object, MockSharedResourcesLocalizer.Object);
+                Transformer = new(MockDestinationFinderFactory.Object, MockLogger.Object, MockSharedResourcesLocalizer.Object);
             }
         }
 
@@ -61,7 +60,7 @@ public async Task Returns_destination_user_when_found()
                 var sourceUser = Create<IContentReference>();
                 var destinationUser = Create<IContentReference>();
 
-                MockUserContentFinder.Setup(f => f.FindDestinationReferenceAsync(sourceUser.Location, Cancel)).ReturnsAsync(destinationUser);
+                MockUserContentFinder.Setup(f => f.FindBySourceLocationAsync(sourceUser.Location, Cancel)).ReturnsAsync(destinationUser);
 
                 var result = await Transformer.ExecuteAsync(sourceUser, Cancel);
 
diff --git a/tests/Tableau.Migration.Tests/Unit/Engine/Hooks/Transformers/Default/PermissionsTransformerTests.cs b/tests/Tableau.Migration.Tests/Unit/Engine/Hooks/Transformers/Default/PermissionsTransformerTests.cs
index ea9e177..e22d861 100644
--- a/tests/Tableau.Migration.Tests/Unit/Engine/Hooks/Transformers/Default/PermissionsTransformerTests.cs
+++ b/tests/Tableau.Migration.Tests/Unit/Engine/Hooks/Transformers/Default/PermissionsTransformerTests.cs
@@ -29,7 +29,6 @@
 using Tableau.Migration.Content.Permissions;
 using Tableau.Migration.Engine.Endpoints.Search;
 using Tableau.Migration.Engine.Hooks.Transformers.Default;
-using Tableau.Migration.Engine.Pipelines;
 using Tableau.Migration.Resources;
 using Tableau.Migration.Tests.Content.Permissions;
 using Xunit;
@@ -42,9 +41,9 @@ public abstract class PermissionsTransformerTest : AutoFixtureTestBase
         {
             internal readonly IGranteeCapabilityComparer GranteeCapabilityComparer = new(false);
 
-            protected readonly Mock<IMigrationPipeline> MockMigrationPipeline = new();
-            protected readonly Mock<IMappedContentReferenceFinder<IUser>> MockUserContentFinder = new();
-            protected readonly Mock<IMappedContentReferenceFinder<IGroup>> MockGroupContentFinder = new();
+            protected readonly Mock<IDestinationContentReferenceFinderFactory> MockDestinationFinderFactory = new();
+            protected readonly Mock<IDestinationContentReferenceFinder<IUser>> MockUserContentFinder = new();
+            protected readonly Mock<IDestinationContentReferenceFinder<IGroup>> MockGroupContentFinder = new();
 
             protected readonly PermissionsTransformer Transformer;
 
@@ -53,10 +52,10 @@ public abstract class PermissionsTransformerTest : AutoFixtureTestBase
 
             public PermissionsTransformerTest()
             {
-                MockMigrationPipeline.Setup(p => p.CreateDestinationFinder<IUser>()).Returns(MockUserContentFinder.Object);
-                MockMigrationPipeline.Setup(p => p.CreateDestinationFinder<IGroup>()).Returns(MockGroupContentFinder.Object);
+                MockDestinationFinderFactory.Setup(p => p.ForDestinationContentType<IUser>()).Returns(MockUserContentFinder.Object);
+                MockDestinationFinderFactory.Setup(p => p.ForDestinationContentType<IGroup>()).Returns(MockGroupContentFinder.Object);
 
-                Transformer = new(MockMigrationPipeline.Object, MockLogger.Object, MockLocalizer.Object);
+                Transformer = new(MockDestinationFinderFactory.Object, MockLogger.Object, MockLocalizer.Object);
             }
         }
 
@@ -69,7 +68,7 @@ public ExecuteAsync()
                 _idMap = new();
 
                 MockUserContentFinder
-                    .Setup(f => f.FindDestinationReferenceAsync(It.IsAny<Guid>(), Cancel))
+                    .Setup(f => f.FindBySourceIdAsync(It.IsAny<Guid>(), Cancel))
                     .ReturnsAsync((Guid id, CancellationToken cancel) =>
                     {
                         if (_idMap.TryGetValue(id, out var destinationId))
@@ -79,7 +78,7 @@ public ExecuteAsync()
                     });
 
                 MockGroupContentFinder
-                    .Setup(f => f.FindDestinationReferenceAsync(It.IsAny<Guid>(), Cancel))
+                    .Setup(f => f.FindBySourceIdAsync(It.IsAny<Guid>(), Cancel))
                     .ReturnsAsync((Guid id, CancellationToken cancel) =>
                     {
                         if (_idMap.TryGetValue(id, out var destinationId))
@@ -119,12 +118,12 @@ public async Task Transforms()
                     if (granteeCapability.GranteeType is GranteeType.User)
                     {
                         MockUserContentFinder
-                            .Verify(f => f.FindDestinationReferenceAsync(sourceId, Cancel), Times.Once);
+                            .Verify(f => f.FindBySourceIdAsync(sourceId, Cancel), Times.Once);
                     }
                     else
                     {
                         MockGroupContentFinder
-                            .Verify(f => f.FindDestinationReferenceAsync(sourceId, Cancel), Times.Once);
+                            .Verify(f => f.FindBySourceIdAsync(sourceId, Cancel), Times.Once);
                     }
                 }
             }
@@ -158,12 +157,12 @@ public async Task Resolves_duplicates()
                     if (granteeCapability.GranteeType is GranteeType.User)
                     {
                         MockUserContentFinder
-                            .Verify(f => f.FindDestinationReferenceAsync(sourceId, Cancel), Times.Once);
+                            .Verify(f => f.FindBySourceIdAsync(sourceId, Cancel), Times.Once);
                     }
                     else
                     {
                         MockGroupContentFinder
-                            .Verify(f => f.FindDestinationReferenceAsync(sourceId, Cancel), Times.Once);
+                            .Verify(f => f.FindBySourceIdAsync(sourceId, Cancel), Times.Once);
                     }
                 }
             }
@@ -212,12 +211,12 @@ public async Task Resolves_conflicts()
                     if (granteeCapability.GranteeType is GranteeType.User)
                     {
                         MockUserContentFinder
-                            .Verify(f => f.FindDestinationReferenceAsync(sourceId, Cancel), Times.Once);
+                            .Verify(f => f.FindBySourceIdAsync(sourceId, Cancel), Times.Once);
                     }
                     else
                     {
                         MockGroupContentFinder
-                            .Verify(f => f.FindDestinationReferenceAsync(sourceId, Cancel), Times.Once);
+                            .Verify(f => f.FindBySourceIdAsync(sourceId, Cancel), Times.Once);
                     }
                 }
 
diff --git a/tests/Tableau.Migration.Tests/Unit/Engine/Hooks/Transformers/Default/TableauServerConnectionUrlTransformerTests.cs b/tests/Tableau.Migration.Tests/Unit/Engine/Hooks/Transformers/Default/TableauServerConnectionUrlTransformerTests.cs
index 061a4a5..77fec5e 100644
--- a/tests/Tableau.Migration.Tests/Unit/Engine/Hooks/Transformers/Default/TableauServerConnectionUrlTransformerTests.cs
+++ b/tests/Tableau.Migration.Tests/Unit/Engine/Hooks/Transformers/Default/TableauServerConnectionUrlTransformerTests.cs
@@ -39,9 +39,12 @@ public class TableauServerConnectionUrlTransformerTests
     {
         public class TestTableauServerConnectionUrlTransformer : TableauServerConnectionUrlTransformer
         {
-            public TestTableauServerConnectionUrlTransformer(IMigration migration,
-                ILogger<TableauServerConnectionUrlTransformer> logger, ISharedResourcesLocalizer localizer)
-                : base(migration, logger, localizer)
+            public TestTableauServerConnectionUrlTransformer(
+                IMigration migration,
+                IDestinationContentReferenceFinderFactory destinationFinderFactory,
+                ILogger<TableauServerConnectionUrlTransformer> logger, 
+                ISharedResourcesLocalizer localizer)
+                : base(migration, destinationFinderFactory, logger, localizer)
             { }
 
             public bool PublicNeedsXmlTransforming(IPublishableWorkbook ctx)
@@ -50,7 +53,8 @@ public bool PublicNeedsXmlTransforming(IPublishableWorkbook ctx)
 
         public class TableauServerConnectionUrlTransformerTest : AutoFixtureTestBase
         {
-            protected readonly Mock<IMappedContentReferenceFinder<IDataSource>> MockDataSourceFinder;
+            protected readonly Mock<IDestinationContentReferenceFinder<IDataSource>> MockDataSourceFinder;
+            protected readonly Mock<IDestinationContentReferenceFinderFactory> MockDestinationFinderFactory;
             protected readonly Mock<ILogger<TableauServerConnectionUrlTransformer>> MockLog;
             protected readonly MockSharedResourcesLocalizer MockLocalizer;
 
@@ -67,14 +71,14 @@ protected virtual IMigrationPlanEndpointConfiguration GetDestinationEndpointConf
 
             public TableauServerConnectionUrlTransformerTest()
             {
-                MockDataSourceFinder = Freeze<Mock<IMappedContentReferenceFinder<IDataSource>>>();
+                MockDataSourceFinder = Freeze<Mock<IDestinationContentReferenceFinder<IDataSource>>>();
                 MockLog = Freeze<Mock<ILogger<TableauServerConnectionUrlTransformer>>>();
                 MockLocalizer = Freeze<MockSharedResourcesLocalizer>();
 
                 MockWorkbook = Create<Mock<IPublishableWorkbook>>();
 
                 DataSourceReferencesBySourceContentUrl = new();
-                MockDataSourceFinder.Setup(x => x.FindDestinationReferenceAsync(It.IsAny<string>(), Cancel))
+                MockDataSourceFinder.Setup(x => x.FindBySourceContentUrlAsync(It.IsAny<string>(), Cancel))
                     .ReturnsAsync((string contentUrl, CancellationToken cancel) =>
                     {
                         if (DataSourceReferencesBySourceContentUrl.TryGetValue(contentUrl, out var val))
@@ -85,6 +89,10 @@ public TableauServerConnectionUrlTransformerTest()
                         return null;
                     });
 
+                MockDestinationFinderFactory = Freeze<Mock<IDestinationContentReferenceFinderFactory>>();
+                MockDestinationFinderFactory.Setup(x => x.ForDestinationContentType<IDataSource>())
+                    .Returns(MockDataSourceFinder.Object);
+
                 DestinationConfig = Create<TableauSiteConnectionConfiguration>();
 
                 MockDestinationApiEndpointConfig = Freeze<Mock<ITableauApiEndpointConfiguration>>();
@@ -93,8 +101,6 @@ public TableauServerConnectionUrlTransformerTest()
 
                 var mockMigration = Freeze<Mock<IMigration>>();
                 mockMigration.Setup(x => x.Plan.Destination).Returns(GetDestinationEndpointConfig);
-                mockMigration.Setup(x => x.Pipeline.CreateDestinationFinder<IDataSource>())
-                    .Returns(MockDataSourceFinder.Object);
 
                 Transformer = Create<TestTableauServerConnectionUrlTransformer>();
             }
@@ -158,7 +164,7 @@ public async Task UpdatesConnectionAndRepoLocationAsync()
                 var xml = new XDocument(wb);
 
                 //Transform
-                await Transformer.ExecuteAsync(MockWorkbook.Object, xml, Cancel);
+                await Transformer.TransformAsync(MockWorkbook.Object, xml, Cancel);
 
                 //Assert
                 Assert.Equal(pdsRef1.ContentUrl, dsRepo.Attribute("id")!.Value);
@@ -196,7 +202,7 @@ public async Task UpdatesAllDataSourcesAsync()
                 var xml = new XDocument(wb);
 
                 //Transform
-                await Transformer.ExecuteAsync(MockWorkbook.Object, xml, Cancel);
+                await Transformer.TransformAsync(MockWorkbook.Object, xml, Cancel);
 
                 //Assert
                 Assert.Equal(pdsRef1.ContentUrl, ds1Repo.Attribute("id")!.Value);
@@ -228,7 +234,7 @@ public async Task OnlyUpdatesTableauServerConnectionsAsync()
                 var xml = new XDocument(wb);
 
                 //Transform
-                await Transformer.ExecuteAsync(MockWorkbook.Object, xml, Cancel);
+                await Transformer.TransformAsync(MockWorkbook.Object, xml, Cancel);
 
                 //Assert
                 Assert.Equal("http", dsConn.Attribute("channel")!.Value);
@@ -264,10 +270,10 @@ public async Task WarnsMissingReferenceSingleTimePerWorkbookAndContentUrl()
                 var xml = new XDocument(wb);
 
                 //Transform
-                await Transformer.ExecuteAsync(MockWorkbook.Object, xml, Cancel);
+                await Transformer.TransformAsync(MockWorkbook.Object, xml, Cancel);
 
                 var mockWorkbook2 = Create<Mock<IPublishableWorkbook>>();
-                await Transformer.ExecuteAsync(mockWorkbook2.Object, xml, Cancel);
+                await Transformer.TransformAsync(mockWorkbook2.Object, xml, Cancel);
 
                 //Assert
                 MockLog.VerifyWarnings(Times.Exactly(4));
diff --git a/tests/Tableau.Migration.Tests/Unit/Engine/Hooks/Transformers/IXmlContentTransformerTests.cs b/tests/Tableau.Migration.Tests/Unit/Engine/Hooks/Transformers/IXmlContentTransformerTests.cs
index 1fb7111..5ded610 100644
--- a/tests/Tableau.Migration.Tests/Unit/Engine/Hooks/Transformers/IXmlContentTransformerTests.cs
+++ b/tests/Tableau.Migration.Tests/Unit/Engine/Hooks/Transformers/IXmlContentTransformerTests.cs
@@ -32,7 +32,7 @@ public class ExecuteAsync : AutoFixtureTestBase
         {
             public class TestImplementation : IXmlContentTransformer<TestFileContentType>
             {
-                public virtual async Task ExecuteAsync(TestFileContentType ctx, XDocument xml, CancellationToken cancel)
+                public virtual async Task TransformAsync(TestFileContentType ctx, XDocument xml, CancellationToken cancel)
                 {
                     await Task.CompletedTask;
                 }
@@ -75,7 +75,7 @@ public async Task GetsOrReadsXmlAsync()
                 mockFile.Verify(x => x.GetXmlStreamAsync(Cancel), Times.Once);
                 mockXmlStream.Verify(x => x.GetXmlAsync(Cancel), Times.Once);
 
-                mockTransformer.Verify(x => x.ExecuteAsync(ctx, xml, Cancel), Times.Once);
+                mockTransformer.Verify(x => x.TransformAsync(ctx, xml, Cancel), Times.Once);
             }
         }
     }
diff --git a/tests/Tableau.Migration.Tests/Unit/Engine/Hooks/Transformers/XmlContentTransformerBaseTests.cs b/tests/Tableau.Migration.Tests/Unit/Engine/Hooks/Transformers/XmlContentTransformerBaseTests.cs
index 7685bda..793cca0 100644
--- a/tests/Tableau.Migration.Tests/Unit/Engine/Hooks/Transformers/XmlContentTransformerBaseTests.cs
+++ b/tests/Tableau.Migration.Tests/Unit/Engine/Hooks/Transformers/XmlContentTransformerBaseTests.cs
@@ -60,7 +60,7 @@ public class TestXmlTransformer : XmlContentTransformerBase<TestFileContentType>
             protected override bool NeedsXmlTransforming(TestFileContentType ctx)
                 => NeedsXmlTransformingFilter?.Invoke(ctx) ?? base.NeedsXmlTransforming(ctx);
 
-            public override Task ExecuteAsync(TestFileContentType ctx, XDocument xml, CancellationToken cancel)
+            public override Task TransformAsync(TestFileContentType ctx, XDocument xml, CancellationToken cancel)
             {
                 TransformXml?.Invoke(ctx, xml);
                 return Task.CompletedTask;
@@ -89,9 +89,9 @@ public async Task CanFilterItemsToTransformAsync()
 
         #endregion
 
-        #region - ExecuteAsync -
+        #region - TransformAsync -
 
-        public class ExecuteAsync : XmlContentTransformerBaseTest
+        public class TransformAsync : XmlContentTransformerBaseTest
         {
             public class TestOverwriteExecuteXmlTransformer : XmlContentTransformerBase<TestFileContentType>,
                 IMigrationHook<TestFileContentType>
@@ -101,7 +101,7 @@ protected override bool NeedsXmlTransforming(TestFileContentType ctx)
                     throw new NotImplementedException();
                 }
 
-                public override Task ExecuteAsync(TestFileContentType ctx, XDocument xml, CancellationToken cancel)
+                public override Task TransformAsync(TestFileContentType ctx, XDocument xml, CancellationToken cancel)
                 {
                     throw new NotImplementedException();
                 }
diff --git a/tests/Tableau.Migration.Tests/Unit/Engine/IServiceCollectionExtensionsTests.cs b/tests/Tableau.Migration.Tests/Unit/Engine/IServiceCollectionExtensionsTests.cs
index f9d3215..45f98e2 100644
--- a/tests/Tableau.Migration.Tests/Unit/Engine/IServiceCollectionExtensionsTests.cs
+++ b/tests/Tableau.Migration.Tests/Unit/Engine/IServiceCollectionExtensionsTests.cs
@@ -272,15 +272,15 @@ public async Task RegistersScopedDestinationContentFinderAsync()
             {
                 await using var scope = await InitializeMigrationScopeAsync();
 
-                AssertService<ManifestDestinationContentReferenceFinder<TestContentType>>(scope, ServiceLifetime.Scoped);
+                AssertService<IDestinationContentReferenceFinder<TestContentType>, ManifestDestinationContentReferenceFinder<TestContentType>>(scope, ServiceLifetime.Scoped);
             }
 
             [Fact]
-            public async Task RegistersScopedDestinationContentFinderFactoryAsync()
+            public async Task RegistersScopedIDestinationContentFinderFactoryAsync()
             {
                 await using var scope = await InitializeMigrationScopeAsync();
 
-                AssertService<ManifestDestinationContentReferenceFinderFactory>(scope, ServiceLifetime.Scoped);
+                AssertService<IDestinationContentReferenceFinderFactory, ManifestDestinationContentReferenceFinderFactory>(scope, ServiceLifetime.Scoped);
             }
 
             [Fact]
@@ -296,15 +296,15 @@ public async Task RegistersScopedSourceContentFinderAsync()
             {
                 await using var scope = await InitializeMigrationScopeAsync();
 
-                AssertService<ManifestSourceContentReferenceFinder<TestContentType>>(scope, ServiceLifetime.Scoped);
+                AssertService<ISourceContentReferenceFinder<TestContentType>, ManifestSourceContentReferenceFinder<TestContentType>>(scope, ServiceLifetime.Scoped);
             }
 
             [Fact]
-            public async Task RegistersScopedSourceContentFinderFactoryAsync()
+            public async Task RegistersScopedISourceContentFinderFactoryAsync()
             {
                 await using var scope = await InitializeMigrationScopeAsync();
 
-                AssertService<ManifestSourceContentReferenceFinderFactory>(scope, ServiceLifetime.Scoped);
+                AssertService<ISourceContentReferenceFinderFactory, ManifestSourceContentReferenceFinderFactory>(scope, ServiceLifetime.Scoped);
             }
 
             [Fact]
diff --git a/tests/Tableau.Migration.Tests/Unit/Engine/Pipelines/MigrationPipelineBaseTests.cs b/tests/Tableau.Migration.Tests/Unit/Engine/Pipelines/MigrationPipelineBaseTests.cs
index 3f2be32..0e1e6f8 100644
--- a/tests/Tableau.Migration.Tests/Unit/Engine/Pipelines/MigrationPipelineBaseTests.cs
+++ b/tests/Tableau.Migration.Tests/Unit/Engine/Pipelines/MigrationPipelineBaseTests.cs
@@ -172,22 +172,6 @@ public void CreatesSpecializedProjectCache()
 
         #endregion
 
-        #region - CreateDestinationFinder -
-
-        public class CreateDestinationFinder : MigrationPipelineBaseTest
-        {
-            [Fact]
-            public void CreatesLocationFinder()
-            {
-                var cache = Pipeline.CreateDestinationFinder<TestContentType>();
-
-                Assert.IsType<ManifestDestinationContentReferenceFinder<TestContentType>>(cache);
-                MockServices.Verify(x => x.GetService(typeof(ManifestDestinationContentReferenceFinder<TestContentType>)), Times.Once);
-            }
-        }
-
-        #endregion
-
         #region - GetDestinationLockedProjectCache -
 
         public class GetDestinationLockedProjectCache : MigrationPipelineBaseTest
diff --git a/tests/Tableau.Migration.Tests/Unit/Engine/Preparation/ContentItemPreparerBaseTests.cs b/tests/Tableau.Migration.Tests/Unit/Engine/Preparation/ContentItemPreparerBaseTests.cs
index 2037657..732280a 100644
--- a/tests/Tableau.Migration.Tests/Unit/Engine/Preparation/ContentItemPreparerBaseTests.cs
+++ b/tests/Tableau.Migration.Tests/Unit/Engine/Preparation/ContentItemPreparerBaseTests.cs
@@ -21,8 +21,8 @@
 using Moq;
 using Tableau.Migration.Content;
 using Tableau.Migration.Engine;
+using Tableau.Migration.Engine.Endpoints.Search;
 using Tableau.Migration.Engine.Hooks.Transformers;
-using Tableau.Migration.Engine.Pipelines;
 using Tableau.Migration.Engine.Preparation;
 using Xunit;
 
@@ -39,8 +39,10 @@ public class TestPreparer<TContent, TPublish> : ContentItemPreparerBase<TContent
 
             public int PullCallCount { get; private set; }
 
-            public TestPreparer(IContentTransformerRunner transformerRunner, IMigrationPipeline pipeline)
-                : base(transformerRunner, pipeline)
+            public TestPreparer(
+                IContentTransformerRunner transformerRunner,
+                IDestinationContentReferenceFinderFactory destinationFinderFactory)
+                : base(transformerRunner, destinationFinderFactory)
             { }
 
             protected override Task<IResult<TPublish>> PullAsync(ContentMigrationItem<TContent> item, CancellationToken cancel)
@@ -53,15 +55,19 @@ protected override Task<IResult<TPublish>> PullAsync(ContentMigrationItem<TConte
         public class TestPreparer<TContent> : TestPreparer<TContent, TContent>
             where TContent : class, new()
         {
-            public TestPreparer(IContentTransformerRunner transformerRunner, IMigrationPipeline pipeline)
-                : base(transformerRunner, pipeline)
+            public TestPreparer(
+                IContentTransformerRunner transformerRunner,
+                IDestinationContentReferenceFinderFactory destinationFinderFactory)
+                : base(transformerRunner, destinationFinderFactory)
             { }
         }
 
         public class TestPreparer : TestPreparer<TestContentType, TestPublishType>
         {
-            public TestPreparer(IContentTransformerRunner transformerRunner, IMigrationPipeline pipeline)
-                : base(transformerRunner, pipeline)
+            public TestPreparer(
+                IContentTransformerRunner transformerRunner, 
+                IDestinationContentReferenceFinderFactory destinationFinderFactory)
+                : base(transformerRunner, destinationFinderFactory)
             { }
         }
 
@@ -155,7 +161,7 @@ public async Task AppliesMappingToContainerContentAsync()
                 var destinationContainerLocation = MockManifestEntry.Object.MappedLocation.Parent();
                 var destinationProject = Create<ContentReferenceStub>();
 
-                MockProjectFinder.Setup(x => x.FindDestinationReferenceAsync(sourceParentLocation, Cancel))
+                MockProjectFinder.Setup(x => x.FindBySourceLocationAsync(sourceParentLocation, Cancel))
                     .ReturnsAsync(destinationProject);
 
                 var result = await preparer.PrepareAsync(item, Cancel);
@@ -168,7 +174,7 @@ public async Task AppliesMappingToContainerContentAsync()
                 Assert.Equal(destinationName, publishItem.Name);
                 Assert.Same(destinationProject, publishItem.Container);
 
-                MockProjectFinder.Verify(x => x.FindDestinationReferenceAsync(sourceParentLocation, Cancel), Times.Once);
+                MockProjectFinder.Verify(x => x.FindBySourceLocationAsync(sourceParentLocation, Cancel), Times.Once);
             }
 
             [Fact]
@@ -183,7 +189,7 @@ public async Task AppliesNewParentToContainerContentAsync()
                 var destinationContainerLocation = MockManifestEntry.Object.MappedLocation.Parent();
                 var destinationProject = Create<ContentReferenceStub>();
 
-                MockProjectFinder.Setup(x => x.FindMappedDestinationReferenceAsync(destinationContainerLocation, Cancel))
+                MockProjectFinder.Setup(x => x.FindByMappedLocationAsync(destinationContainerLocation, Cancel))
                     .ReturnsAsync(destinationProject);
 
                 var result = await preparer.PrepareAsync(item, Cancel);
@@ -196,7 +202,7 @@ public async Task AppliesNewParentToContainerContentAsync()
                 Assert.Equal(destinationName, publishItem.Name);
                 Assert.Same(destinationProject, publishItem.Container);
 
-                MockProjectFinder.Verify(x => x.FindMappedDestinationReferenceAsync(destinationContainerLocation, Cancel), Times.Once);
+                MockProjectFinder.Verify(x => x.FindByMappedLocationAsync(destinationContainerLocation, Cancel), Times.Once);
             }
 
             [Fact]
@@ -220,7 +226,7 @@ public async Task AppliesMappingToTopLevelContainerContentAsync()
                 Assert.Equal(destinationName, publishItem.Name);
                 Assert.Null(publishItem.Container);
 
-                MockProjectFinder.Verify(x => x.FindDestinationReferenceAsync(It.IsAny<ContentLocation>(), Cancel), Times.Never);
+                MockProjectFinder.Verify(x => x.FindBySourceLocationAsync(It.IsAny<ContentLocation>(), Cancel), Times.Never);
             }
 
             [Fact]
diff --git a/tests/Tableau.Migration.Tests/Unit/Engine/Preparation/ContentItemPreparerTestBase.cs b/tests/Tableau.Migration.Tests/Unit/Engine/Preparation/ContentItemPreparerTestBase.cs
index 223c399..127662a 100644
--- a/tests/Tableau.Migration.Tests/Unit/Engine/Preparation/ContentItemPreparerTestBase.cs
+++ b/tests/Tableau.Migration.Tests/Unit/Engine/Preparation/ContentItemPreparerTestBase.cs
@@ -23,7 +23,6 @@
 using Tableau.Migration.Engine.Endpoints.Search;
 using Tableau.Migration.Engine.Hooks.Transformers;
 using Tableau.Migration.Engine.Manifest;
-using Tableau.Migration.Engine.Pipelines;
 
 namespace Tableau.Migration.Tests.Unit.Engine.Preparation
 {
@@ -31,7 +30,7 @@ public class ContentItemPreparerTestBase<TPublish> : AutoFixtureTestBase
     {
         protected readonly Mock<IContentTransformerRunner> MockTransformerRunner;
         protected readonly Mock<IMigrationManifestEntryEditor> MockManifestEntry;
-        protected readonly Mock<IMappedContentReferenceFinder<IProject>> MockProjectFinder;
+        protected readonly Mock<IDestinationContentReferenceFinder<IProject>> MockProjectFinder;
         protected readonly Mock<IContentFileStore> MockFileStore;
         protected readonly ContentMigrationItem<TestContentType> Item;
 
@@ -48,12 +47,12 @@ public ContentItemPreparerTestBase()
             MockManifestEntry = Freeze<Mock<IMigrationManifestEntryEditor>>();
             MockManifestEntry.SetupGet(x => x.MappedLocation).Returns(() => MappedLocation);
 
-            MockProjectFinder = Freeze<Mock<IMappedContentReferenceFinder<IProject>>>();
-            MockProjectFinder.Setup(x => x.FindDestinationReferenceAsync(It.IsAny<ContentLocation>(), Cancel))
+            MockProjectFinder = Freeze<Mock<IDestinationContentReferenceFinder<IProject>>>();
+            MockProjectFinder.Setup(x => x.FindBySourceLocationAsync(It.IsAny<ContentLocation>(), Cancel))
                     .ReturnsAsync((IContentReference?)null);
 
-            var mockPipeline = Freeze<Mock<IMigrationPipeline>>();
-            mockPipeline.Setup(x => x.CreateDestinationFinder<IProject>())
+            var mockDestinationFinderFactory = Freeze<Mock<IDestinationContentReferenceFinderFactory>>();
+            mockDestinationFinderFactory.Setup(x => x.ForDestinationContentType<IProject>())
                 .Returns(MockProjectFinder.Object);
 
             MockFileStore = Freeze<Mock<IContentFileStore>>();
diff --git a/tests/Tableau.Migration.Tests/Unit/Interop/Hooks/Transformers/ISyncXmlContentTransformerTests.cs b/tests/Tableau.Migration.Tests/Unit/Interop/Hooks/Transformers/ISyncXmlContentTransformerTests.cs
index 033739e..9dae865 100644
--- a/tests/Tableau.Migration.Tests/Unit/Interop/Hooks/Transformers/ISyncXmlContentTransformerTests.cs
+++ b/tests/Tableau.Migration.Tests/Unit/Interop/Hooks/Transformers/ISyncXmlContentTransformerTests.cs
@@ -31,7 +31,7 @@ public class ExecuteAsync : AutoFixtureTestBase
         {
             public class TestImplementation : ISyncXmlContentTransformer<TestFileContentType>
             {
-                public virtual void Execute(TestFileContentType ctx, XDocument xml) { }
+                public virtual void Transform(TestFileContentType ctx, XDocument xml) { }
 
                 public virtual bool NeedsXmlTransforming(TestFileContentType ctx) => true;
             }
@@ -57,7 +57,7 @@ public async Task CallsExecuteAsync()
                 mockFile.Verify(x => x.GetXmlStreamAsync(Cancel), Times.Once);
                 mockXmlStream.Verify(x => x.GetXmlAsync(Cancel), Times.Once);
 
-                mockTransformer.Verify(x => x.Execute(ctx, xml), Times.Once);
+                mockTransformer.Verify(x => x.Transform(ctx, xml), Times.Once);
             }
         }
     }
diff --git a/tests/Tableau.Migration.Tests/Unit/Interop/IServiceCollectionExtensionsTests.cs b/tests/Tableau.Migration.Tests/Unit/Interop/IServiceCollectionExtensionsTests.cs
new file mode 100644
index 0000000..b7ad4ac
--- /dev/null
+++ b/tests/Tableau.Migration.Tests/Unit/Interop/IServiceCollectionExtensionsTests.cs
@@ -0,0 +1,52 @@
+//
+//  Copyright (c) 2024, Salesforce, Inc.
+//  SPDX-License-Identifier: Apache-2
+//  
+//  Licensed under the Apache License, Version 2.0 (the "License") 
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//  
+//  http://www.apache.org/licenses/LICENSE-2.0
+//  
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+using System;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Tableau.Migration.Interop;
+using Tableau.Migration.Interop.Logging;
+
+namespace Tableau.Migration.Tests.Unit.Interop
+{
+    public class IServiceCollectionExtensionsTests
+    {
+        public class AddPythonSupport : IServiceCollectionExtensionsTestBase
+        {
+            class PythonLogger : NonGenericLoggerBase
+            {
+                public override bool IsEnabled(LogLevel logLevel) => true;
+
+                public override void Log(
+                    LogLevel logLevel,
+                    EventId eventId,
+                    string state,
+                    Exception? exception,
+                    string message)
+                { }
+            }
+
+            PythonLogger GetLogger(string name)
+                => new PythonLogger();
+
+            protected override void ConfigureServices(IServiceCollection services)
+            {
+                services.AddPythonSupport(GetLogger);
+            }
+        }
+    }
+}
diff --git a/tests/Tableau.Migration.Tests/Unit/SdkUserAgentTests.cs b/tests/Tableau.Migration.Tests/Unit/SdkUserAgentTests.cs
index beb0408..a2e3a10 100644
--- a/tests/Tableau.Migration.Tests/Unit/SdkUserAgentTests.cs
+++ b/tests/Tableau.Migration.Tests/Unit/SdkUserAgentTests.cs
@@ -51,7 +51,7 @@ public void DefaultValues()
         [Fact]
         public void PythonValues()
         {
-            var mockLoggerFactory = new Mock<Func<IServiceProvider, NonGenericLoggerProvider>>();
+            var mockLoggerFactory = new Mock<Func<string, NonGenericLoggerBase>>();
 
             _servicesCollection.AddPythonSupport(mockLoggerFactory.Object);
             _services = _servicesCollection.BuildServiceProvider();